those fields might be interesting to users. At the moment, this is only used in the external metrics export.
These fields exist in the kernel since: * irq - 2.6.0 * softirq - 2.6.0 * steal - 2.6.11 * guest - 2.6.24 * guest_nice - 2.6.33 so they should all exist Signed-off-by: Dominik Csapak <[email protected]> --- src/PVE/ProcFSTools.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index ff30e4b..8309ced 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -168,13 +168,18 @@ sub read_proc_stat { if (my $fh = IO::File->new ("/proc/stat", "r")) { while (defined (my $line = <$fh>)) { - if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s|) { + if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+))?|) { $res->{user} = $1; $res->{nice} = $2; $res->{system} = $3; $res->{idle} = $4; $res->{used} = $1+$2+$3; $res->{iowait} = $5; + $res->{irq} = $6 if defined($6); + $res->{softirq} = $7 if defined($7); + $res->{steal} = $8 if defined($8); + $res->{guest} = $9 if defined($9); + $res->{guest_nice} = $10 if defined($10); } elsif ($line =~ m|^cpu\d+\s|) { $cpucount++; } -- 2.30.2 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
