Skip to content

Commit 873d6e5

Browse files
Shreyas-MicrosoftCopilot
Shreyas-Microsoft
and
Copilot
committed
fix(infra): expand DCR counterSpecifiers to match MACAE pattern (ADO #43311)
Align the jumpbox VM's Microsoft-Perf counterSpecifiers list with the pattern established in microsoft/Multi-Agent-Custom-Automation-Engine- Solution-Accelerator PR #989, which uses a comprehensive 46-counter set named 'perfCounterDataSource60'. Previously this PR shipped a minimal 7-counter set; the expanded list adds detailed Processor (privileged/user time, frequency), System (uptime, context switches, queue length), Process (handle/thread counts, working set), Memory (committed bytes, cache, paged/nonpaged pool, page faults), LogicalDisk (read/write time/bytes/transfers, queue lengths, free space) and Network Interface (sent/received bytes and packets, errors) counters. Same set applied to infra/main.bicep and infra/main_custom.bicep, with infra/main.json regenerated from main.bicep. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 74a2a63 commit 873d6e5

3 files changed

Lines changed: 126 additions & 9 deletions

File tree

‎infra/main.bicep‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,19 +471,58 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
471471
]
472472
performanceCounters: [
473473
{
474-
name: 'VMPerfCounters'
474+
name: 'perfCounterDataSource60'
475475
streams: [
476476
'Microsoft-Perf'
477477
]
478478
samplingFrequencyInSeconds: 60
479479
counterSpecifiers: [
480480
'\\Processor Information(_Total)\\% Processor Time'
481+
'\\Processor Information(_Total)\\% Privileged Time'
482+
'\\Processor Information(_Total)\\% User Time'
483+
'\\Processor Information(_Total)\\Processor Frequency'
484+
'\\System\\Processes'
485+
'\\Process(_Total)\\Thread Count'
486+
'\\Process(_Total)\\Handle Count'
487+
'\\System\\System Up Time'
488+
'\\System\\Context Switches/sec'
489+
'\\System\\Processor Queue Length'
481490
'\\Memory\\% Committed Bytes In Use'
482491
'\\Memory\\Available Bytes'
483-
'\\LogicalDisk(_Total)\\% Free Space'
492+
'\\Memory\\Committed Bytes'
493+
'\\Memory\\Cache Bytes'
494+
'\\Memory\\Pool Paged Bytes'
495+
'\\Memory\\Pool Nonpaged Bytes'
496+
'\\Memory\\Pages/sec'
497+
'\\Memory\\Page Faults/sec'
498+
'\\Process(_Total)\\Working Set'
499+
'\\Process(_Total)\\Working Set - Private'
500+
'\\LogicalDisk(_Total)\\% Disk Time'
501+
'\\LogicalDisk(_Total)\\% Disk Read Time'
502+
'\\LogicalDisk(_Total)\\% Disk Write Time'
503+
'\\LogicalDisk(_Total)\\% Idle Time'
504+
'\\LogicalDisk(_Total)\\Disk Bytes/sec'
505+
'\\LogicalDisk(_Total)\\Disk Read Bytes/sec'
506+
'\\LogicalDisk(_Total)\\Disk Write Bytes/sec'
507+
'\\LogicalDisk(_Total)\\Disk Transfers/sec'
484508
'\\LogicalDisk(_Total)\\Disk Reads/sec'
485509
'\\LogicalDisk(_Total)\\Disk Writes/sec'
510+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Transfer'
511+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Read'
512+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Write'
513+
'\\LogicalDisk(_Total)\\Avg. Disk Queue Length'
514+
'\\LogicalDisk(_Total)\\Avg. Disk Read Queue Length'
515+
'\\LogicalDisk(_Total)\\Avg. Disk Write Queue Length'
516+
'\\LogicalDisk(_Total)\\% Free Space'
517+
'\\LogicalDisk(_Total)\\Free Megabytes'
486518
'\\Network Interface(*)\\Bytes Total/sec'
519+
'\\Network Interface(*)\\Bytes Sent/sec'
520+
'\\Network Interface(*)\\Bytes Received/sec'
521+
'\\Network Interface(*)\\Packets/sec'
522+
'\\Network Interface(*)\\Packets Sent/sec'
523+
'\\Network Interface(*)\\Packets Received/sec'
524+
'\\Network Interface(*)\\Packets Outbound Errors'
525+
'\\Network Interface(*)\\Packets Received Errors'
487526
]
488527
}
489528
]

‎infra/main.json‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.43.8.12551",
9-
"templateHash": "7325892054668959743"
9+
"templateHash": "2025752793206914118"
1010
}
1111
},
1212
"parameters": {
@@ -17216,19 +17216,58 @@
1721617216
],
1721717217
"performanceCounters": [
1721817218
{
17219-
"name": "VMPerfCounters",
17219+
"name": "perfCounterDataSource60",
1722017220
"streams": [
1722117221
"Microsoft-Perf"
1722217222
],
1722317223
"samplingFrequencyInSeconds": 60,
1722417224
"counterSpecifiers": [
1722517225
"\\Processor Information(_Total)\\% Processor Time",
17226+
"\\Processor Information(_Total)\\% Privileged Time",
17227+
"\\Processor Information(_Total)\\% User Time",
17228+
"\\Processor Information(_Total)\\Processor Frequency",
17229+
"\\System\\Processes",
17230+
"\\Process(_Total)\\Thread Count",
17231+
"\\Process(_Total)\\Handle Count",
17232+
"\\System\\System Up Time",
17233+
"\\System\\Context Switches/sec",
17234+
"\\System\\Processor Queue Length",
1722617235
"\\Memory\\% Committed Bytes In Use",
1722717236
"\\Memory\\Available Bytes",
17228-
"\\LogicalDisk(_Total)\\% Free Space",
17237+
"\\Memory\\Committed Bytes",
17238+
"\\Memory\\Cache Bytes",
17239+
"\\Memory\\Pool Paged Bytes",
17240+
"\\Memory\\Pool Nonpaged Bytes",
17241+
"\\Memory\\Pages/sec",
17242+
"\\Memory\\Page Faults/sec",
17243+
"\\Process(_Total)\\Working Set",
17244+
"\\Process(_Total)\\Working Set - Private",
17245+
"\\LogicalDisk(_Total)\\% Disk Time",
17246+
"\\LogicalDisk(_Total)\\% Disk Read Time",
17247+
"\\LogicalDisk(_Total)\\% Disk Write Time",
17248+
"\\LogicalDisk(_Total)\\% Idle Time",
17249+
"\\LogicalDisk(_Total)\\Disk Bytes/sec",
17250+
"\\LogicalDisk(_Total)\\Disk Read Bytes/sec",
17251+
"\\LogicalDisk(_Total)\\Disk Write Bytes/sec",
17252+
"\\LogicalDisk(_Total)\\Disk Transfers/sec",
1722917253
"\\LogicalDisk(_Total)\\Disk Reads/sec",
1723017254
"\\LogicalDisk(_Total)\\Disk Writes/sec",
17231-
"\\Network Interface(*)\\Bytes Total/sec"
17255+
"\\LogicalDisk(_Total)\\Avg. Disk sec/Transfer",
17256+
"\\LogicalDisk(_Total)\\Avg. Disk sec/Read",
17257+
"\\LogicalDisk(_Total)\\Avg. Disk sec/Write",
17258+
"\\LogicalDisk(_Total)\\Avg. Disk Queue Length",
17259+
"\\LogicalDisk(_Total)\\Avg. Disk Read Queue Length",
17260+
"\\LogicalDisk(_Total)\\Avg. Disk Write Queue Length",
17261+
"\\LogicalDisk(_Total)\\% Free Space",
17262+
"\\LogicalDisk(_Total)\\Free Megabytes",
17263+
"\\Network Interface(*)\\Bytes Total/sec",
17264+
"\\Network Interface(*)\\Bytes Sent/sec",
17265+
"\\Network Interface(*)\\Bytes Received/sec",
17266+
"\\Network Interface(*)\\Packets/sec",
17267+
"\\Network Interface(*)\\Packets Sent/sec",
17268+
"\\Network Interface(*)\\Packets Received/sec",
17269+
"\\Network Interface(*)\\Packets Outbound Errors",
17270+
"\\Network Interface(*)\\Packets Received Errors"
1723217271
]
1723317272
}
1723417273
]
@@ -27437,8 +27476,8 @@
2743727476
},
2743827477
"dependsOn": [
2743927478
"appIdentity",
27440-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
2744127479
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
27480+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
2744227481
"virtualNetwork"
2744327482
]
2744427483
},

‎infra/main_custom.bicep‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,19 +449,58 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
449449
]
450450
performanceCounters: [
451451
{
452-
name: 'VMPerfCounters'
452+
name: 'perfCounterDataSource60'
453453
streams: [
454454
'Microsoft-Perf'
455455
]
456456
samplingFrequencyInSeconds: 60
457457
counterSpecifiers: [
458458
'\\Processor Information(_Total)\\% Processor Time'
459+
'\\Processor Information(_Total)\\% Privileged Time'
460+
'\\Processor Information(_Total)\\% User Time'
461+
'\\Processor Information(_Total)\\Processor Frequency'
462+
'\\System\\Processes'
463+
'\\Process(_Total)\\Thread Count'
464+
'\\Process(_Total)\\Handle Count'
465+
'\\System\\System Up Time'
466+
'\\System\\Context Switches/sec'
467+
'\\System\\Processor Queue Length'
459468
'\\Memory\\% Committed Bytes In Use'
460469
'\\Memory\\Available Bytes'
461-
'\\LogicalDisk(_Total)\\% Free Space'
470+
'\\Memory\\Committed Bytes'
471+
'\\Memory\\Cache Bytes'
472+
'\\Memory\\Pool Paged Bytes'
473+
'\\Memory\\Pool Nonpaged Bytes'
474+
'\\Memory\\Pages/sec'
475+
'\\Memory\\Page Faults/sec'
476+
'\\Process(_Total)\\Working Set'
477+
'\\Process(_Total)\\Working Set - Private'
478+
'\\LogicalDisk(_Total)\\% Disk Time'
479+
'\\LogicalDisk(_Total)\\% Disk Read Time'
480+
'\\LogicalDisk(_Total)\\% Disk Write Time'
481+
'\\LogicalDisk(_Total)\\% Idle Time'
482+
'\\LogicalDisk(_Total)\\Disk Bytes/sec'
483+
'\\LogicalDisk(_Total)\\Disk Read Bytes/sec'
484+
'\\LogicalDisk(_Total)\\Disk Write Bytes/sec'
485+
'\\LogicalDisk(_Total)\\Disk Transfers/sec'
462486
'\\LogicalDisk(_Total)\\Disk Reads/sec'
463487
'\\LogicalDisk(_Total)\\Disk Writes/sec'
488+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Transfer'
489+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Read'
490+
'\\LogicalDisk(_Total)\\Avg. Disk sec/Write'
491+
'\\LogicalDisk(_Total)\\Avg. Disk Queue Length'
492+
'\\LogicalDisk(_Total)\\Avg. Disk Read Queue Length'
493+
'\\LogicalDisk(_Total)\\Avg. Disk Write Queue Length'
494+
'\\LogicalDisk(_Total)\\% Free Space'
495+
'\\LogicalDisk(_Total)\\Free Megabytes'
464496
'\\Network Interface(*)\\Bytes Total/sec'
497+
'\\Network Interface(*)\\Bytes Sent/sec'
498+
'\\Network Interface(*)\\Bytes Received/sec'
499+
'\\Network Interface(*)\\Packets/sec'
500+
'\\Network Interface(*)\\Packets Sent/sec'
501+
'\\Network Interface(*)\\Packets Received/sec'
502+
'\\Network Interface(*)\\Packets Outbound Errors'
503+
'\\Network Interface(*)\\Packets Received Errors'
465504
]
466505
}
467506
]

0 commit comments

Comments
 (0)