Skip to content

Commit

Permalink
Do not collect max, min and sum aggregates as they are the same as avg (
Browse files Browse the repository at this point in the history 
#5638)

* Remove max/min/sum

* Remove from metadata.csv as well
  • Loading branch information
@FlorianVeaux
FlorianVeaux authored Feb 10, 2020
1 parent c6d5836 commit 2897819
Show file tree
Hide file tree
Showing 5 changed files with 5,660 additions and 12,590 deletions.
150 changes: 0 additions & 150 deletions vsphere/datadog_checks/vsphere/metrics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,21 @@
PERCENT_METRICS = {
'cpu.capacity.contention.avg',
'cpu.coreUtilization.avg',
'cpu.coreUtilization.max',
'cpu.coreUtilization.min',
'cpu.coreUtilization.raw',
'cpu.corecount.contention.avg',
'cpu.demandEntitlementRatio.latest',
'cpu.latency.avg',
'cpu.readiness.avg',
'cpu.usage.avg',
'cpu.usage.max',
'cpu.usage.min',
'cpu.usage.raw',
'cpu.utilization.avg',
'cpu.utilization.max',
'cpu.utilization.min',
'cpu.utilization.raw',
'datastore.siocActiveTimePercentage.avg',
'disk.capacity.contention.avg',
'disk.scsiReservationCnflctsPct.avg',
'gpu.mem.usage.avg',
'gpu.mem.usage.max',
'gpu.mem.usage.min',
'gpu.mem.usage.raw',
'gpu.utilization.avg',
'gpu.utilization.max',
'gpu.utilization.min',
'gpu.utilization.raw',
'mem.capacity.contention.avg',
'mem.latency.avg',
'mem.reservedCapacityPct.avg',
'mem.usage.avg',
'mem.usage.max',
'mem.usage.min',
'mem.usage.raw',
'mem.vmfs.pbc.capMissRatio.latest',
'power.capacity.usagePct.avg',
'rescpu.actav1.latest',
Expand Down Expand Up @@ -92,13 +74,7 @@
'cpu.swapwait.sum',
'cpu.system.sum',
'cpu.usage.avg',
'cpu.usage.max',
'cpu.usage.min',
'cpu.usage.raw',
'cpu.usagemhz.avg',
'cpu.usagemhz.max',
'cpu.usagemhz.min',
'cpu.usagemhz.raw',
'cpu.used.sum',
'cpu.wait.sum',
'datastore.maxTotalLatency.latest',
Expand All @@ -119,80 +95,35 @@
'disk.numberWriteAveraged.avg',
'disk.read.avg',
'disk.usage.avg',
'disk.usage.max',
'disk.usage.min',
'disk.usage.raw',
'disk.write.avg',
'hbr.hbrNetRx.avg',
'hbr.hbrNetTx.avg',
'mem.active.avg',
'mem.active.max',
'mem.active.min',
'mem.active.raw',
'mem.activewrite.avg',
'mem.compressed.avg',
'mem.compressionRate.avg',
'mem.consumed.avg',
'mem.consumed.max',
'mem.consumed.min',
'mem.consumed.raw',
'mem.decompressionRate.avg',
'mem.entitlement.avg',
'mem.granted.avg',
'mem.granted.max',
'mem.granted.min',
'mem.granted.raw',
'mem.latency.avg',
'mem.llSwapInRate.avg',
'mem.llSwapOutRate.avg',
'mem.llSwapUsed.avg',
'mem.llSwapUsed.max',
'mem.llSwapUsed.min',
'mem.llSwapUsed.raw',
'mem.overhead.avg',
'mem.overhead.max',
'mem.overhead.min',
'mem.overhead.raw',
'mem.overheadMax.avg',
'mem.overheadTouched.avg',
'mem.shared.avg',
'mem.shared.max',
'mem.shared.min',
'mem.shared.raw',
'mem.swapin.avg',
'mem.swapin.max',
'mem.swapin.min',
'mem.swapin.raw',
'mem.swapinRate.avg',
'mem.swapout.avg',
'mem.swapout.max',
'mem.swapout.min',
'mem.swapout.raw',
'mem.swapoutRate.avg',
'mem.swapped.avg',
'mem.swapped.max',
'mem.swapped.min',
'mem.swapped.raw',
'mem.swaptarget.avg',
'mem.swaptarget.max',
'mem.swaptarget.min',
'mem.swaptarget.raw',
'mem.usage.avg',
'mem.usage.max',
'mem.usage.min',
'mem.usage.raw',
'mem.vmmemctl.avg',
'mem.vmmemctl.max',
'mem.vmmemctl.min',
'mem.vmmemctl.raw',
'mem.vmmemctltarget.avg',
'mem.vmmemctltarget.max',
'mem.vmmemctltarget.min',
'mem.vmmemctltarget.raw',
'mem.zero.avg',
'mem.zero.max',
'mem.zero.min',
'mem.zero.raw',
'mem.zipSaved.latest',
'mem.zipped.latest',
'net.broadcastRx.sum',
Expand All @@ -210,9 +141,6 @@
'net.received.avg',
'net.transmitted.avg',
'net.usage.avg',
'net.usage.max',
'net.usage.min',
'net.usage.raw',
'power.energy.sum',
'power.power.avg',
'rescpu.actav1.latest',
Expand Down Expand Up @@ -260,9 +188,6 @@
# All metrics that can be collected from ESXi Hosts.
HOST_METRICS = {
'cpu.coreUtilization.avg',
'cpu.coreUtilization.max',
'cpu.coreUtilization.min',
'cpu.coreUtilization.raw',
'cpu.costop.sum',
'cpu.demand.avg',
'cpu.idle.sum',
Expand All @@ -273,18 +198,9 @@
'cpu.swapwait.sum',
'cpu.totalCapacity.avg',
'cpu.usage.avg',
'cpu.usage.max',
'cpu.usage.min',
'cpu.usage.raw',
'cpu.usagemhz.avg',
'cpu.usagemhz.max',
'cpu.usagemhz.min',
'cpu.usagemhz.raw',
'cpu.used.sum',
'cpu.utilization.avg',
'cpu.utilization.max',
'cpu.utilization.min',
'cpu.utilization.raw',
'cpu.wait.sum',
'datastore.datastoreIops.avg',
'datastore.datastoreMaxQueueDepth.latest',
Expand Down Expand Up @@ -334,110 +250,50 @@
'disk.totalReadLatency.avg',
'disk.totalWriteLatency.avg',
'disk.usage.avg',
'disk.usage.max',
'disk.usage.min',
'disk.usage.raw',
'disk.write.avg',
'hbr.hbrNetRx.avg',
'hbr.hbrNetTx.avg',
'hbr.hbrNumVms.avg',
'mem.active.avg',
'mem.active.max',
'mem.active.min',
'mem.active.raw',
'mem.activewrite.avg',
'mem.compressed.avg',
'mem.compressionRate.avg',
'mem.consumed.avg',
'mem.consumed.max',
'mem.consumed.min',
'mem.consumed.raw',
'mem.consumed.userworlds.avg',
'mem.consumed.vms.avg',
'mem.decompressionRate.avg',
'mem.granted.avg',
'mem.granted.max',
'mem.granted.min',
'mem.granted.raw',
'mem.heap.avg',
'mem.heap.max',
'mem.heap.min',
'mem.heap.raw',
'mem.heapfree.avg',
'mem.heapfree.max',
'mem.heapfree.min',
'mem.heapfree.raw',
'mem.latency.avg',
'mem.llSwapIn.avg',
'mem.llSwapIn.max',
'mem.llSwapIn.min',
'mem.llSwapIn.raw',
'mem.llSwapInRate.avg',
'mem.llSwapOut.avg',
'mem.llSwapOut.max',
'mem.llSwapOut.min',
'mem.llSwapOut.raw',
'mem.llSwapOutRate.avg',
'mem.llSwapUsed.avg',
'mem.llSwapUsed.max',
'mem.llSwapUsed.min',
'mem.llSwapUsed.raw',
'mem.lowfreethreshold.avg',
'mem.overhead.avg',
'mem.overhead.max',
'mem.overhead.min',
'mem.overhead.raw',
'mem.reservedCapacity.avg',
'mem.shared.avg',
'mem.shared.max',
'mem.shared.min',
'mem.shared.raw',
'mem.sharedcommon.avg',
'mem.sharedcommon.max',
'mem.sharedcommon.min',
'mem.sharedcommon.raw',
'mem.state.latest',
'mem.swapin.avg',
'mem.swapin.max',
'mem.swapin.min',
'mem.swapin.raw',
'mem.swapinRate.avg',
'mem.swapout.avg',
'mem.swapout.max',
'mem.swapout.min',
'mem.swapout.raw',
'mem.swapoutRate.avg',
'mem.swapused.avg',
'mem.swapused.max',
'mem.swapused.min',
'mem.swapused.raw',
'mem.sysUsage.avg',
'mem.sysUsage.max',
'mem.sysUsage.min',
'mem.sysUsage.raw',
'mem.totalCapacity.avg',
'mem.unreserved.avg',
'mem.unreserved.max',
'mem.unreserved.min',
'mem.unreserved.raw',
'mem.usage.avg',
'mem.usage.max',
'mem.usage.min',
'mem.usage.raw',
'mem.vmfs.pbc.capMissRatio.latest',
'mem.vmfs.pbc.overhead.latest',
'mem.vmfs.pbc.size.latest',
'mem.vmfs.pbc.sizeMax.latest',
'mem.vmfs.pbc.workingSet.latest',
'mem.vmfs.pbc.workingSetMax.latest',
'mem.vmmemctl.avg',
'mem.vmmemctl.max',
'mem.vmmemctl.min',
'mem.vmmemctl.raw',
'mem.zero.avg',
'mem.zero.max',
'mem.zero.min',
'mem.zero.raw',
'net.broadcastRx.sum',
'net.broadcastTx.sum',
'net.bytesRx.avg',
Expand All @@ -454,9 +310,6 @@
'net.transmitted.avg',
'net.unknownProtos.sum',
'net.usage.avg',
'net.usage.max',
'net.usage.min',
'net.usage.raw',
'power.energy.sum',
'power.power.avg',
'power.powerCap.avg',
Expand Down Expand Up @@ -509,9 +362,6 @@
'sys.resourceCpuRun1.latest',
'sys.resourceCpuRun5.latest',
'sys.resourceCpuUsage.avg',
'sys.resourceCpuUsage.max',
'sys.resourceCpuUsage.min',
'sys.resourceCpuUsage.raw',
'sys.resourceFdUsage.latest',
'sys.resourceMemAllocMax.latest',
'sys.resourceMemAllocMin.latest',
Expand Down
Loading

0 comments on commit 2897819

Please sign in to comment.