Skip to content

Commit 6ccc340

Browse files
blemmenespryorda
authored andcommitted
fix(add-cpu-metric): Adding cpu maxlimited
* Update vmware_exporter.py * Added cpu.maxlimited.summation
1 parent 9cba0c8 commit 6ccc340

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

tests/unit/test_vmware_exporter.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def test_no_error_onempty_vms():
343343
metrics = collector._create_metric_containers()
344344

345345
metric_1 = mock.Mock()
346-
metric_1.id.counterId = 9
346+
metric_1.id.counterId = 10
347347
metric_1.value = [9]
348348

349349
metric_2 = mock.Mock()
@@ -360,14 +360,15 @@ def test_no_error_onempty_vms():
360360

361361
collector.__dict__['counter_ids'] = _succeed({
362362
'cpu.ready.summation': 1,
363-
'cpu.usage.average': 2,
364-
'cpu.usagemhz.average': 3,
365-
'disk.usage.average': 4,
366-
'disk.read.average': 5,
367-
'disk.write.average': 6,
368-
'mem.usage.average': 7,
369-
'net.received.average': 8,
370-
'net.transmitted.average': 9,
363+
'cpu.maxlimited.summation': 2,
364+
'cpu.usage.average': 3,
365+
'cpu.usagemhz.average': 4,
366+
'disk.usage.average': 5,
367+
'disk.read.average': 6,
368+
'disk.write.average': 7,
369+
'mem.usage.average': 8,
370+
'net.received.average': 9,
371+
'net.transmitted.average': 10,
371372
})
372373

373374
collector.__dict__['vm_labels'] = _succeed({'': []})
@@ -400,7 +401,7 @@ def test_collect_vm_perf():
400401
metrics = collector._create_metric_containers()
401402

402403
metric_1 = mock.Mock()
403-
metric_1.id.counterId = 9
404+
metric_1.id.counterId = 10
404405
metric_1.value = [9]
405406

406407
metric_2 = mock.Mock()
@@ -417,14 +418,15 @@ def test_collect_vm_perf():
417418

418419
collector.__dict__['counter_ids'] = _succeed({
419420
'cpu.ready.summation': 1,
420-
'cpu.usage.average': 2,
421-
'cpu.usagemhz.average': 3,
422-
'disk.usage.average': 4,
423-
'disk.read.average': 5,
424-
'disk.write.average': 6,
425-
'mem.usage.average': 7,
426-
'net.received.average': 8,
427-
'net.transmitted.average': 9,
421+
'cpu.maxlimited.summation': 2,
422+
'cpu.usage.average': 3,
423+
'cpu.usagemhz.average': 4,
424+
'disk.usage.average': 5,
425+
'disk.read.average': 6,
426+
'disk.write.average': 7,
427+
'mem.usage.average': 8,
428+
'net.received.average': 9,
429+
'net.transmitted.average': 10,
428430
})
429431

430432
collector.__dict__['vm_labels'] = _succeed({

vmware_exporter/vmware_exporter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ def _vmware_get_vm_perf_manager_metrics(self, vm_metrics):
555555
# List of performance counter we want
556556
perf_list = [
557557
'cpu.ready.summation',
558+
'cpu.maxlimited.summation',
558559
'cpu.usage.average',
559560
'cpu.usagemhz.average',
560561
'disk.usage.average',

0 commit comments

Comments
 (0)