Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-26 02:48:28 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'pull/455'

Browse source
This commit is contained in:
Steve Schnepp 2014-03-14 12:08:53 +01:00
commit 33c40d052a
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/system/cpu_linux_multi
View file

@ -37,8 +37,6 @@
# multigraph, supersampling, extended cpu informations # multigraph, supersampling, extended cpu informations
# #
# require: mpstat (to actually collect the data) # require: mpstat (to actually collect the data)
# require linux /proc
# (sorry, quick/dirty retrieve the number of cpu from /proc/cpuinfo)
# #
# #
# ENV (default): # ENV (default):
@ -148,7 +146,7 @@ sub graph_section() { "system:cpu" };
sub graph_name() { "cpu_extended_multi_1s" }; sub graph_name() { "cpu_extended_multi_1s" };
sub graph_title() { "CPU usage" }; sub graph_title() { "CPU usage" };
sub graph_title_all() { "Overall CPU usage" }; sub graph_title_all() { "Overall CPU usage" };
sub graph_title_n($) { "CPU#" . shift . " usage" }; sub graph_title_n($) { "CPU#" . (shift) . " usage" };
sub acquire_name() { "<$plugin> collecting information" } sub acquire_name() { "<$plugin> collecting information" }
######################################################################## ########################################################################
@ -186,10 +184,16 @@ if (defined $ENV{MUNIN_MPSTAT}) {
my $cpu_count_cache = undef; my $cpu_count_cache = undef;
sub cpu_count() { sub cpu_count() {
# XXX: is there any way to do that cleanly ?
if (not defined $cpu_count_cache) { if (not defined $cpu_count_cache) {
$cpu_count_cache = `grep -c ^processor /proc/cpuinfo`; open MPSTAT, "$mpstat -P ALL |" or die "open mpstat|: $!\n";
chomp $cpu_count_cache; $cpu_count_cache = 0;
while (<MPSTAT>) {
chomp;
my @field = split();
next unless ($field[1] && ($field[1] =~ /^([0-9]+)$/));
$cpu_count_cache ++;
}
close(MPSTAT);
} }
return $cpu_count_cache; return $cpu_count_cache;
} }