From 5696c338c32ee2c126460ac0f80b40aca37cebdb Mon Sep 17 00:00:00 2001 From: dcaillibaud Date: Sun, 12 Feb 2012 12:34:41 +0100 Subject: [PATCH] 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" } }