Release v2.0.0

SteScho · Nov 25, 2016 · fae5464 · fae5464
1 parent d0cb8f6
commit fae5464
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 76 deletions.
diff --git a/plugins/check_snmp_boostedge.pl b/plugins/check_snmp_boostedge.pl
@@ -4,7 +4,7 @@
 # Date : Jan 16 2007
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://www.manubulon.com/nagios/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Changelog :
 # Contributors :
 #################################################################
@@ -38,7 +38,7 @@
 
 # Globals
 
-my $Version = '1.0';
+my $VERSION = "2.0.0";
 
 my $o_host      = undef;                                 # hostname
 my $o_community = undef;                                 # community
@@ -64,7 +64,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_boostedge version : $Version\n"; }
+sub p_version { print "check_snmp_boostedge version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -93,8 +93,8 @@ sub is_pattern_valid {    # Test for things like "<I\s*[^>" or "+5-i"
 }
 
 sub help {
-    print "\nSNMP Boostedge service monitor for Nagios version ", $Version, "\n";
-    print "GPL Licensen, (c)2006-2007 Patrick Proy\n\n";
+    print "\nSNMP Boostedge service monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL License, (c)2006-2007 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose

diff --git a/plugins/check_snmp_cpfw.pl b/plugins/check_snmp_cpfw.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w 
 ############################## check_snmp_cpfw ##############
-my $Version = '1.8';
+my $VERSION = "2.0.0";
 
 # Date : Oct 20 2007
 # Author  : Patrick Proy (patrick at proy.org)
 # Help : http://nagios.manubulon.com
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Contrib : StaGue
 # TODO :
 # - check sync method
@@ -101,7 +101,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_cpfw version : $Version\n"; }
+sub p_version { print "check_snmp_cpfw version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -115,8 +115,8 @@ sub isnnum {                                             # Return true if arg is
 }
 
 sub help {
-    print "\nSNMP Checkpoint FW-1 Monitor for Nagios version ", $Version, "\n";
-    print "GPL Licence, (c)2004-2007 - Patrick Proy\n\n";
+    print "\nSNMP Checkpoint FW-1 Monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL License, (c)2004-2007 - Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose

diff --git a/plugins/check_snmp_css.pl b/plugins/check_snmp_css.pl
@@ -4,7 +4,7 @@
 # Date : 27 Sept 2006
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://www.manubulon.com/nagios/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Changelog :
 # Contributors :
 #################################################################
@@ -35,7 +35,7 @@
 
 # Globals
 
-my $Version = '1.0';
+my $VERSION = "2.0.0";
 
 my $o_host      = undef;                                    # hostname
 my $o_community = undef;                                    # community
@@ -69,7 +69,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_css version : $Version\n"; }
+sub p_version { print "check_snmp_css version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -102,7 +102,7 @@ ($$)
 }
 
 sub help {
-    print "\nSNMP Cisco CSS monitor for Nagios version ", $Version, "\n";
+    print "\nSNMP Cisco CSS monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
     print "(c)2004-2006 Patrick Proy\n\n";
     print_usage();
     print <<EOT;

diff --git a/plugins/check_snmp_css_main.pl b/plugins/check_snmp_css_main.pl
@@ -4,7 +4,7 @@
 # Date : 27 Sept 2006
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://www.manubulon.com/nagios/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Changelog :
 # Contributors :
 #################################################################
@@ -35,7 +35,7 @@
 
 # Globals
 
-my $Version = '1.0';
+my $VERSION = "2.0.0";
 
 my $o_host      = undef;                                    # hostname
 my $o_community = undef;                                    # community
@@ -59,16 +59,16 @@
 
 # functions
 
-sub p_version { print "check_snmp_css_main version : $Version\n"; }
+sub p_version { print "check_snmp_css_main version : $VERSION\n"; }
 
 sub print_usage {
     print
 "Usage: $0 [-v] -H <host> -C <snmp_community> [-2] | (-l login -x passwd [-X pass -L <authp>,<privp>]) [-d directory] [-p <port>] [-t <timeout>] [-V]\n";
 }
 
 sub help {
-    print "\nSNMP Cisco CSS monitor MAIN script for Nagios version ", $Version, "\n";
-    print "GPL Licence, (c)2004-2006 Patrick Proy\n\n";
+    print "\nSNMP Cisco CSS monitor MAIN script for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL License, (c)2004-2006 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose

diff --git a/plugins/check_snmp_env.pl b/plugins/check_snmp_env.pl
@@ -4,7 +4,7 @@
 # Date : May 24 2007
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://www.manubulon.com/nagios/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Changelog :
 # Contributors : Fredrik Vocks
 #################################################################
@@ -167,7 +167,7 @@
 
 # Globals
 
-my $Version = '1.3';
+my $VERSION = "2.0.0";
 
 my $o_host      = undef;                                  # hostname
 my $o_community = undef;                                  # community
@@ -195,7 +195,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_env version : $Version\n"; }
+sub p_version { print "check_snmp_env version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -218,8 +218,8 @@ sub set_status {    # return worst status with this order : OK, unknwonw, warnin
 }
 
 sub help {
-    print "\nSNMP environmental Monitor for Nagios version ", $Version, "\n";
-    print "GPL Licence, (c)2006-2007 Patrick Proy\n\n";
+    print "\nSNMP environmental Monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL License, (c)2006-2007 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose

diff --git a/plugins/check_snmp_int.pl b/plugins/check_snmp_int.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 ############################## check_snmp_int ##############
-my $Version = '1.24';
+my $VERSION = "2.0.0";
 
 # Date : Oct 10 2007
 # Author  : Patrick Proy ( patrick at proy.org )
 # Help : http://nagios.manubulon.com
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Contrib : J. Jungmann, S. Probst, R. Leroy, M. Berger
 # TODO :
 # Maybe put base directory for performance as an option
@@ -47,8 +47,15 @@
 my $out_error_table    = '1.3.6.1.2.1.2.2.1.20.';
 my $out_discard_table  = '1.3.6.1.2.1.2.2.1.19.';
 
-my %status = (1 => 'UP', 2 => 'DOWN', 3 => 'TESTING', 4 => 'UNKNOWN', 5 => 'DORMANT', 6 => 'NotPresent',
-    7 => 'lowerLayerDown');
+my %status = (
+    1 => 'UP',
+    2 => 'DOWN',
+    3 => 'TESTING',
+    4 => 'UNKNOWN',
+    5 => 'DORMANT',
+    6 => 'NotPresent',
+    7 => 'lowerLayerDown'
+);
 
 # Globals
 
@@ -161,7 +168,7 @@ sub write_file {
     }
 }
 
-sub p_version { print "check_snmp_int version : $Version\n"; }
+sub p_version { print "check_snmp_int version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -175,8 +182,8 @@ sub isnnum {    # Return true if arg is not a number
 }
 
 sub help {
-    print "\nSNMP Network Interface Monitor for Nagios version ", $Version, "\n";
-    print "GPL licence, (c)2004-2007 Patrick Proy\n\n";
+    print "\nSNMP Network Interface Monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL license, (c)2004-2007 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose
@@ -796,20 +803,16 @@ sub check_options {
                         if (defined($o_ext_checkperf)) {
                             $checkperf_out[2]
                                 = (($$result{ $oid_perf_inerr[$i] } - $file_values[$j][3])
-                                / ($timenow - $file_values[$j][0]))
-                                * 60;
+                                / ($timenow - $file_values[$j][0])) * 60;
                             $checkperf_out[3]
                                 = (($$result{ $oid_perf_outerr[$i] } - $file_values[$j][4])
-                                / ($timenow - $file_values[$j][0]))
-                                * 60;
+                                / ($timenow - $file_values[$j][0])) * 60;
                             $checkperf_out[4]
                                 = (($$result{ $oid_perf_indisc[$i] } - $file_values[$j][5])
-                                / ($timenow - $file_values[$j][0]))
-                                * 60;
+                                / ($timenow - $file_values[$j][0])) * 60;
                             $checkperf_out[5]
                                 = (($$result{ $oid_perf_outdisc[$i] } - $file_values[$j][6])
-                                / ($timenow - $file_values[$j][0]))
-                                * 60;
+                                / ($timenow - $file_values[$j][0])) * 60;
                         }
                     }
                 }

diff --git a/plugins/check_snmp_linkproof_nhr.pl b/plugins/check_snmp_linkproof_nhr.pl
@@ -4,7 +4,7 @@
 # Date : Aug 24 2006
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://www.manubulon.com/nagios/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Changelog :
 # Contributors :
 #################################################################
@@ -29,7 +29,7 @@
 
 # Globals
 
-my $Version = '1.0';
+my $VERSION = "2.0.0";
 
 my $o_host      = undef;                           # hostname
 my $o_community = undef;                           # community
@@ -56,7 +56,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_linkproof_nhr version : $Version\n"; }
+sub p_version { print "check_snmp_linkproof_nhr version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -70,7 +70,7 @@ sub isnnum {                                       # Return true if arg is not a
 }
 
 sub help {
-    print "\nSNMP Radware Linkproof NHR monitor for Nagios version ", $Version, "\n";
+    print "\nSNMP Radware Linkproof NHR monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
     print "(c)2004-2006 Patrick Proy\n\n";
     print_usage();
     print <<EOT;

diff --git a/plugins/check_snmp_load.pl b/plugins/check_snmp_load.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w 
 ############################## check_snmp_load #################
-my $Version = '1.12';
+my $VERSION = "2.0.0";
 
 # Date : Oct 12 2007
 # Author  : Patrick Proy ( patrick at proy.org)
 # Help : http://nagios.manubulon.com/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Contributors : F. Lacroix and many others !!!
 #################################################################
 #
@@ -129,7 +129,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_load version : $Version\n"; }
+sub p_version { print "check_snmp_load version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -143,8 +143,8 @@ sub isnnum {                     # Return true if arg is not a number
 }
 
 sub help {
-    print "\nSNMP Load & CPU Monitor for Nagios version ", $Version, "\n";
-    print "GPL licence, (c)2004-2007 Patrick Proy\n\n";
+    print "\nSNMP Load & CPU Monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL license, (c)2004-2007 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose

diff --git a/plugins/check_snmp_mem.pl b/plugins/check_snmp_mem.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w 
 ############################## check_snmp_mem ##############
-my $Version = '1.5';
+my $VERSION = "2.0.0";
 
 # Date : 17 October 2007
 # Author  : Patrick Proy (nagios at proy.org)
 # Help : http://nagios.manubulon.com/
-# Licence : GPL - http://www.fsf.org/licenses/gpl.txt
+# License : GPL - http://www.fsf.org/licenses/gpl.txt
 # Contrib : Jan Jungmann, Patrick Griffin
 # TODO :
 #################################################################
@@ -91,7 +91,7 @@
 
 # functions
 
-sub p_version { print "check_snmp_mem version : $Version\n"; }
+sub p_version { print "check_snmp_mem version : $VERSION\n"; }
 
 sub print_usage {
     print
@@ -109,8 +109,8 @@ ($$)
 }
 
 sub help {
-    print "\nSNMP Memory Monitor for Nagios version ", $Version, "\n";
-    print "GPL licence, (c)2004-2007 Patrick Proy\n\n";
+    print "\nSNMP Memory Monitor for Icinga/Nagios/Naemon/Shinken, Version ", $VERSION, "\n";
+    print "GPL license, (c)2004-2007 Patrick Proy\n\n";
     print_usage();
     print <<EOT;
 -v, --verbose