diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/AUTHORS b/check_nwc_health/check_nwc_health-3.1/AUTHORS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/AUTHORS
rename to check_nwc_health/check_nwc_health-3.1/AUTHORS
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/COPYING b/check_nwc_health/check_nwc_health-3.1/COPYING
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/COPYING
rename to check_nwc_health/check_nwc_health-3.1/COPYING
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/ChangeLog b/check_nwc_health/check_nwc_health-3.1/ChangeLog
similarity index 94%
rename from check_nwc_health/check_nwc_health-3.0.3.7/ChangeLog
rename to check_nwc_health/check_nwc_health-3.1/ChangeLog
index e6c3376..653392b 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/ChangeLog
+++ b/check_nwc_health/check_nwc_health-3.1/ChangeLog
@@ -2,6 +2,21 @@
 # Changelog of the check_nwc_health plugin #
 ############################################
 
+2014-09-26 3.1
+- add Clavister Firewall (Thanks Dirk Goetz)
+- fix GLPluginSNMP, all timeout-like errors are UNKNOWN
+- allow warningx/criticalx to override cisco sensor thresholds
+
+2014-09-55 3.0.4
+- bugfix in glplugin (tmp-file-paths wrong under epn) (Thanks Sven Nierlein)
+
+2014-09-15 3.0.3.9
+- bugfix in bgp error states (Thanks Matthias Gallinger)
+- bugfix in f5 pools (Thanks Sven Nierlein)
+
+2014-08-28 3.0.3.8
+- bugfix in interface-usage/ifspeed (Thanks Matthias Gallinger)
+
 2014-08-26 3.0.3.7
 - bugfix in glpluginsnmp (undef errors with loadbalacer index)
 
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/INSTALL b/check_nwc_health/check_nwc_health-3.1/INSTALL
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/INSTALL
rename to check_nwc_health/check_nwc_health-3.1/INSTALL
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/Makefile.am b/check_nwc_health/check_nwc_health-3.1/Makefile.am
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/Makefile.am
rename to check_nwc_health/check_nwc_health-3.1/Makefile.am
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/Makefile.in b/check_nwc_health/check_nwc_health-3.1/Makefile.in
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/Makefile.in
rename to check_nwc_health/check_nwc_health-3.1/Makefile.in
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/NEWS b/check_nwc_health/check_nwc_health-3.1/NEWS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/NEWS
rename to check_nwc_health/check_nwc_health-3.1/NEWS
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/README b/check_nwc_health/check_nwc_health-3.1/README
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/README
rename to check_nwc_health/check_nwc_health-3.1/README
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/THANKS b/check_nwc_health/check_nwc_health-3.1/THANKS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/THANKS
rename to check_nwc_health/check_nwc_health-3.1/THANKS
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/TODO b/check_nwc_health/check_nwc_health-3.1/TODO
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/TODO
rename to check_nwc_health/check_nwc_health-3.1/TODO
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/acinclude.m4 b/check_nwc_health/check_nwc_health-3.1/acinclude.m4
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/acinclude.m4
rename to check_nwc_health/check_nwc_health-3.1/acinclude.m4
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/aclocal.m4 b/check_nwc_health/check_nwc_health-3.1/aclocal.m4
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/aclocal.m4
rename to check_nwc_health/check_nwc_health-3.1/aclocal.m4
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/config.guess b/check_nwc_health/check_nwc_health-3.1/config.guess
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/config.guess
rename to check_nwc_health/check_nwc_health-3.1/config.guess
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/config.sub b/check_nwc_health/check_nwc_health-3.1/config.sub
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/config.sub
rename to check_nwc_health/check_nwc_health-3.1/config.sub
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/configure b/check_nwc_health/check_nwc_health-3.1/configure
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/configure
rename to check_nwc_health/check_nwc_health-3.1/configure
index 2e4d9d2..1a3abfb 100755
--- a/check_nwc_health/check_nwc_health-3.0.3.7/configure
+++ b/check_nwc_health/check_nwc_health-3.1/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for check_nwc_health 3.0.3.7.
+# Generated by GNU Autoconf 2.69 for check_nwc_health 3.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='check_nwc_health'
 PACKAGE_TARNAME='check_nwc_health'
-PACKAGE_VERSION='3.0.3.7'
-PACKAGE_STRING='check_nwc_health 3.0.3.7'
+PACKAGE_VERSION='3.1'
+PACKAGE_STRING='check_nwc_health 3.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures check_nwc_health 3.0.3.7 to adapt to many kinds of systems.
+\`configure' configures check_nwc_health 3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1299,7 +1299,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of check_nwc_health 3.0.3.7:";;
+     short | recursive ) echo "Configuration of check_nwc_health 3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,7 +1385,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-check_nwc_health configure 3.0.3.7
+check_nwc_health configure 3.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1402,7 +1402,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by check_nwc_health $as_me 3.0.3.7, which was
+It was created by check_nwc_health $as_me 3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2265,7 +2265,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='check_nwc_health'
- VERSION='3.0.3.7'
+ VERSION='3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3351,7 +3351,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by check_nwc_health $as_me 3.0.3.7, which was
+This file was extended by check_nwc_health $as_me 3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3404,7 +3404,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-check_nwc_health config.status 3.0.3.7
+check_nwc_health config.status 3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/configure.ac b/check_nwc_health/check_nwc_health-3.1/configure.ac
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/configure.ac
rename to check_nwc_health/check_nwc_health-3.1/configure.ac
index 1631754..40c7f52 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/configure.ac
+++ b/check_nwc_health/check_nwc_health-3.1/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision: 1.150 $)
 AC_PREREQ(2.58)
-AC_INIT(check_nwc_health,3.0.3.7)
+AC_INIT(check_nwc_health,3.1)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
 AC_CANONICAL_HOST
 
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/install-sh b/check_nwc_health/check_nwc_health-3.1/install-sh
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/install-sh
rename to check_nwc_health/check_nwc_health-3.1/install-sh
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/missing b/check_nwc_health/check_nwc_health-3.1/missing
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/missing
rename to check_nwc_health/check_nwc_health-3.1/missing
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AlliedTelesyn.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AlliedTelesyn.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/AlliedTelesyn.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AlliedTelesyn.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/BGP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/BGP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
similarity index 98%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
index 9ed2d42..2f147bd 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
@@ -179,7 +179,7 @@ sub check {
   } else {
     $self->{bgpPeerRemoteAsImportant} = 1;
   }
-  if ($self->{bgpPeerState} eq "established" || $self->{bgpPeerState} eq "idle") {
+  if ($self->{bgpPeerState} eq "established") {
     $self->add_ok(sprintf "peer %s (AS%s) state is %s since %s",
         $self->{bgpPeerRemoteAddr},
         $self->{bgpPeerRemoteAs}.$self->{bgpPeerRemoteAsName},
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Bluecoat.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Bluecoat.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Bluecoat.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Bluecoat.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Brocade.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Brocade.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Brocade.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Brocade.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/ASA.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/ASA.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/ASA.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/ASA.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
similarity index 75%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
index 413a7be..a818493 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
@@ -31,6 +31,7 @@ sub init {
 package Classes::Cisco::CISCOENTITYSENSORMIB::Component::SensorSubsystem::Sensor;
 our @ISA = qw(GLPlugin::SNMP::TableItem);
 use strict;
+use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
 
 sub finish {
   my $self = shift;
@@ -58,13 +59,10 @@ sub check {
     return;
   } elsif ($self->{entSensorStatus} eq "unavailable") {
     return;
-  } elsif (scalar(grep { $_->{entSensorThresholdEvaluation} eq "true" }
-        @{$self->{thresholds}})) {
-    $self->add_critical(sprintf "%s sensor %s threshold evaluation is true", 
-        $self->{entSensorType},
-        $self->{entPhysicalIndex});
-  } else {
   }
+  my $label = sprintf('sens_%s_%s', $self->{entSensorType}, $self->{entPhysicalIndex});
+  my $warningx = ($self->get_thresholds(metric => $label))[0];
+  my $criticalx = ($self->get_thresholds(metric => $label))[1];
   if (scalar(@{$self->{thresholds}} == 2)) {
     # reparaturlauf
     foreach my $idx (0..1) {
@@ -83,19 +81,90 @@ sub check {
     my $critical = (map { $_->{entSensorThresholdValue} } 
         grep { $_->{entSensorThresholdSeverity} eq "major" }
         @{$self->{thresholds}})[0];
+    $self->set_thresholds(
+        metric => $label,
+        warning => $warning, critical => $critical
+    );
+    if ((defined($criticalx) && 
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == CRITICAL) ||
+        (! defined($criticalx) && 
+            grep { $_->{entSensorThresholdEvaluation} eq "true" } 
+            grep { $_->{entSensorThresholdSeverity} eq "major" } @{$self->{thresholds}})) {
+      # eigener schwellwert hat vorrang
+      $self->add_critical(sprintf "%s sensor %s threshold evaluation is true (value: %s, major threshold: %s)", 
+          $self->{entSensorType},
+          $self->{entPhysicalIndex},
+          $self->{entSensorValue},
+          defined($criticalx) ? $criticalx : $critical
+      );
+    } elsif ((defined($warningx) && 
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == WARNING) ||
+        (! defined($warningx) && 
+            grep { $_->{entSensorThresholdEvaluation} eq "true" } 
+            grep { $_->{entSensorThresholdSeverity} eq "minor" } @{$self->{thresholds}})) {
+      $self->add_warning(sprintf "%s sensor %s threshold evaluation is true (value: %s, minor threshold: %s)", 
+          $self->{entSensorType},
+          $self->{entPhysicalIndex},
+          $self->{entSensorValue},
+          defined($warningx) ? $warningx : $warning
+      );
+    }
     $self->add_perfdata(
-        label => sprintf('sens_%s_%s', $self->{entSensorType}, $self->{entPhysicalIndex}),
+        label => $label,
         value => $self->{entSensorValue},
-        warning => $warning,
-        critical => $critical,
+        warning => defined($warningx) ? $warningx : $warning,
+        critical => defined($criticalx) ? $criticalx : $critical,
     );
   } elsif ($self->{entSensorValue}) {
-    $self->add_perfdata(
-        label => sprintf('sens_%s_%s', $self->{entSensorType}, $self->{entPhysicalIndex}),
-        value => $self->{entSensorValue},
-        warning => $self->{ciscoEnvMonSensorThreshold},
-        critical => undef,
-    );
+    if ((defined($criticalx) && 
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == CRITICAL) ||
+       (defined($warningx) && 
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == WARNING) ||
+       $self->{entSensorThresholdEvaluation} eq "true") {
+    }
+    if (defined($criticalx) &&
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == CRITICAL) {
+      $self->add_critical(sprintf "%s sensor %s threshold evaluation is true (value: %s)",
+          $self->{entSensorType},
+          $self->{entPhysicalIndex},
+          $self->{entSensorValue}
+      );
+      $self->add_perfdata(
+          label => $label,
+          value => $self->{entSensorValue},
+          critical => $criticalx,
+          warning => $warningx,
+      );
+    } elsif (defined($warningx) &&
+        $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == WARNING) {
+      $self->add_warning(sprintf "%s sensor %s threshold evaluation is true (value: %s)",
+          $self->{entSensorType},
+          $self->{entPhysicalIndex},
+          $self->{entSensorValue}
+      );
+      $self->add_perfdata(
+          label => $label,
+          value => $self->{entSensorValue},
+          critical => $criticalx,
+          warning => $warningx,
+      );
+    } elsif ($self->{entSensorThresholdEvaluation} eq "true") {
+      $self->add_warning(sprintf "%s sensor %s threshold evaluation is true (value: %s)",
+          $self->{entSensorType},
+          $self->{entPhysicalIndex},
+          $self->{entSensorValue}
+      );
+      $self->add_perfdata(
+          label => $label,
+          value => $self->{entSensorValue},
+          warning => $self->{ciscoEnvMonSensorThreshold},
+      );
+    }
+  } elsif (scalar(grep { $_->{entSensorThresholdEvaluation} eq "true" }
+      @{$self->{thresholds}})) {
+    $self->add_warning(sprintf "%s sensor %s threshold evaluation is true", 
+        $self->{entSensorType},
+        $self->{entPhysicalIndex});
   }
 }
 
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/PrimeNCS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/PrimeNCS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/PrimeNCS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/PrimeNCS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/UCOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/UCOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/UCOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/UCOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister.pm
new file mode 100644
index 0000000..2959d78
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister.pm
@@ -0,0 +1,19 @@
+package Classes::Clavister;
+our @ISA = qw(Classes::Device);
+use strict;
+
+use constant trees => (
+    '1.3.6.1.4.1.5089', # CLAVISTER-MIB
+);
+
+sub init {
+  my $self = shift;
+  if ($self->{productname} =~ /Clavister/i) {
+    bless $self, 'Classes::Clavister::Firewall1';
+    $self->debug('using Classes::Clavister::Firewall1');
+  }
+  if (ref($self) ne "Classes::Clavister") {
+    $self->init();
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1.pm
new file mode 100644
index 0000000..537b69e
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1.pm
@@ -0,0 +1,17 @@
+package Classes::Clavister::Firewall1;
+our @ISA = qw(Classes::Clavister);
+use strict;
+
+sub init {
+  my $self = shift;
+  if ($self->mode =~ /device::hardware::health/) {
+    $self->analyze_and_check_environmental_subsystem("Classes::Clavister::Firewall1::Component::EnvironmentalSubsystem");
+  } elsif ($self->mode =~ /device::hardware::load/) {
+    $self->analyze_and_check_cpu_subsystem("Classes::Clavister::Firewall1::Component::CpuSubsystem");
+  } elsif ($self->mode =~ /device::hardware::memory/) {
+    $self->analyze_and_check_mem_subsystem("Classes::Clavister::Firewall1::Component::MemSubsystem");
+  } else {
+    $self->no_such_mode();
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm
new file mode 100644
index 0000000..0e97b36
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm
@@ -0,0 +1,23 @@
+package Classes::Clavister::Firewall1::Component::CpuSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_objects('CLAVISTER-MIB', (qw(
+      clvSysCpuLoad)));
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('checking cpus');
+  $self->add_info(sprintf 'cpu usage is %.2f%%', $self->{clvSysCpuLoad});
+  $self->set_thresholds(warning => 80, critical => 90);
+  $self->add_message($self->check_thresholds($self->{clvSysCpuLoad}));
+  $self->add_perfdata(
+      label => 'cpu_usage',
+      value => $self->{clvSysCpuLoad},
+      uom => '%',
+  );
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm
new file mode 100644
index 0000000..6f4420e
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm
@@ -0,0 +1,47 @@
+package Classes::Clavister::Firewall1::Component::EnvironmentalSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+use Data::Dumper;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('CLAVISTER-MIB', [
+      ['sensor', 'clvHWSensorEntry', 'Classes::Clavister::Firewall1::Component::HWSensor'],
+  ]);
+}
+
+sub check {
+  my $self = shift;
+  foreach (@{$self->{sensor}}) {
+    $_->check();
+  }
+}
+
+
+package Classes::Clavister::Firewall1::Component::HWSensor;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  if ($self->{clvHWSensorName} =~ /Fan/i) {
+    $self->add_info(sprintf '%s is running (%d %s)', 
+        $self->{clvHWSensorName}, $self->{clvHWSensorValue}, $self->{clvHWSensorUnit});
+    $self->set_thresholds(warning => "6000:7500", critical => "1000:10000");
+    $self->add_message($self->check_thresholds($self->{clvHWSensorValue}));
+    $self->add_perfdata(
+        label => $self->{clvHWSensorName}.'_rpm',
+        value => $self->{clvHWSensorValue},
+    );
+  } elsif ($self->{clvHWSensorName} =~ /Temp/i) {
+    $self->add_info(sprintf '%s is running (%d %s)',
+        $self->{clvHWSensorName}, $self->{clvHWSensorValue}, $self->{clvHWSensorUnit});
+    $self->set_thresholds(warning => 60, critical => 70);
+    $self->add_message($self->check_thresholds($self->{clvHWSensorValue}));
+    $self->add_perfdata(
+        label => $self->{clvHWSensorName}.'_'.$self->{clvHWSensorUnit},
+        value => $self->{clvHWSensorValue},
+    );
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm
new file mode 100644
index 0000000..3133326
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm
@@ -0,0 +1,22 @@
+package Classes::Clavister::Firewall1::Component::MemSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_objects('CLAVISTER-MIB', (qw(
+      clvSysMemUsage)));
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf 'memory usage is %.2f%%', $self->{clvSysMemUsage});
+  $self->set_thresholds(warning => 80, critical => 90);
+  $self->add_message($self->check_thresholds($self->{clvSysMemUsage}));
+  $self->add_perfdata(
+      label => 'memory_usage',
+      value => $self->{clvSysMemUsage},
+      uom => '%',
+  );
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Device.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm
similarity index 97%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Device.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm
index 7cfd99a..8577fab 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Device.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm
@@ -25,6 +25,7 @@ sub classify {
       $self->{productname} = 'procurve' if $self->opts->servertype eq 'procurve';
       $self->{productname} = 'bluecoat' if $self->opts->servertype eq 'bluecoat';
       $self->{productname} = 'checkpoint' if $self->opts->servertype eq 'checkpoint';
+      $self->{productname} = 'clavister' if $self->opts->servertype eq 'clavister';
       $self->{productname} = 'ifmib' if $self->opts->servertype eq 'ifmib';
     }
     if (! $self->check_messages()) {
@@ -110,6 +111,9 @@ sub classify {
       } elsif ($self->{productname} =~ /(cpx86_64)|(Check\s*Point)|(Linux.*\dcp )/i) {
         bless $self, 'Classes::CheckPoint';
         $self->debug('using Classes::CheckPoint');
+      } elsif ($self->{productname} =~ /Clavister/i) {
+        bless $self, 'Classes::Clavister';
+        $self->debug('using Classes::Clavister');
       } elsif ($self->{productname} =~ /Blue\s*Coat/i) {
         bless $self, 'Classes::Bluecoat';
         $self->debug('using Classes::Bluecoat');
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
index dc143be..0f107e5 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
@@ -154,6 +154,7 @@ use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
 sub finish {
   my $self = shift;
   $self->{ltmPoolMemberMonitorRule} ||= $self->{ltmPoolMonitorRule};
+  $self->{members} = [];
 }
 
 sub check {
@@ -314,6 +315,11 @@ our @ISA = qw(GLPlugin::SNMP::TableItem);
 use strict;
 use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
 
+sub finish {
+  my $self = shift;
+  $self->{members} = [];
+}
+
 sub check {
   my $self = shift;
   $self->add_info(sprintf 'pool %s active members: %d of %d', $self->{poolName},
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HSRP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HSRP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
index d80a2f7..e8b1b56 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
@@ -398,8 +398,8 @@ sub init {
           ($self->{delta_timestamp} * $self->opts->ifspeed);
       $self->{outputUtilization} = $self->{delta_ifOutOctets} * 8 * 100 /
           ($self->{delta_timestamp} * $self->opts->ifspeed);
-      $self->{maxInputRate} = $self->opts->ifspeedin;
-      $self->{maxOutputRate} = $self->opts->ifspeedout;
+      $self->{maxInputRate} = $self->opts->ifspeed;
+      $self->{maxOutputRate} = $self->opts->ifspeed;
     }
     $self->{inputRate} = $self->{delta_ifInOctets} / $self->{delta_timestamp};
     $self->{outputRate} = $self->{delta_ifOutOctets} / $self->{delta_timestamp};
@@ -688,8 +688,8 @@ sub init {
           ($self->{delta_timestamp} * $self->opts->ifspeed);
       $self->{outputUtilization} = $self->{delta_ifHCOutOctets} * 8 * 100 /
           ($self->{delta_timestamp} * $self->opts->ifspeed);
-      $self->{maxInputRate} = $self->opts->ifspeedin;
-      $self->{maxOutputRate} = $self->opts->ifspeedout;
+      $self->{maxInputRate} = $self->opts->ifspeed;
+      $self->{maxOutputRate} = $self->opts->ifspeed;
     }
     $self->{inputRate} = $self->{delta_ifHCInOctets} / $self->{delta_timestamp};
     $self->{outputRate} = $self->{delta_ifHCOutOctets} / $self->{delta_timestamp};
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Lantronix.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Lantronix.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Lantronix/SLS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix/SLS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Lantronix/SLS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix/SLS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/MEOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MEOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/MEOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MEOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/MibsAndOids.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/MibsAndOids.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm
index deed266..8afd82d 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/MibsAndOids.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm
@@ -1274,6 +1274,18 @@ $GLPlugin::SNMP::mibs_and_oids = {
     ciscoNatMIBCompliances => '1.3.6.1.4.1.9.10.77.3.1',
     ciscoNatMIBGroups => '1.3.6.1.4.1.9.10.77.3.2',
   },
+  'CISCO-FEATURE-CONTROL-MIB' => {
+    cfcFeatureCtrlTable => '1.3.6.1.4.1.9.9.377.1.1.1',
+    cfcFeatureCtrlEntry => '1.3.6.1.4.1.9.9.377.1.1.1.1',
+    cfcFeatureCtrlIndex => 'CISCO-FEATURE-CONTROL-MIB::CiscoOptionalFeature',
+    cfcFeatureCtrlName => '1.3.6.1.4.1.9.9.377.1.1.1.1.2',
+    cfcFeatureCtrlAction => 'CISCO-FEATURE-CONTROL-MIB::CiscoFeatureAction',
+    cfcFeatureCtrlLastAction => 'CISCO-FEATURE-CONTROL-MIB::CiscoFeatureAction',
+    cfcFeatureCtrlLastActionResult => 'CISCO-FEATURE-CONTROL-MIB::CiscoFeatureActionResult',
+    cfcFeatureCtrlLastFailureReason => '1.3.6.1.4.1.9.9.377.1.1.1.1.6',
+    cfcFeatureCtrlOpStatus => 'CISCO-FEATURE-CONTROL-MIB::CiscoFeatureStatus',
+    cfcFeatureCtrlOpStatusReason => '1.3.6.1.4.1.9.9.377.1.1.1.1.8',
+  },
   'AIRESPACE-SWITCHING-MIB' => {
       bsnSwitching => '1.3.6.1.4.1.14179.1',
       agentInfoGroup => '1.3.6.1.4.1.14179.1.1',
@@ -4362,6 +4374,17 @@ $GLPlugin::SNMP::mibs_and_oids = {
           2 => 'unknown',
       },
   },
+  'CLAVISTER-MIB' => {
+      'clvSystem' => '1.3.6.1.4.1.5089.1.2.1',
+      'clvSysCpuLoad' => '1.3.6.1.4.1.5089.1.2.1.1.0',
+      'clvHWSensorTable' => '1.3.6.1.4.1.5089.1.2.1.11',
+      'clvHWSensorEntry' => '1.3.6.1.4.1.5089.1.2.1.11.1',
+      'clvHWSensorIndex' => '1.3.6.1.4.1.5089.1.2.1.11.1.1',
+      'clvHWSensorName' => '1.3.6.1.4.1.5089.1.2.1.11.1.2',
+      'clvHWSensorValue' => '1.3.6.1.4.1.5089.1.2.1.11.1.3',
+      'clvHWSensorUnit' => '1.3.6.1.4.1.5089.1.2.1.11.1.4',
+      'clvSysMemUsage' => '1.3.6.1.4.1.5089.1.2.1.12.0',
+  },
   'NETSCREEN-RESOURCE-MIB' => {
       nsResCpuAvg => '1.3.6.1.4.1.3224.16.1.1.0',
       nsResCpuLast15Min => '1.3.6.1.4.1.3224.16.1.4.0',
@@ -6281,5 +6304,44 @@ $GLPlugin::SNMP::definitions = {
       4 => 'info',
     },
   },
+  'CISCO-FEATURE-CONTROL-MIB' => {
+    'CiscoOptionalFeature' => {
+      1 => 'ivr',
+      2 => 'fcip',
+      3 => 'fcsp',
+      4 => 'ficon',
+      5 => 'iscsi',
+      6 => 'tacacs',
+      7 => 'qosManager',
+      8 => 'portSecurity',
+      9 => 'fabricBinding',
+      10 => 'iscsiInterfaceVsanMembership',
+      11 => 'ike',
+      12 => 'isns',
+      13 => 'ipSec',
+      14 => 'portTracker',
+      15 => 'scheduler',
+      16 => 'npiv',
+      17 => 'sanExtTuner',
+      18 => 'dpvm',
+      19 => 'extenedCredit',
+    },
+    'CiscoFeatureAction' => {
+      1 => 'noOp',
+      2 => 'enable',
+      3 => 'disable',
+    },
+    'CiscoFeatureStatus' => {
+      1 => 'unknown',
+      2 => 'enabled',
+      3 => 'disabled',
+    },
+    'CiscoFeatureActionResult' => {
+      1 => 'none',
+      2 => 'actionSuccess',
+      3 => 'actionFailed',
+      4 => 'actionInProgress',
+    },
+  },
 };
 
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Nortel.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Nortel.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Nortel.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Nortel.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SecureOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SecureOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/SecureOS.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SecureOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Server/Linux.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Server/Linux.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/Server/Linux.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Server/Linux.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPlugin.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPlugin.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm
index a3b67a9..9fe4ff6 100755
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPlugin.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm
@@ -12,7 +12,7 @@ use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
 {
   our $mode = undef;
   our $plugin = undef;
-  our $pluginname = basename($0);
+  our $pluginname = basename($ENV{'NAGIOS_PLUGIN'} || $0);
   our $blacklist = undef;
   our $info = [];
   our $extendedinfo = [];
@@ -191,7 +191,7 @@ sub get_variable {
 sub debug {
   my $self = shift;
   my $format = shift;
-  my $tracefile = "/tmp/".$0.".trace";
+  my $tracefile = "/tmp/".$GLPlugin::pluginname.".trace";
   $self->{trace} = -f $tracefile ? 1 : 0;
   if ($self->get_variable("verbose") &&
       $self->get_variable("verbose") > $self->get_variable("verbosity", 10)) {
@@ -414,7 +414,7 @@ sub load_my_extension {
     if (! $self->opts->get("with-mymodules-dyn-dir")) {
       $self->override_opt("with-mymodules-dyn-dir", "");
     }
-    my $plugin_name = basename($0);
+    my $plugin_name = $GLPlugin::pluginname;
     $plugin_name =~ /check_(.*?)_health/;
     $plugin_name = "Check".uc(substr($1, 0, 1)).substr($1, 1)."Health";
     foreach my $libpath (split(":", $self->opts->get("with-mymodules-dyn-dir"))) {
@@ -1071,7 +1071,7 @@ sub DESTROY {
 sub debug {
   my $self = shift;
   my $format = shift;
-  my $tracefile = "/tmp/".$0.".trace";
+  my $tracefile = "/tmp/".$GLPlugin::pluginname.".trace";
   $self->{trace} = -f $tracefile ? 1 : 0;
   if ($self->opts->verbose && $self->opts->verbose > 10) {
     printf("%s: ", scalar localtime);
@@ -1533,13 +1533,11 @@ sub _init {
   my $self = shift;
   my %params = @_;
   # Check params
-  my $plugin = basename($0);
-  #my %attr = validate( @_, {
   my %attr = (
     usage => 1,
     version => 0,
     url => 0,
-    plugin => { default => $plugin },
+    plugin => { default => $GLPlugin::pluginname },
     blurb => 0,
     extra => 0,
     'extra-opts' => 0,
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPluginSNMP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPluginSNMP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm
index a2e61bc..030b2e4 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPluginSNMP.pm
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm
@@ -169,7 +169,7 @@ sub init {
   my $self = shift;
   if ($self->mode =~ /device::walk/) {
     my @trees = ();
-    my $name = $0;
+    my $name = $GLPlugin::pluginname;
     $name =~ s/.*\///g;
     $name = sprintf "/tmp/snmpwalk_%s_%s", $name, $self->opts->hostname;
     if ($self->opts->oids) {
@@ -859,7 +859,7 @@ sub check_snmp_and_model {
         $self->add_message(UNKNOWN,
             'could not contact snmp agent, timeout during snmp-get sysUptime');
       } else {
-        $self->add_message(CRITICAL,
+        $self->add_message(UNKNOWN,
             'got neither sysUptime nor sysDescr, is this snmp agent working correctly?');
       }
       $GLPlugin::SNMP::session->close if $GLPlugin::SNMP::session;
@@ -1635,11 +1635,9 @@ sub get_entries_by_walk {
       }
     } else {
       $params{-maxrepetitions} = 200;
-          printf "bratta %s\n", Data::Dumper::Dumper(\@baseoids);
       foreach my $baseoid (@baseoids) {
         $params{-varbindlist} = [$baseoid];
         while (my $result = $GLPlugin::SNMP::session->get_bulk_request(%params)) {
-          printf "hoi %s\n", Data::Dumper::Dumper($result);
           my @names = $GLPlugin::SNMP::session->var_bind_names();
           my @oids = $self->sort_oids(\@names);
           $params{-varbindlist} = [pop @oids];
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPluginUPNP.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginUPNP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/GLPluginUPNP.pm
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginUPNP.pm
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.am b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am
similarity index 96%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.am
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am
index 3381aca..9880cb9 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.am
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am
@@ -137,6 +137,11 @@ EXTRA_MODULES=\
   Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm \
   Classes/CheckPoint/Firewall1.pm \
   Classes/CheckPoint.pm \
+  Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm \
+  Classes/Clavister/Firewall1/Component/CpuSubsystem.pm \
+  Classes/Clavister/Firewall1/Component/MemSubsystem.pm \
+  Classes/Clavister/Firewall1.pm \
+  Classes/Clavister.pm \
   Classes/SGOS/Component/MemSubsystem.pm \
   Classes/SGOS/Component/CpuSubsystem.pm \
   Classes/SGOS/Component/EnvironmentalSubsystem.pm \
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.in b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in
similarity index 98%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.in
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in
index ee623af..3dfb839 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/Makefile.in
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in
@@ -366,6 +366,11 @@ EXTRA_MODULES = \
   Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm \
   Classes/CheckPoint/Firewall1.pm \
   Classes/CheckPoint.pm \
+  Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm \
+  Classes/Clavister/Firewall1/Component/CpuSubsystem.pm \
+  Classes/Clavister/Firewall1/Component/MemSubsystem.pm \
+  Classes/Clavister/Firewall1.pm \
+  Classes/Clavister.pm \
   Classes/SGOS/Component/MemSubsystem.pm \
   Classes/SGOS/Component/CpuSubsystem.pm \
   Classes/SGOS/Component/EnvironmentalSubsystem.pm \
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/check_nwc_health.pl b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl
similarity index 96%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/check_nwc_health.pl
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl
index 4550874..4afa1f7 100644
--- a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/check_nwc_health.pl
+++ b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl
@@ -1,517 +1,517 @@
-# /usr/bin/perl -w
-
-use strict;
-use File::Basename;
-
-my $plugin = Classes::Device->new(
-    shortname => '',
-    usage => 'Usage: %s [ -v|--verbose ] [ -t <timeout> ] '.
-        '--mode <what-to-do> '.
-        '--hostname <network-component> --community <snmp-community>'.
-        '  ...]',
-    version => '$Revision: #PACKAGE_VERSION# $',
-    blurb => 'This plugin checks various parameters of network components ',
-    url => 'http://labs.consol.de/nagios/check_nwc_health',
-    timeout => 60,
-    plugin => basename($0),
-);
-$plugin->add_mode(
-    internal => 'device::uptime',
-    spec => 'uptime',
-    alias => undef,
-    help => 'Check the uptime of the device',
-);
-$plugin->add_mode(
-    internal => 'device::hardware::health',
-    spec => 'hardware-health',
-    alias => undef,
-    help => 'Check the status of environmental equipment (fans, temperatures, power)',
-);
-$plugin->add_mode(
-    internal => 'device::hardware::load',
-    spec => 'cpu-load',
-    alias => ['cpu-usage'],
-    help => 'Check the CPU load of the device',
-);
-$plugin->add_mode(
-    internal => 'device::hardware::memory',
-    spec => 'memory-usage',
-    alias => undef,
-    help => 'Check the memory usage of the device',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::usage',
-    spec => 'interface-usage',
-    alias => undef,
-    help => 'Check the utilization of interfaces',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::errors',
-    spec => 'interface-errors',
-    alias => undef,
-    help => 'Check the error-rate of interfaces (without discards)',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::discards',
-    spec => 'interface-discards',
-    alias => undef,
-    help => 'Check the discard-rate of interfaces',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::operstatus',
-    spec => 'interface-status',
-    alias => undef,
-    help => 'Check the status of interfaces (oper/admin)',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::nat::sessions::count',
-    spec => 'interface-nat-count-sessions',
-    alias => undef,
-    help => 'Count the number of nat sessions',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::nat::rejects',
-    spec => 'interface-nat-rejects',
-    alias => undef,
-    help => 'Count the number of nat sessions rejected due to lack of resources',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::list',
-    spec => 'list-interfaces',
-    alias => undef,
-    help => 'Show the interfaces of the device and update the name cache',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::listdetail',
-    spec => 'list-interfaces-detail',
-    alias => undef,
-    help => 'Show the interfaces of the device and some details',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::availability',
-    spec => 'interface-availability',
-    alias => undef,
-    help => 'Show the availability (oper != up) of interfaces',
-);
-$plugin->add_mode(
-    internal => 'device::interfaces::aggregation::availability',
-    spec => 'link-aggregation-availability',
-    alias => undef,
-    help => 'Check the percentage of up interfaces in a link aggregation',
-);
-$plugin->add_mode(
-    internal => 'device::shinken::interface',
-    spec => 'create-shinken-service',
-    alias => undef,
-    help => 'Create a Shinken service definition',
-);
-$plugin->add_mode(
-    internal => 'device::hsrp::state',
-    spec => 'hsrp-state',
-    alias => undef,
-    help => 'Check the state in a HSRP group',
-);
-$plugin->add_mode(
-    internal => 'device::hsrp::failover',
-    spec => 'hsrp-failover',
-    alias => undef,
-    help => 'Check if a HSRP group\'s nodes have changed their roles',
-);
-$plugin->add_mode(
-    internal => 'device::hsrp::list',
-    spec => 'list-hsrp-groups',
-    alias => undef,
-    help => 'Show the HSRP groups configured on this device',
-);
-$plugin->add_mode(
-    internal => 'device::bgp::peer::status',
-    spec => 'bgp-peer-status',
-    alias => undef,
-    help => 'Check status of BGP peers',
-);
-$plugin->add_mode(
-    internal => 'device::bgp::peer::list',
-    spec => 'list-bgp-peers',
-    alias => undef,
-    help => 'Show BGP peers known to this device',
-);
-$plugin->add_mode(
-    internal => 'device::ha::role',
-    spec => 'ha-role',
-    alias => undef,
-    help => 'Check the role in a ha group',
-);
-$plugin->add_mode(
-    internal => 'device::svn::status',
-    spec => 'svn-status',
-    alias => undef,
-    help => 'Check the status of the svn subsystem',
-);
-$plugin->add_mode(
-    internal => 'device::mngmt::status',
-    spec => 'mngmt-status',
-    alias => undef,
-    help => 'Check the status of the management subsystem',
-);
-$plugin->add_mode(
-    internal => 'device::fw::policy::installed',
-    spec => 'fw-policy',
-    alias => undef,
-    help => 'Check the installed firewall policy',
-);
-$plugin->add_mode(
-    internal => 'device::fw::policy::connections',
-    spec => 'fw-connections',
-    alias => undef,
-    help => 'Check the number of firewall policy connections',
-);
-$plugin->add_mode(
-    internal => 'device::lb::session::usage',
-    spec => 'session-usage',
-    alias => undef,
-    help => 'Check the session limits of a load balancer',
-);
-$plugin->add_mode(
-    internal => 'device::security',
-    spec => 'security-status',
-    alias => undef,
-    help => 'Check if there are security-relevant incidents',
-);
-$plugin->add_mode(
-    internal => 'device::lb::pool::completeness',
-    spec => 'pool-completeness',
-    alias => undef,
-    help => 'Check the members of a load balancer pool',
-);
-$plugin->add_mode(
-    internal => 'device::lb::pool::list',
-    spec => 'list-pools',
-    alias => undef,
-    help => 'List load balancer pools',
-);
-$plugin->add_mode(
-    internal => 'device::licenses::validate',
-    spec => 'check-licenses',
-    alias => undef,
-    help => 'Check the installed licences/keys',
-);
-$plugin->add_mode(
-    internal => 'device::users::count',
-    spec => 'count-users',
-    alias => ['count-sessions', 'count-connections'],
-    help => 'Count the (connected) users/sessions',
-);
-$plugin->add_mode(
-    internal => 'device::config::status',
-    spec => 'check-config',
-    alias => undef,
-    help => 'Check the status of configs (cisco, unsaved config changes)',
-);
-$plugin->add_mode(
-    internal => 'device::connections::check',
-    spec => 'check-connections',
-    alias => undef,
-    help => 'Check the quality of connections',
-);
-$plugin->add_mode(
-    internal => 'device::connections::count',
-    spec => 'count-connections',
-    alias => ['count-connections-client', 'count-connections-server'],
-    help => 'Check the number of connections (-client, -server is possible)',
-);
-$plugin->add_mode(
-    internal => 'device::cisco::fex::watch',
-    spec => 'watch-fexes',
-    alias => undef,
-    help => 'Check if FEXes appear and disappear (use --lookup)',
-);
-$plugin->add_mode(
-    internal => 'device::wlan::aps::status',
-    spec => 'accesspoint-status',
-    alias => undef,
-    help => 'Check the status of access points',
-);
-$plugin->add_mode(
-    internal => 'device::wlan::aps::count',
-    spec => 'count-accesspoints',
-    alias => undef,
-    help => 'Check if the number of access points is within a certain range',
-);
-$plugin->add_mode(
-    internal => 'device::wlan::aps::watch',
-    spec => 'watch-accesspoints',
-    alias => undef,
-    help => 'Check if access points appear and disappear (use --lookup)',
-);
-$plugin->add_mode(
-    internal => 'device::wlan::aps::list',
-    spec => 'list-accesspoints',
-    alias => undef,
-    help => 'List access points managed by this device',
-);
-$plugin->add_mode(
-    internal => 'device::phone::cmstatus',
-    spec => 'phone-cm-status',
-    alias => undef,
-    help => 'Check if the callmanager is up',
-);
-$plugin->add_mode(
-    internal => 'device::phone::status',
-    spec => 'phone-status',
-    alias => undef,
-    help => 'Check the number of registered/unregistered/rejected phones',
-);
-$plugin->add_mode(
-    internal => 'device::smarthome::device::list',
-    spec => 'list-smart-home-devices',
-    alias => undef,
-    help => 'List Fritz!DECT 200 plugs managed by this device',
-);
-$plugin->add_mode(
-    internal => 'device::smarthome::device::status',
-    spec => 'smart-home-device-status',
-    alias => undef,
-    help => 'Check if a Fritz!DECT 200 plug is on',
-);
-$plugin->add_mode(
-    internal => 'device::smarthome::device::energy',
-    spec => 'smart-home-device-energy',
-    alias => undef,
-    help => 'Show the current power consumption of a Fritz!DECT 200 plug',
-);
-$plugin->add_mode(
-    internal => 'device::smarthome::device::consumption',
-    spec => 'smart-home-device-consumption',
-    alias => undef,
-    help => 'Show the cumulated power consumption of a Fritz!DECT 200 plug',
-);
-$plugin->add_mode(
-    internal => 'device::walk',
-    spec => 'walk',
-    alias => undef,
-    help => 'Show snmpwalk command with the oids necessary for a simulation',
-);
-$plugin->add_mode(
-    internal => 'device::supportedmibs',
-    spec => 'supportedmibs',
-    alias => undef,
-    help => 'Shows the names of the mibs which this devices has implemented (only lausser may run this command)',
-);
-$plugin->add_arg(
-    spec => 'blacklist|b=s',
-    help => '--blacklist
-   Blacklist some (missing/failed) components',
-    required => 0,
-    default => '',
-);
-$plugin->add_arg(
-    spec => 'hostname|H=s',
-    help => '--hostname
-   Hostname or IP-address of the switch or router',
-    required => 0,
-    env => 'HOSTNAME',
-);
-$plugin->add_snmp_args();
-$plugin->add_arg(
-    spec => 'mode=s',
-    help => "--mode
-   A keyword which tells the plugin what to do",
-    required => 1,
-);
-$plugin->add_arg(
-    spec => 'name=s',
-    help => "--name
-   The name of an interface (ifDescr)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'drecksptkdb=s',
-    help => "--drecksptkdb
-   This parameter must be used instead of --name, because Devel::ptkdb is stealing the latter from the command line",
-    aliasfor => "name",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'alias=s',
-    help => "--alias
-   The alias name of a 64bit-interface (ifAlias)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'regexp',
-    help => "--regexp
-   A flag indicating that --name is a regular expression",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'ifspeedin=i',
-    help => "--ifspeedin
-   Override the ifspeed oid of an interface (only inbound)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'ifspeedout=i',
-    help => "--ifspeedout
-   Override the ifspeed oid of an interface (only outbound)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'ifspeed=i',
-    help => "--ifspeed
-   Override the ifspeed oid of an interface",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'units=s',
-    help => "--units
-   One of %, B, KB, MB, GB, Bit, KBi, MBi, GBi. (used for e.g. mode interface-usage)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'name2=s',
-    help => "--name2
-   The secondary name of a component",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'role=s',
-    help => "--role
-   The role of this device in a hsrp group (active/standby/listen)",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'report=s',
-    help => "--report
-   Can be used to shorten the output",
-    required => 0,
-    default => 'long',
-);
-$plugin->add_arg(
-    spec => 'lookback=s',
-    help => "--lookback
-   The amount of time you want to look back when calculating average rates.
-   Use it for mode interface-errors or interface-usage. Without --lookback
-   the time between two runs of check_nwc_health is the base for calculations.
-   If you want your checkresult to be based for example on the past hour,
-   use --lookback 3600. ",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'critical=s',
-    help => '--critical
-   The critical threshold',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'warning=s',
-    help => '--warning
-   The warning threshold',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'warningx=s%',
-    help => '--warningx
-   The extended warning thresholds',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'criticalx=s%',
-    help => '--criticalx
-   The extended critical thresholds',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'mitigation=s',
-    help => "--mitigation
-   The parameter allows you to change a critical error to a warning.",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'selectedperfdata=s',
-    help => "--selectedperfdata
-   The parameter allows you to limit the list of performance data. It's a perl regexp.
-   Only matching perfdata show up in the output",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'negate=s%',
-    help => "--negate
-   The parameter allows you to map exit levels, such as warning=critical",
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'with-mymodules-dyn-dir=s',
-    help => '--with-mymodules-dyn-dir
-   A directory where own extensions can be found',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'servertype=s',
-    help => '--servertype
-   The type of the network device: cisco (default). Use it if auto-detection
-   is not possible',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'statefilesdir=s',
-    help => '--statefilesdir
-   An alternate directory where the plugin can save files',
-    required => 0,
-    env => 'STATEFILESDIR',
-);
-$plugin->add_arg(
-    spec => 'snmpwalk=s',
-    help => '--snmpwalk
-   A file with the output of a snmpwalk (used for simulation)
-   Use it instead of --hostname',
-    required => 0,
-    env => 'SNMPWALK',
-);
-$plugin->add_arg(
-    spec => 'oids=s',
-    help => '--oids
-   A list of oids which are downloaded and written to a cache file.
-   Use it together with --mode oidcache',
-    required => 0,
-);
-$plugin->add_arg(
-    spec => 'offline:i',
-    help => '--offline
-   The maximum number of seconds since the last update of cache file before
-   it is considered too old',
-    required => 0,
-    env => 'OFFLINE',
-);
-$plugin->add_arg(
-    spec => 'multiline',
-    help => '--multiline
-   Multiline output',
-    required => 0,
-);
-
-$plugin->getopts();
-$plugin->classify();
-$plugin->validate_args();
-
-if (! $plugin->check_messages()) {
-  $plugin->init();
-  if (! $plugin->check_messages()) {
-    $plugin->add_ok($plugin->get_summary())
-        if $plugin->get_summary();
-    $plugin->add_ok($plugin->get_extendedinfo(" "))
-        if $plugin->get_extendedinfo();
-  }
-} elsif ($plugin->opts->snmpwalk && $plugin->opts->offline) {
-  ;
-} else {
-  $plugin->add_critical('wrong device');
-}
-my ($code, $message) = $plugin->opts->multiline ?
-    $plugin->check_messages(join => "\n", join_all => ', ') :
-    $plugin->check_messages(join => ', ', join_all => ', ');
-$message .= sprintf "\n%s\n", $plugin->get_info("\n")
-    if $plugin->opts->verbose >= 1;
-#printf "%s\n", Data::Dumper::Dumper($plugin);
-
-$plugin->nagios_exit($code, $message);
-printf "schluss\n";
+# /usr/bin/perl -w
+
+use strict;
+use File::Basename;
+
+my $plugin = Classes::Device->new(
+    shortname => '',
+    usage => 'Usage: %s [ -v|--verbose ] [ -t <timeout> ] '.
+        '--mode <what-to-do> '.
+        '--hostname <network-component> --community <snmp-community>'.
+        '  ...]',
+    version => '$Revision: #PACKAGE_VERSION# $',
+    blurb => 'This plugin checks various parameters of network components ',
+    url => 'http://labs.consol.de/nagios/check_nwc_health',
+    timeout => 60,
+    plugin => $GLPlugin::pluginname,
+);
+$plugin->add_mode(
+    internal => 'device::uptime',
+    spec => 'uptime',
+    alias => undef,
+    help => 'Check the uptime of the device',
+);
+$plugin->add_mode(
+    internal => 'device::hardware::health',
+    spec => 'hardware-health',
+    alias => undef,
+    help => 'Check the status of environmental equipment (fans, temperatures, power)',
+);
+$plugin->add_mode(
+    internal => 'device::hardware::load',
+    spec => 'cpu-load',
+    alias => ['cpu-usage'],
+    help => 'Check the CPU load of the device',
+);
+$plugin->add_mode(
+    internal => 'device::hardware::memory',
+    spec => 'memory-usage',
+    alias => undef,
+    help => 'Check the memory usage of the device',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::usage',
+    spec => 'interface-usage',
+    alias => undef,
+    help => 'Check the utilization of interfaces',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::errors',
+    spec => 'interface-errors',
+    alias => undef,
+    help => 'Check the error-rate of interfaces (without discards)',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::discards',
+    spec => 'interface-discards',
+    alias => undef,
+    help => 'Check the discard-rate of interfaces',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::operstatus',
+    spec => 'interface-status',
+    alias => undef,
+    help => 'Check the status of interfaces (oper/admin)',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::nat::sessions::count',
+    spec => 'interface-nat-count-sessions',
+    alias => undef,
+    help => 'Count the number of nat sessions',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::nat::rejects',
+    spec => 'interface-nat-rejects',
+    alias => undef,
+    help => 'Count the number of nat sessions rejected due to lack of resources',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::list',
+    spec => 'list-interfaces',
+    alias => undef,
+    help => 'Show the interfaces of the device and update the name cache',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::listdetail',
+    spec => 'list-interfaces-detail',
+    alias => undef,
+    help => 'Show the interfaces of the device and some details',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::availability',
+    spec => 'interface-availability',
+    alias => undef,
+    help => 'Show the availability (oper != up) of interfaces',
+);
+$plugin->add_mode(
+    internal => 'device::interfaces::aggregation::availability',
+    spec => 'link-aggregation-availability',
+    alias => undef,
+    help => 'Check the percentage of up interfaces in a link aggregation',
+);
+$plugin->add_mode(
+    internal => 'device::shinken::interface',
+    spec => 'create-shinken-service',
+    alias => undef,
+    help => 'Create a Shinken service definition',
+);
+$plugin->add_mode(
+    internal => 'device::hsrp::state',
+    spec => 'hsrp-state',
+    alias => undef,
+    help => 'Check the state in a HSRP group',
+);
+$plugin->add_mode(
+    internal => 'device::hsrp::failover',
+    spec => 'hsrp-failover',
+    alias => undef,
+    help => 'Check if a HSRP group\'s nodes have changed their roles',
+);
+$plugin->add_mode(
+    internal => 'device::hsrp::list',
+    spec => 'list-hsrp-groups',
+    alias => undef,
+    help => 'Show the HSRP groups configured on this device',
+);
+$plugin->add_mode(
+    internal => 'device::bgp::peer::status',
+    spec => 'bgp-peer-status',
+    alias => undef,
+    help => 'Check status of BGP peers',
+);
+$plugin->add_mode(
+    internal => 'device::bgp::peer::list',
+    spec => 'list-bgp-peers',
+    alias => undef,
+    help => 'Show BGP peers known to this device',
+);
+$plugin->add_mode(
+    internal => 'device::ha::role',
+    spec => 'ha-role',
+    alias => undef,
+    help => 'Check the role in a ha group',
+);
+$plugin->add_mode(
+    internal => 'device::svn::status',
+    spec => 'svn-status',
+    alias => undef,
+    help => 'Check the status of the svn subsystem',
+);
+$plugin->add_mode(
+    internal => 'device::mngmt::status',
+    spec => 'mngmt-status',
+    alias => undef,
+    help => 'Check the status of the management subsystem',
+);
+$plugin->add_mode(
+    internal => 'device::fw::policy::installed',
+    spec => 'fw-policy',
+    alias => undef,
+    help => 'Check the installed firewall policy',
+);
+$plugin->add_mode(
+    internal => 'device::fw::policy::connections',
+    spec => 'fw-connections',
+    alias => undef,
+    help => 'Check the number of firewall policy connections',
+);
+$plugin->add_mode(
+    internal => 'device::lb::session::usage',
+    spec => 'session-usage',
+    alias => undef,
+    help => 'Check the session limits of a load balancer',
+);
+$plugin->add_mode(
+    internal => 'device::security',
+    spec => 'security-status',
+    alias => undef,
+    help => 'Check if there are security-relevant incidents',
+);
+$plugin->add_mode(
+    internal => 'device::lb::pool::completeness',
+    spec => 'pool-completeness',
+    alias => undef,
+    help => 'Check the members of a load balancer pool',
+);
+$plugin->add_mode(
+    internal => 'device::lb::pool::list',
+    spec => 'list-pools',
+    alias => undef,
+    help => 'List load balancer pools',
+);
+$plugin->add_mode(
+    internal => 'device::licenses::validate',
+    spec => 'check-licenses',
+    alias => undef,
+    help => 'Check the installed licences/keys',
+);
+$plugin->add_mode(
+    internal => 'device::users::count',
+    spec => 'count-users',
+    alias => ['count-sessions', 'count-connections'],
+    help => 'Count the (connected) users/sessions',
+);
+$plugin->add_mode(
+    internal => 'device::config::status',
+    spec => 'check-config',
+    alias => undef,
+    help => 'Check the status of configs (cisco, unsaved config changes)',
+);
+$plugin->add_mode(
+    internal => 'device::connections::check',
+    spec => 'check-connections',
+    alias => undef,
+    help => 'Check the quality of connections',
+);
+$plugin->add_mode(
+    internal => 'device::connections::count',
+    spec => 'count-connections',
+    alias => ['count-connections-client', 'count-connections-server'],
+    help => 'Check the number of connections (-client, -server is possible)',
+);
+$plugin->add_mode(
+    internal => 'device::cisco::fex::watch',
+    spec => 'watch-fexes',
+    alias => undef,
+    help => 'Check if FEXes appear and disappear (use --lookup)',
+);
+$plugin->add_mode(
+    internal => 'device::wlan::aps::status',
+    spec => 'accesspoint-status',
+    alias => undef,
+    help => 'Check the status of access points',
+);
+$plugin->add_mode(
+    internal => 'device::wlan::aps::count',
+    spec => 'count-accesspoints',
+    alias => undef,
+    help => 'Check if the number of access points is within a certain range',
+);
+$plugin->add_mode(
+    internal => 'device::wlan::aps::watch',
+    spec => 'watch-accesspoints',
+    alias => undef,
+    help => 'Check if access points appear and disappear (use --lookup)',
+);
+$plugin->add_mode(
+    internal => 'device::wlan::aps::list',
+    spec => 'list-accesspoints',
+    alias => undef,
+    help => 'List access points managed by this device',
+);
+$plugin->add_mode(
+    internal => 'device::phone::cmstatus',
+    spec => 'phone-cm-status',
+    alias => undef,
+    help => 'Check if the callmanager is up',
+);
+$plugin->add_mode(
+    internal => 'device::phone::status',
+    spec => 'phone-status',
+    alias => undef,
+    help => 'Check the number of registered/unregistered/rejected phones',
+);
+$plugin->add_mode(
+    internal => 'device::smarthome::device::list',
+    spec => 'list-smart-home-devices',
+    alias => undef,
+    help => 'List Fritz!DECT 200 plugs managed by this device',
+);
+$plugin->add_mode(
+    internal => 'device::smarthome::device::status',
+    spec => 'smart-home-device-status',
+    alias => undef,
+    help => 'Check if a Fritz!DECT 200 plug is on',
+);
+$plugin->add_mode(
+    internal => 'device::smarthome::device::energy',
+    spec => 'smart-home-device-energy',
+    alias => undef,
+    help => 'Show the current power consumption of a Fritz!DECT 200 plug',
+);
+$plugin->add_mode(
+    internal => 'device::smarthome::device::consumption',
+    spec => 'smart-home-device-consumption',
+    alias => undef,
+    help => 'Show the cumulated power consumption of a Fritz!DECT 200 plug',
+);
+$plugin->add_mode(
+    internal => 'device::walk',
+    spec => 'walk',
+    alias => undef,
+    help => 'Show snmpwalk command with the oids necessary for a simulation',
+);
+$plugin->add_mode(
+    internal => 'device::supportedmibs',
+    spec => 'supportedmibs',
+    alias => undef,
+    help => 'Shows the names of the mibs which this devices has implemented (only lausser may run this command)',
+);
+$plugin->add_arg(
+    spec => 'blacklist|b=s',
+    help => '--blacklist
+   Blacklist some (missing/failed) components',
+    required => 0,
+    default => '',
+);
+$plugin->add_arg(
+    spec => 'hostname|H=s',
+    help => '--hostname
+   Hostname or IP-address of the switch or router',
+    required => 0,
+    env => 'HOSTNAME',
+);
+$plugin->add_snmp_args();
+$plugin->add_arg(
+    spec => 'mode=s',
+    help => "--mode
+   A keyword which tells the plugin what to do",
+    required => 1,
+);
+$plugin->add_arg(
+    spec => 'name=s',
+    help => "--name
+   The name of an interface (ifDescr)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'drecksptkdb=s',
+    help => "--drecksptkdb
+   This parameter must be used instead of --name, because Devel::ptkdb is stealing the latter from the command line",
+    aliasfor => "name",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'alias=s',
+    help => "--alias
+   The alias name of a 64bit-interface (ifAlias)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'regexp',
+    help => "--regexp
+   A flag indicating that --name is a regular expression",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'ifspeedin=i',
+    help => "--ifspeedin
+   Override the ifspeed oid of an interface (only inbound)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'ifspeedout=i',
+    help => "--ifspeedout
+   Override the ifspeed oid of an interface (only outbound)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'ifspeed=i',
+    help => "--ifspeed
+   Override the ifspeed oid of an interface",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'units=s',
+    help => "--units
+   One of %, B, KB, MB, GB, Bit, KBi, MBi, GBi. (used for e.g. mode interface-usage)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'name2=s',
+    help => "--name2
+   The secondary name of a component",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'role=s',
+    help => "--role
+   The role of this device in a hsrp group (active/standby/listen)",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'report=s',
+    help => "--report
+   Can be used to shorten the output",
+    required => 0,
+    default => 'long',
+);
+$plugin->add_arg(
+    spec => 'lookback=s',
+    help => "--lookback
+   The amount of time you want to look back when calculating average rates.
+   Use it for mode interface-errors or interface-usage. Without --lookback
+   the time between two runs of check_nwc_health is the base for calculations.
+   If you want your checkresult to be based for example on the past hour,
+   use --lookback 3600. ",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'critical=s',
+    help => '--critical
+   The critical threshold',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'warning=s',
+    help => '--warning
+   The warning threshold',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'warningx=s%',
+    help => '--warningx
+   The extended warning thresholds',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'criticalx=s%',
+    help => '--criticalx
+   The extended critical thresholds',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'mitigation=s',
+    help => "--mitigation
+   The parameter allows you to change a critical error to a warning.",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'selectedperfdata=s',
+    help => "--selectedperfdata
+   The parameter allows you to limit the list of performance data. It's a perl regexp.
+   Only matching perfdata show up in the output",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'negate=s%',
+    help => "--negate
+   The parameter allows you to map exit levels, such as warning=critical",
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'with-mymodules-dyn-dir=s',
+    help => '--with-mymodules-dyn-dir
+   A directory where own extensions can be found',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'servertype=s',
+    help => '--servertype
+   The type of the network device: cisco (default). Use it if auto-detection
+   is not possible',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'statefilesdir=s',
+    help => '--statefilesdir
+   An alternate directory where the plugin can save files',
+    required => 0,
+    env => 'STATEFILESDIR',
+);
+$plugin->add_arg(
+    spec => 'snmpwalk=s',
+    help => '--snmpwalk
+   A file with the output of a snmpwalk (used for simulation)
+   Use it instead of --hostname',
+    required => 0,
+    env => 'SNMPWALK',
+);
+$plugin->add_arg(
+    spec => 'oids=s',
+    help => '--oids
+   A list of oids which are downloaded and written to a cache file.
+   Use it together with --mode oidcache',
+    required => 0,
+);
+$plugin->add_arg(
+    spec => 'offline:i',
+    help => '--offline
+   The maximum number of seconds since the last update of cache file before
+   it is considered too old',
+    required => 0,
+    env => 'OFFLINE',
+);
+$plugin->add_arg(
+    spec => 'multiline',
+    help => '--multiline
+   Multiline output',
+    required => 0,
+);
+
+$plugin->getopts();
+$plugin->classify();
+$plugin->validate_args();
+
+if (! $plugin->check_messages()) {
+  $plugin->init();
+  if (! $plugin->check_messages()) {
+    $plugin->add_ok($plugin->get_summary())
+        if $plugin->get_summary();
+    $plugin->add_ok($plugin->get_extendedinfo(" "))
+        if $plugin->get_extendedinfo();
+  }
+} elsif ($plugin->opts->snmpwalk && $plugin->opts->offline) {
+  ;
+} else {
+  $plugin->add_critical('wrong device');
+}
+my ($code, $message) = $plugin->opts->multiline ?
+    $plugin->check_messages(join => "\n", join_all => ', ') :
+    $plugin->check_messages(join => ', ', join_all => ', ');
+$message .= sprintf "\n%s\n", $plugin->get_info("\n")
+    if $plugin->opts->verbose >= 1;
+#printf "%s\n", Data::Dumper::Dumper($plugin);
+
+$plugin->nagios_exit($code, $message);
+printf "schluss\n";
diff --git a/check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/subst.in b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/subst.in
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.0.3.7/plugins-scripts/subst.in
rename to check_nwc_health/check_nwc_health-3.1/plugins-scripts/subst.in
diff --git a/check_nwc_health/src b/check_nwc_health/src
index 0f1945f..e02da36 120000
--- a/check_nwc_health/src
+++ b/check_nwc_health/src
@@ -1 +1 @@
-check_nwc_health-3.0.3.7
\ No newline at end of file
+check_nwc_health-3.1/
\ No newline at end of file