fws
/
zabbix-agent-addons
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix computing pool CPU usage in check_pve

Browse Source
tags/zabbix-agent-addons-0.2.39-1
Daniel Berteaud 7 years ago
parent 4556b3e555
commit 7d882a4778
1 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      zabbix_scripts/check_pve_sudo

6
zabbix_scripts/check_pve_sudo
Unescape View File

@ -89,7 +89,8 @@ if ($cluster){
} }
foreach my $item (@{$pool->{members}}){ foreach my $item (@{$pool->{members}}){
if ($item->{type} =~ m/^(qemu|lxc)$/ and !$item->{template}){ if ($item->{type} =~ m/^(qemu|lxc)$/ and !$item->{template}){
$json->{guests}->{$_} += $item->{$_} foreach (qw(cpu maxcpu diskread diskwrite maxdisk mem maxmem netin netout)); $json->{guests}->{$_} += $item->{$_} foreach (qw(maxcpu diskread diskwrite maxdisk mem maxmem netin netout));
$json->{guests}->{used_cpu} += $item->{cpu} * $item->{maxcpu};
$json->{guests}->{$item->{type}}++; $json->{guests}->{$item->{type}}++;
} }
if ($item->{type} =~ m/^(qemu|lxc)$/ and $item->{template}){ if ($item->{type} =~ m/^(qemu|lxc)$/ and $item->{template}){
@ -97,8 +98,9 @@ if ($cluster){
$json->{templates}->{$item->{type}}++; $json->{templates}->{$item->{type}}++;
} }
} }
$json->{guests}->{$_} //= 0 foreach (qw(cpu maxcpu diskread diskwrite maxdisk mem maxmem netin netout)); $json->{guests}->{$_} //= 0 foreach (qw(cpu maxcpu diskread diskwrite maxdisk mem maxmem netin netout));
$json->{templates}->{$_} //= 0 foreach (qw(maxdisk)); $json->{templates}->{$_} //= 0 foreach (qw(maxdisk));
$json->{guests}->{cpu} = ($json->{guests}->{maxcpu} == 0) ? 0 : $json->{guests}->{used_cpu} / $json->{guests}->{maxcpu};
} elsif ($storage){ } elsif ($storage){
$json = from_json(qx($pvesh get /storage/$storage 2>/dev/null)); $json = from_json(qx($pvesh get /storage/$storage 2>/dev/null));
my $stores = from_json(qx($pvesh get /cluster/resources --type=storage 2>/dev/null)); my $stores = from_json(qx($pvesh get /cluster/resources --type=storage 2>/dev/null));

Write Preview
Loading…
Cancel
Save