From 389b5970cd5070b6dce2144f20d2100f3037f99d Mon Sep 17 00:00:00 2001 From: dcaillibaud Date: Sun, 12 Feb 2012 11:18:04 +0100 Subject: [PATCH 1/4] Last block was duplicate --- plugins/other/openvz-load-avg | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/plugins/other/openvz-load-avg b/plugins/other/openvz-load-avg index 4c0219f9..b83a1df7 100755 --- a/plugins/other/openvz-load-avg +++ b/plugins/other/openvz-load-avg @@ -111,15 +111,4 @@ if ( $arg eq "autoconf" ) { } } - for (@result ) { - if (( my $veid,my $label, my $laverage ) = /^\s*(\d+)\s+([\w\-]+)\s+[\d\.]+\/([\d\.]+)\/[\d\.]+\s*$/) { - my $name = $label; - $name =~ s/\W/_/g; - print "multigraph openvz_loadavg.$name\n"; - print "graph_title loadavg of VE\n"; - print "graph_vlabel loadavg\n"; - print "$name.value $laverage\n" - } - } - } From d305c5bfee6498dda640d30da978c3f2d23e63da Mon Sep 17 00:00:00 2001 From: dcaillibaud Date: Sun, 12 Feb 2012 11:28:31 +0100 Subject: [PATCH 2/4] Label & description should be printed only in config case --- plugins/other/openvz-load-avg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/other/openvz-load-avg b/plugins/other/openvz-load-avg index b83a1df7..187fa274 100755 --- a/plugins/other/openvz-load-avg +++ b/plugins/other/openvz-load-avg @@ -95,10 +95,6 @@ if ( $arg eq "autoconf" ) { # Getting the values my @result=`/usr/sbin/vzlist -H -s veid -o veid,name,laverage`; my $A=0; - print "multigraph openvz_loadavg\n"; - print "graph_title loadavg of VE\n"; - print "graph_vlabel loadavg\n"; - print "graph_category OpenVZ\n"; for (@result ) { if (( my $veid,my $label, my $laverage ) = /^\s*(\d+)\s+([\w\-]+)\s+[\d\.]+\/([\d\.]+)\/[\d\.]+\s*$/) { From 5696c338c32ee2c126460ac0f80b40aca37cebdb Mon Sep 17 00:00:00 2001 From: dcaillibaud Date: Sun, 12 Feb 2012 12:34:41 +0100 Subject: [PATCH 3/4] Another duplicate block in config case and only value line kept for "normal" case --- plugins/other/openvz-load-avg | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/plugins/other/openvz-load-avg b/plugins/other/openvz-load-avg index 187fa274..3cffbc03 100755 --- a/plugins/other/openvz-load-avg +++ b/plugins/other/openvz-load-avg @@ -78,19 +78,6 @@ if ( $arg eq "autoconf" ) { } } - for (@result ) { - ( my $veid,my $label ) = /^\s*(\d+)\s*([\w\-]+)\s*$/ ; - my $name = $label; - $name =~ s/\W/_/g; - - print "multigraph openvz_loadavg.$name\n"; - print "graph_title loadavg of VE\n"; - print "graph_vlabel loadavg\n"; - print "$name.label $label: load average\n"; - print "$name.info Average load on $label for the past 5 minutes\n"; - print "$name.min 0\n"; - print "$name.draw AREA\n"; - } } else { # Getting the values my @result=`/usr/sbin/vzlist -H -s veid -o veid,name,laverage`; @@ -100,9 +87,6 @@ if ( $arg eq "autoconf" ) { if (( my $veid,my $label, my $laverage ) = /^\s*(\d+)\s+([\w\-]+)\s+[\d\.]+\/([\d\.]+)\/[\d\.]+\s*$/) { my $name = $label; $name =~ s/\W/_/g; - print "$name.label $name\n"; - print "$name.min 0\n"; - if ($A==0) { print "$name.draw AREA\n"; $A=1; } else { print "$name.draw STACK\n"; } print "$name.value $laverage\n" } } From 7329ca6b1191b1aea7f1b48ea0e35d898e29b981 Mon Sep 17 00:00:00 2001 From: dcaillibaud Date: Sun, 12 Feb 2012 12:37:02 +0100 Subject: [PATCH 4/4] "load average" label already in graph title, so useless in each VE label --- plugins/other/openvz-load-avg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/other/openvz-load-avg b/plugins/other/openvz-load-avg index 3cffbc03..42c6deb8 100755 --- a/plugins/other/openvz-load-avg +++ b/plugins/other/openvz-load-avg @@ -52,10 +52,10 @@ if ( $arg eq "autoconf" ) { print "yes\n"; } elsif ( $arg eq "config" ) { print "multigraph openvz_loadavg\n"; - print "graph_title loadavg of VE\n"; + print "graph_title load average of VE\n"; print "graph_args --base 1000 -l 0 -N\n"; print "graph_scale no\n"; - print "graph_vlabel loadavg\n"; + print "graph_vlabel load average\n"; print "graph_info Shows 5-minute load average per VE\n"; print "graph_category OpenVZ\n"; @@ -68,7 +68,7 @@ if ( $arg eq "autoconf" ) { my $name = $label; $name =~ s/\W/_/g; - print "$name.label $label: load average\n"; + print "$name.label $label\n"; print "$name.min 0\n"; if ($A==0) { print "$name.draw AREA\n";