From 5e3ff122f07d2b3e1e5b22be2519b18437191e89 Mon Sep 17 00:00:00 2001 From: Julien Mathis Date: Fri, 27 Feb 2009 17:14:26 +0000 Subject: [PATCH] fix bug #334 git-svn-id: http://svn.centreon.com/trunk/plugins-2.x@7676 6bcd3966-0018-0410-8128-fd23d134de7e --- src/check_centreon_snmp_cpu | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/check_centreon_snmp_cpu b/src/check_centreon_snmp_cpu index 48aadef5f..5e1c1fc36 100644 --- a/src/check_centreon_snmp_cpu +++ b/src/check_centreon_snmp_cpu @@ -41,7 +41,7 @@ if (eval "require centreon" ) { use vars qw($PROGNAME); use Getopt::Long; -use vars qw($opt_V $opt_h $opt_v $opt_C $opt_H $opt_c $opt_w $opt_D $snmp $opt_k $opt_u $opt_p @critical @warning); +use vars qw($opt_V $opt_h $opt_v $opt_C $opt_H $opt_c $opt_w $opt_D $snmp $opt_k $opt_u $opt_p @critical @warning $opt_l); # Plugin var init @@ -62,7 +62,8 @@ GetOptions "C=s" => \$opt_C, "community=s" => \$opt_C, "w=s" => \$opt_w, "warning=s" => \$opt_w, "c=s" => \$opt_c, "critical=s" => \$opt_c, - "H=s" => \$opt_H, "hostname=s" => \$opt_H); + "H=s" => \$opt_H, "hostname=s" => \$opt_H, + "l" => \$opt_l); if ($opt_V) { print_revision($PROGNAME,'$Revision: 1.2 $'); @@ -79,6 +80,8 @@ if (!$opt_H) { exit $ERRORS{'OK'}; } +$opt_l = 0 if (!defined($opt_l)); + my $snmp = "1"; $snmp = $opt_v if ($opt_v && $opt_v =~ /^[0-9]$/); @@ -185,8 +188,10 @@ if ($opt_w <= $cpu) { } my $str = "CPU utilization percentage : ".$cpu."%|avg=".$cpu."%"; -for ($i = 0; defined($cpulist[$i]); $i++){ +if ($opt_l == 0) { + for ($i = 0; defined($cpulist[$i]); $i++){ $str .= " cpu$i=".$cpulist[$i]."%"; + } } print $str."\n"; undef($str); @@ -212,7 +217,7 @@ sub print_usage () { sub print_help () { print "##############################################\n"; - print "# Copyright (c) 2004-2008 Merethis #\n"; + print "# Copyright (c) 2004-2009 Merethis #\n"; print "# Bugs to http://trac.centreon.com/ #\n"; print "##############################################\n"; print_usage();