diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS.pm
deleted file mode 100644
index 974d476..0000000
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-package Classes::Cisco::NXOS;
-our @ISA = qw(Classes::Cisco);
-use strict;
-
-sub init {
-  my $self = shift;
-  if ($self->mode =~ /device::hardware::health/) {
-    $self->analyze_and_check_environmental_subsystem("Classes::Cisco::NXOS::Component::EnvironmentalSubsystem");
-  } elsif ($self->mode =~ /device::cisco::fex::watch/) {
-    $self->analyze_fex_subsystem();
-    $self->check_fex_subsystem();
-  } elsif ($self->mode =~ /device::hardware::load/) {
-    $self->analyze_and_check_cpu_subsystem("Classes::Cisco::NXOS::Component::CpuSubsystem");
-  } elsif ($self->mode =~ /device::hardware::memory/) {
-    $self->analyze_and_check_mem_subsystem("Classes::Cisco::NXOS::Component::MemSubsystem");
-  } elsif ($self->mode =~ /device::hsrp/) {
-    $self->analyze_and_check_hsrp_subsystem("Classes::HSRP::Component::HSRPSubsystem");
-  } else {
-    $self->no_such_mode();
-  }
-}
-
-sub analyze_fex_subsystem {
-  my $self = shift;
-  $self->{components}->{fex_subsystem} = Classes::Cisco::CISCOENTITYSENSORMIB::Component::SensorSubsystem->new();
-  @{$self->{fexes}} = grep {
-      $_->{entPhysicalName} =~ /^fex.*chassis$/i;
-  } map {
-      $_->{entPhysicalName} ||= $_->{entPhysicalDescr}; $_;
-  } grep { 
-      $_->{entPhysicalClass} eq "chassis"
-  } @{$self->{components}->{fex_subsystem}->{entities}};
-}
-
-sub check_fex_subsystem {
-  my $self = shift;
-  $self->add_info('counting fexes');
-  $self->{numOfFexes} = scalar (@{$self->{fexes}});
-  $self->{fexNameList} = [map { $_->{entPhysicalName} } @{$self->{fexes}}];
-  if (scalar (@{$self->{fexes}}) == 0) {
-    $self->add_unknown('no FEXes found');
-  } else {
-    $self->opts->override_opt('lookback', 1800) if ! $self->opts->lookback;
-    $self->valdiff({name => $self->{name}, lastarray => 1},
-        qw(fexNameList numOfFexes));
-    if (scalar(@{$self->{delta_found_fexNameList}}) > 0) {
-      $self->add_warning(sprintf '%d new FEX(es) (%s)',
-          scalar(@{$self->{delta_found_fexNameList}}),
-          join(", ", @{$self->{delta_found_fexNameList}}));
-    }
-    if (scalar(@{$self->{delta_lost_fexNameList}}) > 0) {
-      $self->add_critical(sprintf '%d FEXes missing (%s)',
-          scalar(@{$self->{delta_lost_fexNameList}}),
-          join(", ", @{$self->{delta_lost_fexNameList}}));
-    }
-    $self->add_ok(sprintf 'found %d FEXes', scalar (@{$self->{fexes}}));
-    $self->add_perfdata(
-        label => 'num_fexes',
-        value => $self->{numOfFexes},
-    );
-  }
-}
-
diff --git a/check_nwc_health/check_nwc_health-3.1/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
deleted file mode 100644
index 320eb67..0000000
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
+++ /dev/null
@@ -1,79 +0,0 @@
-package Classes::Cisco::NXOS::Component::CpuSubsystem;
-our @ISA = qw(GLPlugin::SNMP::Item);
-use strict;
-
-sub init {
-  my $self = shift;
-  my $type = 0;
-  foreach ($self->get_snmp_table_objects(
-      'CISCO-PROCESS-MIB', 'cpmCPUTotalTable')) {
-    $_->{cpmCPUTotalIndex} ||= $type++;
-    push(@{$self->{cpus}},
-        Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu->new(%{$_}));
-  }
-  if (scalar(@{$self->{cpus}}) == 0) {
-    # maybe too old. i fake a cpu. be careful. this is a really bad hack
-    my $response = $self->get_request(
-        -varbindlist => [
-            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1},
-            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5},
-            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{busyPer},
-        ]
-    );
-    if (exists $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}}) {
-      push(@{$self->{cpus}},
-          Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu->new(
-              cpmCPUTotalPhysicalIndex => 0, #fake
-              cpmCPUTotalIndex => 0, #fake
-              cpmCPUTotal5sec => 0, #fake
-              cpmCPUTotal5secRev => 0, #fake
-              cpmCPUTotal1min => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}},
-              cpmCPUTotal1minRev => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}},
-              cpmCPUTotal5min => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5}},
-              cpmCPUTotal5minRev => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5}},
-              cpmCPUMonInterval => 0, #fake
-              cpmCPUTotalMonIntervalValue => 0, #fake
-              cpmCPUInterruptMonIntervalValue => 0, #fake
-      ));
-    }
-  }
-}
-
-package Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu;
-our @ISA = qw(GLPlugin::SNMP::TableItem);
-use strict;
-
-sub new {
-  my $class = shift;
-  my %params = @_;
-  my $self = {};
-  foreach (keys %params) {
-    $self->{$_} = $params{$_};
-  }
-  bless $self, $class;
-  $self->{usage} = $params{cpmCPUTotal5minRev};
-  if ($self->{cpmCPUTotalPhysicalIndex}) {
-    my $entPhysicalName = '1.3.6.1.2.1.47.1.1.1.1.7';
-    $self->{entPhysicalName} = $self->get_request(
-        -varbindlist => [$entPhysicalName.'.'.$self->{cpmCPUTotalPhysicalIndex}]
-    );
-    $self->{entPhysicalName} = $self->{entPhysicalName}->{$entPhysicalName.'.'.$self->{cpmCPUTotalPhysicalIndex}};
-  } else {
-    $self->{entPhysicalName} = $self->{cpmCPUTotalIndex};
-  }
-  return $self;
-}
-
-sub check {
-  my $self = shift;
-  $self->add_info(sprintf 'cpu %s usage (5 min avg.) is %.2f%%',
-      $self->{entPhysicalName}, $self->{usage});
-  $self->set_thresholds(warning => 80, critical => 90);
-  $self->add_message($self->check_thresholds($self->{usage}));
-  $self->add_perfdata(
-      label => 'cpu_'.$self->{entPhysicalName}.'_usage',
-      value => $self->{usage},
-      uom => '%',
-  );
-}
-
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
deleted file mode 100644
index d7f8d87..0000000
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
+++ /dev/null
@@ -1,42 +0,0 @@
-package Classes::SGOS::Component::SensorSubsystem;
-our @ISA = qw(GLPlugin::SNMP::Item);
-use strict;
-
-sub init {
-  my $self = shift;
-  $self->get_snmp_tables('SENSOR-MIB', [
-      ['sensors', 'deviceSensorValueTable', 'Classes::SGOS::Component::SensorSubsystem::Sensor'],
-  ]);
-}
-
-package Classes::SGOS::Component::SensorSubsystem::Sensor;
-our @ISA = qw(GLPlugin::SNMP::TableItem);
-use strict;
-
-sub check {
-  my $self = shift;
-  if ($self->{deviceSensorScale}) {
-    $self->{deviceSensorValue} *= 10 ** $self->{deviceSensorScale};
-  }
-  $self->add_info(sprintf 'sensor %s (%s %s) is %s',
-      $self->{deviceSensorName},
-      $self->{deviceSensorValue},
-      $self->{deviceSensorUnits},
-      $self->{deviceSensorCode});
-  if ($self->{deviceSensorCode} eq "not-installed") {
-  } elsif ($self->{deviceSensorCode} eq "unknown") {
-  } else {
-    if ($self->{deviceSensorCode} ne "ok") {
-      if ($self->{deviceSensorCode} =~ /warning/) {
-        $self->add_warning();
-      } else {
-        $self->add_critical();
-      }
-    }
-    $self->add_perfdata(
-        label => sprintf('sensor_%s', $self->{deviceSensorName}),
-        value => $self->{deviceSensorValue},
-    );
-  }
-}
-
diff --git a/check_nwc_health/check_nwc_health-3.1/AUTHORS b/check_nwc_health/check_nwc_health-3.4.2.2/AUTHORS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/AUTHORS
rename to check_nwc_health/check_nwc_health-3.4.2.2/AUTHORS
diff --git a/check_nwc_health/check_nwc_health-3.1/COPYING b/check_nwc_health/check_nwc_health-3.4.2.2/COPYING
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/COPYING
rename to check_nwc_health/check_nwc_health-3.4.2.2/COPYING
diff --git a/check_nwc_health/check_nwc_health-3.1/ChangeLog b/check_nwc_health/check_nwc_health-3.4.2.2/ChangeLog
similarity index 90%
rename from check_nwc_health/check_nwc_health-3.1/ChangeLog
rename to check_nwc_health/check_nwc_health-3.4.2.2/ChangeLog
index 653392b..befdfe9 100644
--- a/check_nwc_health/check_nwc_health-3.1/ChangeLog
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/ChangeLog
@@ -2,6 +2,45 @@
 # Changelog of the check_nwc_health plugin #
 ############################################
 
+2014-01-02 3.4.2.2
+- fix lsmpi_io for cisco asr1000 (Thanks Andreas Schulz)
+- fix Fritz!Box upnp control url (Thanks Bernd)
+
+2014-12-23 3.4.2.1
+- use fallbacks to find fexes (cefexConfigTable may not be populated)
+
+2014-12-16 3.4.2
+- use cefexConfigTable for mode watch-fexes
+- bugfix in cisco nexus sensors (had undef perl warnings)
+
+2014-12-12 3.4.1
+- bugfix in bluecoat hardware (skip perfdata of missing psus)
+
+2014-12-11 3.4
+- add vpn-status for cisco asa
+
+2014-12-08 3.3
+- add windowslocal
+
+2014-12-06 3.2.2
+- unique names for cisco cpus pointing to the same physical entity
+
+2014-11-29 3.2.1
+- remove unnecessary use statement
+- finalize paloalto ha
+- make list-interfaces and update-cache faster
+
+2014-11-18 3.2.0.1
+- hide some debug printfs
+
+2014-11-10 3.2
+- add palo alto hardware, sensors, ha
+- make nexus cpu names unique
+
+2014-11-02 3.1.1
+- bugfix my-modes
+- add paloaltomib
+
 2014-09-26 3.1
 - add Clavister Firewall (Thanks Dirk Goetz)
 - fix GLPluginSNMP, all timeout-like errors are UNKNOWN
diff --git a/check_nwc_health/check_nwc_health-3.1/INSTALL b/check_nwc_health/check_nwc_health-3.4.2.2/INSTALL
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/INSTALL
rename to check_nwc_health/check_nwc_health-3.4.2.2/INSTALL
diff --git a/check_nwc_health/check_nwc_health-3.1/Makefile.am b/check_nwc_health/check_nwc_health-3.4.2.2/Makefile.am
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/Makefile.am
rename to check_nwc_health/check_nwc_health-3.4.2.2/Makefile.am
diff --git a/check_nwc_health/check_nwc_health-3.1/Makefile.in b/check_nwc_health/check_nwc_health-3.4.2.2/Makefile.in
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/Makefile.in
rename to check_nwc_health/check_nwc_health-3.4.2.2/Makefile.in
diff --git a/check_nwc_health/check_nwc_health-3.1/NEWS b/check_nwc_health/check_nwc_health-3.4.2.2/NEWS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/NEWS
rename to check_nwc_health/check_nwc_health-3.4.2.2/NEWS
diff --git a/check_nwc_health/check_nwc_health-3.1/README b/check_nwc_health/check_nwc_health-3.4.2.2/README
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/README
rename to check_nwc_health/check_nwc_health-3.4.2.2/README
diff --git a/check_nwc_health/check_nwc_health-3.1/THANKS b/check_nwc_health/check_nwc_health-3.4.2.2/THANKS
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/THANKS
rename to check_nwc_health/check_nwc_health-3.4.2.2/THANKS
diff --git a/check_nwc_health/check_nwc_health-3.1/TODO b/check_nwc_health/check_nwc_health-3.4.2.2/TODO
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/TODO
rename to check_nwc_health/check_nwc_health-3.4.2.2/TODO
diff --git a/check_nwc_health/check_nwc_health-3.1/acinclude.m4 b/check_nwc_health/check_nwc_health-3.4.2.2/acinclude.m4
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/acinclude.m4
rename to check_nwc_health/check_nwc_health-3.4.2.2/acinclude.m4
diff --git a/check_nwc_health/check_nwc_health-3.1/aclocal.m4 b/check_nwc_health/check_nwc_health-3.4.2.2/aclocal.m4
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/aclocal.m4
rename to check_nwc_health/check_nwc_health-3.4.2.2/aclocal.m4
diff --git a/check_nwc_health/check_nwc_health-3.1/config.guess b/check_nwc_health/check_nwc_health-3.4.2.2/config.guess
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/config.guess
rename to check_nwc_health/check_nwc_health-3.4.2.2/config.guess
diff --git a/check_nwc_health/check_nwc_health-3.1/config.sub b/check_nwc_health/check_nwc_health-3.4.2.2/config.sub
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/config.sub
rename to check_nwc_health/check_nwc_health-3.4.2.2/config.sub
diff --git a/check_nwc_health/check_nwc_health-3.1/configure b/check_nwc_health/check_nwc_health-3.4.2.2/configure
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.1/configure
rename to check_nwc_health/check_nwc_health-3.4.2.2/configure
index 1a3abfb..67bcd19 100755
--- a/check_nwc_health/check_nwc_health-3.1/configure
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/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.1.
+# Generated by GNU Autoconf 2.69 for check_nwc_health 3.4.2.2.
 #
 #
 # 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.1'
-PACKAGE_STRING='check_nwc_health 3.1'
+PACKAGE_VERSION='3.4.2.2'
+PACKAGE_STRING='check_nwc_health 3.4.2.2'
 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.1 to adapt to many kinds of systems.
+\`configure' configures check_nwc_health 3.4.2.2 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.1:";;
+     short | recursive ) echo "Configuration of check_nwc_health 3.4.2.2:";;
    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.1
+check_nwc_health configure 3.4.2.2
 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.1, which was
+It was created by check_nwc_health $as_me 3.4.2.2, 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.1'
+ VERSION='3.4.2.2'
 
 
 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.1, which was
+This file was extended by check_nwc_health $as_me 3.4.2.2, 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.1
+check_nwc_health config.status 3.4.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/check_nwc_health/check_nwc_health-3.1/configure.ac b/check_nwc_health/check_nwc_health-3.4.2.2/configure.ac
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.1/configure.ac
rename to check_nwc_health/check_nwc_health-3.4.2.2/configure.ac
index 40c7f52..f0d503b 100644
--- a/check_nwc_health/check_nwc_health-3.1/configure.ac
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/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.1)
+AC_INIT(check_nwc_health,3.4.2.2)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
 AC_CANONICAL_HOST
 
diff --git a/check_nwc_health/check_nwc_health-3.1/install-sh b/check_nwc_health/check_nwc_health-3.4.2.2/install-sh
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/install-sh
rename to check_nwc_health/check_nwc_health-3.4.2.2/install-sh
diff --git a/check_nwc_health/check_nwc_health-3.1/missing b/check_nwc_health/check_nwc_health-3.4.2.2/missing
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/missing
rename to check_nwc_health/check_nwc_health-3.4.2.2/missing
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/KeySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AVOS/Component/SecuritySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AlliedTelesyn.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AlliedTelesyn.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/AlliedTelesyn.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/AlliedTelesyn.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/BGP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/BGP.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/BGP/Component/PeerSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Bluecoat.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Bluecoat.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Bluecoat.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Bluecoat.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Brocade.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Brocade.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Brocade.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Brocade.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/FwSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/HaSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/MngmtSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/SvnSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/CheckPoint/Firewall1/Component/VoltageSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/ASA.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/ASA.pm
similarity index 89%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/ASA.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/ASA.pm
index 0ba5b23..60a91b5 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/ASA.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/ASA.pm
@@ -20,6 +20,8 @@ sub init {
     $self->analyze_and_check_config_subsystem("Classes::Cisco::IOS::Component::NatSubsystem");
   } elsif ($self->mode =~ /device::interfaces::nat::rejects/) {
     $self->analyze_and_check_config_subsystem("Classes::Cisco::IOS::Component::NatSubsystem");
+  } elsif ($self->mode =~ /device::vpn::status/) {
+    $self->analyze_and_check_config_subsystem("Classes::Cisco::CISCOIPSECFLOWMONITOR::Component::VpnSubsystem");
   } else {
     $self->no_such_mode();
   }
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/KeySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/RaidSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/AsyncOS/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM/Component/CmSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CCM/Component/PhoneSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYALARMMIB/Component/AlarmSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
similarity index 98%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
index a818493..44b771b 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
@@ -120,7 +120,7 @@ sub check {
         $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == CRITICAL) ||
        (defined($warningx) && 
         $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == WARNING) ||
-       $self->{entSensorThresholdEvaluation} eq "true") {
+       ($self->{entSensorThresholdEvaluation} && $self->{entSensorThresholdEvaluation} eq "true")) {
     }
     if (defined($criticalx) &&
         $self->check_thresholds(metric => $label, value => $self->{entSensorValue}) == CRITICAL) {
@@ -148,7 +148,7 @@ sub check {
           critical => $criticalx,
           warning => $warningx,
       );
-    } elsif ($self->{entSensorThresholdEvaluation} eq "true") {
+    } elsif ($self->{entSensorThresholdEvaluation} && $self->{entSensorThresholdEvaluation} eq "true") {
       $self->add_warning(sprintf "%s sensor %s threshold evaluation is true (value: %s)",
           $self->{entSensorType},
           $self->{entPhysicalIndex},
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOENVMONMIB/Component/VoltageSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOIPSECFLOWMONITOR/Component/VpnSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOIPSECFLOWMONITOR/Component/VpnSubsystem.pm
new file mode 100644
index 0000000..fcd384f
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/CISCOIPSECFLOWMONITOR/Component/VpnSubsystem.pm
@@ -0,0 +1,41 @@
+package Classes::Cisco::CISCOIPSECFLOWMONITOR::Component::VpnSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('CISCO-IPSEC-FLOW-MONITOR-MIB', [
+      ['ciketunnels', 'cikeTunnelTable', 'Classes::Cisco::CISCOIPSECFLOWMONITOR::Component::VpnSubsystem::CikeTunnel',  sub { my $o = shift; $o->{parent} = $self; $self->filter_name($o->{cikeTunRemoteValue})}],
+  ]);
+}
+
+sub check {
+  my $self = shift;
+  if (! @{$self->{ciketunnels}}) {
+    $self->add_critical(sprintf 'tunnel to %s does not exist',
+        $self->opts->name);
+  } else {
+    foreach (@{$self->{ciketunnels}}) {
+      $_->check();
+    }
+  }
+}
+
+
+package Classes::Cisco::CISCOIPSECFLOWMONITOR::Component::VpnSubsystem::CikeTunnel;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+# cikeTunRemoteValue per --name angegeben, muss active sein
+# ansonsten watch-vpns, delta tunnels ueberwachen
+  $self->add_info(sprintf 'tunnel to %s is %s',
+      $self->{cikeTunRemoteValue}, $self->{cikeTunStatus});
+  if ($self->{cikeTunStatus} ne 'active') {
+    $self->add_critical();
+  } else {
+    $self->add_ok();
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/ConfigSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
new file mode 100644
index 0000000..c622d62
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
@@ -0,0 +1,112 @@
+package Classes::Cisco::IOS::Component::CpuSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+use constant PHYS_NAME => 1;
+use constant PHYS_ASSET => 2;
+use constant PHYS_DESCR => 4;
+
+{
+  our $cpmCPUTotalIndex = 0;
+  our $uniquify = PHYS_NAME;
+}
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('CISCO-PROCESS-MIB', [
+      ['cpus', 'cpmCPUTotalTable', 'Classes::Cisco::IOS::Component::CpuSubsystem::Cpu' ],
+  ]);
+  if (scalar(@{$self->{cpus}}) == 0) {
+    # maybe too old. i fake a cpu. be careful. this is a really bad hack
+    my $response = $self->get_request(
+        -varbindlist => [
+            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1},
+            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5},
+            $Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{busyPer},
+        ]
+    );
+    if (exists $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}}) {
+      push(@{$self->{cpus}},
+          Classes::Cisco::IOS::Component::CpuSubsystem::Cpu->new(
+              cpmCPUTotalPhysicalIndex => 0, #fake
+              cpmCPUTotalIndex => 0, #fake
+              cpmCPUTotal5sec => 0, #fake
+              cpmCPUTotal5secRev => 0, #fake
+              cpmCPUTotal1min => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}},
+              cpmCPUTotal1minRev => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}},
+              cpmCPUTotal5min => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5}},
+              cpmCPUTotal5minRev => $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy5}},
+              cpmCPUMonInterval => 0, #fake
+              cpmCPUTotalMonIntervalValue => 0, #fake
+              cpmCPUInterruptMonIntervalValue => 0, #fake
+      ));
+    }
+  }
+  # same cpmCPUTotalPhysicalIndex found in multiple table rows
+  if (scalar(@{$self->{cpus}}) > 1) {
+    my %names = ();
+    foreach my $cpu (@{$self->{cpus}}) {
+      $names{$cpu->{name}}++;
+    }
+    foreach my $cpu (@{$self->{cpus}}) {
+      if ($names{$cpu->{name}} > 1) {
+        # more than one cpu points to the same physical entity
+        $cpu->{name} .= '.'.$cpu->{flat_indices};
+      }
+    }
+  }
+}
+
+package Classes::Cisco::IOS::Component::CpuSubsystem::Cpu;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub finish {
+  my $self = shift;
+  $self->{cpmCPUTotalIndex} = $self->{flat_indices};
+  $self->{cpmCPUTotalPhysicalIndex} = exists $self->{cpmCPUTotalPhysicalIndex} ?
+      $self->{cpmCPUTotalPhysicalIndex} : 0;
+  if (exists $self->{cpmCPUTotal5minRev}) {
+    $self->{usage} = $self->{cpmCPUTotal5minRev};
+  } else {
+    $self->{usage} = $self->{cpmCPUTotal5min};
+  }
+  $self->protect_value($self->{cpmCPUTotalIndex}.$self->{cpmCPUTotalPhysicalIndex}, 'usage', 'percent');
+  if ($self->{cpmCPUTotalPhysicalIndex}) {
+    $self->{entPhysicalName} = $self->get_snmp_object('ENTITY-MIB', 'entPhysicalName', $self->{cpmCPUTotalPhysicalIndex});
+    # wichtig fuer gestacktes zeugs, bei dem entPhysicalName doppelt und mehr vorkommen kann
+    # This object is a user-assigned asset tracking identifier for the physical entity
+    # as specified by a network manager, and provides non-volatile storage of this
+    # information. On the first instantiation of an physical entity, the value of
+    # entPhysicalAssetID associated with that entity is set to the zero-length string.
+    # ...
+    # If write access is implemented for an instance of entPhysicalAssetID, and a value
+    # is written into the instance, the agent must retain the supplied value in the
+    # entPhysicalAssetID instance associated with the same physical entity for as long
+    # as that entity remains instantiated. This includes instantiations across all
+    # re-initializations/reboots of the network management system, including those
+    # which result in a change of the physical entity's entPhysicalIndex value.
+    $self->{entPhysicalAssetID} = $self->get_snmp_object('ENTITY-MIB', 'entPhysicalAssetID', $self->{cpmCPUTotalPhysicalIndex});
+    $self->{entPhysicalDescr} = $self->get_snmp_object('ENTITY-MIB', 'entPhysicalDescr', $self->{cpmCPUTotalPhysicalIndex});
+    $self->{name} = $self->{entPhysicalName} || $self->{entPhysicalDescr};
+  } else {
+    $self->{name} = $self->{cpmCPUTotalIndex};
+    # waere besser, aber dann zerlegts wohl zu viele rrdfiles
+    #$self->{name} = 'central processor';
+  }
+  return $self;
+}
+
+sub check {
+  my $self = shift;
+  $self->{label} = $self->{name};
+  $self->add_info(sprintf 'cpu %s usage (5 min avg.) is %.2f%%',
+      $self->{name}, $self->{usage});
+  $self->set_thresholds(warning => 80, critical => 90);
+  $self->add_message($self->check_thresholds($self->{usage}));
+  $self->add_perfdata(
+      label => 'cpu_'.$self->{label}.'_usage',
+      value => $self->{usage},
+      uom => '%',
+  );
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/IOS/Component/NatSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS.pm
new file mode 100644
index 0000000..2e9e434
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS.pm
@@ -0,0 +1,22 @@
+package Classes::Cisco::NXOS;
+our @ISA = qw(Classes::Cisco);
+use strict;
+
+sub init {
+  my $self = shift;
+  if ($self->mode =~ /device::hardware::health/) {
+    $self->mult_snmp_max_msg_size(10);
+    $self->analyze_and_check_environmental_subsystem("Classes::Cisco::NXOS::Component::EnvironmentalSubsystem");
+  } elsif ($self->mode =~ /device::cisco::fex::watch/) {
+    $self->analyze_and_check_environmental_subsystem("Classes::Cisco::NXOS::Component::FexSubsystem");
+  } elsif ($self->mode =~ /device::hardware::load/) {
+    $self->analyze_and_check_cpu_subsystem("Classes::Cisco::IOS::Component::CpuSubsystem");
+  } elsif ($self->mode =~ /device::hardware::memory/) {
+    $self->analyze_and_check_mem_subsystem("Classes::Cisco::NXOS::Component::MemSubsystem");
+  } elsif ($self->mode =~ /device::hsrp/) {
+    $self->analyze_and_check_hsrp_subsystem("Classes::HSRP::Component::HSRPSubsystem");
+  } else {
+    $self->no_such_mode();
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
similarity index 57%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
index 8920d33..591be05 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/CpuSubsystem.pm
@@ -1,4 +1,4 @@
-package Classes::Cisco::IOS::Component::CpuSubsystem;
+package Classes::Cisco::NXOS::Component::CpuSubsystem;
 our @ISA = qw(GLPlugin::SNMP::Item);
 use strict;
 
@@ -9,7 +9,7 @@ use strict;
 sub init {
   my $self = shift;
   $self->get_snmp_tables('CISCO-PROCESS-MIB', [
-      ['cpus', 'cpmCPUTotalTable', 'Classes::Cisco::IOS::Component::CpuSubsystem::Cpu' ],
+      ['cpus', 'cpmCPUTotalTable', 'Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu' ],
   ]);
   if (scalar(@{$self->{cpus}}) == 0) {
     # maybe too old. i fake a cpu. be careful. this is a really bad hack
@@ -22,7 +22,7 @@ sub init {
     );
     if (exists $response->{$Classes::Device::mibs_and_oids->{'OLD-CISCO-CPU-MIB'}->{avgBusy1}}) {
       push(@{$self->{cpus}},
-          Classes::Cisco::IOS::Component::CpuSubsystem::Cpu->new(
+          Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu->new(
               cpmCPUTotalPhysicalIndex => 0, #fake
               cpmCPUTotalIndex => 0, #fake
               cpmCPUTotal5sec => 0, #fake
@@ -39,15 +39,15 @@ sub init {
   }
 }
 
-package Classes::Cisco::IOS::Component::CpuSubsystem::Cpu;
+package Classes::Cisco::NXOS::Component::CpuSubsystem::Cpu;
 our @ISA = qw(GLPlugin::SNMP::TableItem);
 use strict;
 
 sub finish {
   my $self = shift;
-  $self->{cpmCPUTotalIndex} = exists $self->{cpmCPUTotalIndex} ? 
+  $self->{cpmCPUTotalIndex} = exists $self->{cpmCPUTotalIndex} ?
       $self->{cpmCPUTotalIndex} :
-      $Classes::Cisco::IOS::Component::CpuSubsystem::cpmCPUTotalIndex++;
+      $Classes::Cisco::NXOS::Component::CpuSubsystem::cpmCPUTotalIndex++;
   $self->{cpmCPUTotalPhysicalIndex} = exists $self->{cpmCPUTotalPhysicalIndex} ? 
       $self->{cpmCPUTotalPhysicalIndex} : 0;
   if (exists $self->{cpmCPUTotal5minRev}) {
@@ -57,27 +57,41 @@ sub finish {
   }
   $self->protect_value($self->{cpmCPUTotalIndex}.$self->{cpmCPUTotalPhysicalIndex}, 'usage', 'percent');
   if ($self->{cpmCPUTotalPhysicalIndex}) {
-    my $entPhysicalName = '1.3.6.1.2.1.47.1.1.1.1.7';
-    $self->{entPhysicalName} = $self->get_request(
-        -varbindlist => [$entPhysicalName.'.'.$self->{cpmCPUTotalPhysicalIndex}]
-    );
     $self->{entPhysicalName} = $self->get_snmp_object('ENTITY-MIB', 'entPhysicalName', $self->{cpmCPUTotalPhysicalIndex});
+    # This object is a user-assigned asset tracking identifier for the physical entity
+    # as specified by a network manager, and provides non-volatile storage of this 
+    # information. On the first instantiation of an physical entity, the value of
+    # entPhysicalAssetID associated with that entity is set to the zero-length string.
+    # ...
+    # If write access is implemented for an instance of entPhysicalAssetID, and a value
+    # is written into the instance, the agent must retain the supplied value in the
+    # entPhysicalAssetID instance associated with the same physical entity for as long
+    # as that entity remains instantiated. This includes instantiations across all 
+    # re-initializations/reboots of the network management system, including those
+    # which result in a change of the physical entity's entPhysicalIndex value.
+    $self->{entPhysicalAssetID} = $self->get_snmp_object('ENTITY-MIB', 'entPhysicalAssetID', $self->{cpmCPUTotalPhysicalIndex});
+    $self->{name} = $self->{entPhysicalName};
+    $self->{name} .= ' '.$self->{entPhysicalAssetID} if $self->{entPhysicalAssetID};
+    $self->{label} = $self->{entPhysicalName};
+    $self->{label} .= ' '.$self->{entPhysicalAssetID} if $self->{entPhysicalAssetID};
   } else {
-    $self->{entPhysicalName} = $self->{cpmCPUTotalIndex};
+    $self->{name} = $self->{cpmCPUTotalIndex};
+    $self->{label} = $self->{cpmCPUTotalIndex};
   }
+  return $self;
 }
 
 sub check {
   my $self = shift;
   $self->add_info(sprintf 'cpu %s usage (5 min avg.) is %.2f%%',
-      $self->{entPhysicalName}, $self->{usage});
+      $self->{name}, $self->{usage});
   $self->set_thresholds(warning => 80, critical => 90);
-  $self->add_message($self->check_thresholds(value => $self->{usage},
-      metric => 'cpu_'.$self->{entPhysicalName}.'_usage'));
+  $self->add_message($self->check_thresholds($self->{usage}));
   $self->add_perfdata(
-      label => 'cpu_'.$self->{entPhysicalName}.'_usage',
+      label => 'cpu_'.$self->{label}.'_usage',
       value => $self->{usage},
       uom => '%',
   );
 }
 
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/FexSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/FexSubsystem.pm
new file mode 100644
index 0000000..1e8a6ee
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/FexSubsystem.pm
@@ -0,0 +1,115 @@
+package Classes::Cisco::NXOS::Component::FexSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('CISCO-ETHERNET-FABRIC-EXTENDER-MIB', [
+    ['fexes', 'cefexConfigTable', 'Classes::Cisco::NXOS::Component::FexSubsystem::Fex'],
+  ]);
+  if (scalar (@{$self->{fexes}}) == 0) {
+   # fallback
+    $self->get_snmp_tables('ENTITY-MIB', [
+      ['fexes', 'entPhysicalTable', 'Classes::Cisco::NXOS::Component::FexSubsystem::Fex'],
+    ]);
+    @{$self->{fexes}} = grep {
+        $_->{entPhysicalClass} eq 'chassis' && $_->{entPhysicalDescr} =~ /fex/i; 
+    } @{$self->{fexes}};
+    if (scalar (@{$self->{fexes}}) == 0) {
+      $self->get_snmp_tables('ENTITY-MIB', [
+        ['fexes', 'entPhysicalTable', 'Classes::Cisco::NXOS::Component::FexSubsystem::Fex'],
+      ]);
+      # fallback
+      my $known_fexes = {};
+      @{$self->{fexes}} = grep {
+        ! $known_fexes->{$_->{cefexConfigExtenderName}}++;
+      } grep {
+          $_->{entPhysicalClass} eq 'other' && $_->{entPhysicalDescr} =~ /fex.*cable/i; 
+      } @{$self->{fexes}};
+    }
+  }
+}
+
+sub dump {
+  my $self = shift;
+  foreach (@{$self->{fexes}}) {
+    $_->dump();
+  }
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('counting fexes');
+  $self->{numOfFexes} = scalar (@{$self->{fexes}});
+  $self->{fexNameList} = [map { $_->{cefexConfigExtenderName} } @{$self->{fexes}}];
+  if (scalar (@{$self->{fexes}}) == 0) {
+    $self->add_unknown('no FEXes found');
+  } else {
+    # lookback, denn sonst muesste der check is_volatile sein und koennte bei
+    # einem kurzen netzausfall fehler schmeissen.
+    # empfehlung: check_interval 5 (muss jedesmal die entity-mib durchwalken)
+    #             retry_interval 2
+    #             max_check_attempts 2
+    # --lookback 360
+    $self->opts->override_opt('lookback', 1800) if ! $self->opts->lookback;
+    $self->valdiff({name => $self->{name}, lastarray => 1},
+        qw(fexNameList numOfFexes));
+    if (scalar(@{$self->{delta_found_fexNameList}}) > 0) {
+      $self->add_warning(sprintf '%d new FEX(es) (%s)',
+          scalar(@{$self->{delta_found_fexNameList}}),
+          join(", ", @{$self->{delta_found_fexNameList}}));
+    }
+    if (scalar(@{$self->{delta_lost_fexNameList}}) > 0) {
+      $self->add_critical(sprintf '%d FEXes missing (%s)',
+          scalar(@{$self->{delta_lost_fexNameList}}),
+          join(", ", @{$self->{delta_lost_fexNameList}}));
+    }
+    $self->add_ok(sprintf 'found %d FEXes', scalar (@{$self->{fexes}}));
+    $self->add_perfdata(
+        label => 'num_fexes',
+        value => $self->{numOfFexes},
+    );
+  }
+}
+
+
+package Classes::Cisco::NXOS::Component::FexSubsystem::Fex;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub finish {
+  my $self = shift;
+  $self->{original_cefexConfigExtenderName} = $self->{cefexConfigExtenderName};
+  if (exists $self->{entPhysicalClass}) {
+    # stammt aus ENTITY-MIB
+    if ($self->{entPhysicalDescr} =~ /^FEX[^\d]*(\d+)/i) {
+      $self->{cefexConfigExtenderName} = "FEX".$1;
+    } else {
+      $self->{cefexConfigExtenderName} = $self->{entPhysicalDescr};
+    }
+  } else {
+    # stammt aus CISCO-ETHERNET-FABRIC-EXTENDER-MIB, kann FEX101-J8-VT04.01 heissen
+    if ($self->{cefexConfigExtenderName} =~ /^FEX[^\d]*(\d+)/i) {
+      $self->{cefexConfigExtenderName} = "FEX".$1;
+    }
+  }
+}
+
+__END__
+entweder die cefexConfigTable ist bestueckt oder man liest als Fallback die Entities aus
+entPhysicalAlias:
+entPhysicalAssetID:
+entPhysicalClass: chassis
+entPhysicalContainedIn: 10
+entPhysicalDescr: Fex-107 Nexus2248 Chassis
+entPhysicalFirmwareRev:
+entPhysicalHardwareRev: V03
+entPhysicalIsFRU: 2
+entPhysicalMfgName: Cisco Systems, Inc.
+entPhysicalModelName: Fabric Extender Module: 48x1GE, 4x10GE
+entPhysicalName: Fex-107 Nexus2248 Chassis
+entPhysicalParentRelPos: 107
+entPhysicalSerialNum: SSI162802BH
+entPhysicalSoftwareRev:
+entPhysicalVendorType: 1.3.6.1.4.1.9.12.3.1.3.914
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/NXOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/PrimeNCS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/PrimeNCS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/PrimeNCS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/PrimeNCS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/UCOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/UCOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/UCOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/UCOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Cisco/WLC/Component/WlanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/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.4.2.2/plugins-scripts/Classes/Clavister.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Clavister.pm
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.4.2.2/plugins-scripts/Classes/Clavister/Firewall1.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Clavister/Firewall1.pm
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.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/CpuSubsystem.pm
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.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/EnvironmentalSubsystem.pm
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.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Clavister/Firewall1/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Device.pm
similarity index 94%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Device.pm
index 8577fab..0df375b 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Device.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Device.pm
@@ -8,6 +8,11 @@ sub classify {
     $self->add_unknown('either specify a hostname or a snmpwalk file');
   } else {
     if ($self->opts->servertype && $self->opts->servertype eq 'linuxlocal') {
+    } elsif ($self->opts->servertype && $self->opts->servertype eq 'windowslocal') {
+      eval "use DBD::WMI";
+      if ($@) {
+        $self->add_unknown("module DBD::WMI is not installed");
+      }
     } elsif ($self->opts->port && $self->opts->port == 49000) {
       $self->{productname} = 'upnp';
       $self->check_upnp_and_model();
@@ -43,6 +48,9 @@ sub classify {
       } elsif ($self->{productname} =~ /linuxlocal/i) {
         bless $self, 'Server::Linux';
         $self->debug('using Server::Linux');
+      } elsif ($self->{productname} =~ /windowslocal/i) {
+        bless $self, 'Server::Windows';
+        $self->debug('using Server::Windows');
       } elsif ($self->{productname} =~ /Cisco/i) {
         bless $self, 'Classes::Cisco';
         $self->debug('using Classes::Cisco');
@@ -99,6 +107,9 @@ sub classify {
       } elsif ($self->implements_mib('NETSCREEN-PRODUCTS-MIB')) {
         $self->debug('using Classes::Juniper::NetScreen');
         bless $self, 'Classes::Juniper::NetScreen';
+      } elsif ($self->implements_mib('PAN-PRODUCTS-MIB')) {
+        $self->debug('using Classes::PaloAlto');
+        bless $self, 'Classes::PaloAlto';
       } elsif ($self->{productname} =~ /SecureOS/i) {
         bless $self, 'Classes::SecureOS';
         $self->debug('using Classes::SecureOS');
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB.pm
new file mode 100644
index 0000000..7967959
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB.pm
@@ -0,0 +1,4 @@
+package Classes::ENTITYSENSORMIB;
+our @ISA = qw(Classes::Device);
+use strict;
+
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB/Component/EnvironmentalSubsystem.pm
new file mode 100644
index 0000000..f55836c
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/ENTITYSENSORMIB/Component/EnvironmentalSubsystem.pm
@@ -0,0 +1,107 @@
+package Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('ENTITY-MIB', [
+    ['entities', 'entPhysicalTable', 'GLPlugin::TableItem', sub { my $o = shift; $o->{entPhysicalClass} eq 'sensor';}],
+  ]);
+  $self->get_snmp_tables('ENTITY-SENSOR-MIB', [
+    ['sensors', 'entPhySensorTable', 'Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor' ],
+  ]);
+  foreach (@{$self->{sensors}}) {
+    $_->{entPhySensorEntityName} = shift(@{$self->{entities}})->{entPhysicalName};
+  }
+  delete $self->{entities};
+}
+
+sub check {
+  my $self = shift;
+  foreach (@{$self->{sensors}}) {
+    $_->check();
+  }
+  if (! $self->check_messages()) {
+    $self->add_ok("environmental hardware working fine");
+  }
+}
+
+sub dump {
+  my $self = shift;
+  foreach (@{$self->{sensors}}) {
+    $_->dump();
+  }
+}
+
+
+package Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub finish {
+  my $self = shift;
+  if ($self->{entPhySensorType} eq 'rpm') {
+    bless $self, 'Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor::Fan';
+  } elsif ($self->{entPhySensorType} eq 'celsius') {
+    bless $self, 'Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor::Temperature';
+  }
+}
+
+sub check {
+  my $self = shift;
+  if ($self->{entPhySensorOperStatus} ne 'ok') {
+    $self->add_info(sprintf '%s has status %s\n',
+        $self->{entity}->{entPhysicalName},
+        $self->{entPhySensorOperStatus});
+    if ($self->{entPhySensorOperStatus} eq 'nonoperational') {
+      $self->add_critical();
+    } else {
+      $self->add_unknown();
+    }
+  } else {
+    $self->add_info(sprintf "%s reports %s%s",
+        $self->{entPhySensorEntityName},
+        $self->{entPhySensorValue},
+        $self->{entPhySensorUnitsDisplay}
+    );
+    #$self->add_ok();
+  }
+}
+
+
+package Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor::Temperature;
+our @ISA = qw(Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor);
+use strict;
+
+sub rename {
+  my $self = shift;
+}
+
+sub check {
+  my $self = shift;
+  $self->SUPER::check();
+  my $label = $self->{entPhySensorEntityName};
+  $label =~ s/[Tt]emperature\s*@\s*(.*)/$1/;
+  $self->add_perfdata(
+    label => 'temp_'.$label,
+    value => $self->{entPhySensorValue},
+  );
+}
+
+package Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor::Fan;
+our @ISA = qw(Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem::Sensor);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->SUPER::check();
+  my $label = $self->{entPhySensorEntityName};
+  $label =~ s/ RPM$//g;
+  $label =~ s/Fan #(\d+)/$1/g;
+  $self->add_perfdata(
+    label => 'fan_'.$label,
+    value => $self->{entPhySensorValue},
+  );
+}
+
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
index 0f107e5..ae653a8 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/LTM.pm
@@ -7,9 +7,7 @@ sub new {
   my %params = @_;
   my $self = {};
   # tables can be huge
-  if ($GLPlugin::SNMP::session) {
-    $GLPlugin::SNMP::session->max_msg_size(10 * $GLPlugin::SNMP::session->max_msg_size());
-  }
+  $self->mult_snmp_max_msg_size(10);
   if ($params{productversion} =~ /^4/) {
     bless $self, "Classes::F5::F5BIGIP::Component::LTMSubsystem4";
     $self->debug("use Classes::F5::F5BIGIP::Component::LTMSubsystem4");
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS/Components/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCEOS/Components/FruSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FCMGMT/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/FabOS/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Fortigate/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/FanSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/PowersupplySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/SLBSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Foundry/Component/TemperatureSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HP/Procurve/Component/SensorSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HSRP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HSRP.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/HSRP/Component/HSRPSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
similarity index 99%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
index e8b1b56..8be33c4 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
@@ -193,7 +193,7 @@ sub update_interface_cache {
   if ($must_update) {
     $self->debug('update of interface cache');
     $self->{interface_cache} = {};
-    foreach ($self->get_snmp_table_objects( 'IFMIB', 'ifTable+ifXTable')) {
+    foreach ($self->get_snmp_table_objects('MINI-IFMIB', 'ifTable+ifXTable', [-1])) {
       # neuerdings index+descr, weil die drecksscheiss allied telesyn ports
       # alle gleich heissen
       # und noch so ein hirnbrand: --mode list-interfaces
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/IFMIB/Component/LinkAggregation.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/IVE/Component/UserSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Juniper/NetScreen/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Lantronix.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Lantronix.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix/SLS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Lantronix/SLS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Lantronix/SLS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Lantronix/SLS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MEOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/MEOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MEOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/MEOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/MibsAndOids.pm
similarity index 88%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/MibsAndOids.pm
index 8afd82d..d6453e1 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/MibsAndOids.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/MibsAndOids.pm
@@ -13,6 +13,7 @@ $GLPlugin::SNMP::mib_ids = {
   'CISCO-ENTITY-FRU-CONTROL-MIB' => '1.3.6.1.4.1.9.9.117.1',
   'CISCO-ENTITY-ALARM-MIB' => '1.3.6.1.4.1.9.9.138.1',
   'CISCO-ENVMON-MIB' => '1.3.6.1.4.1.9.9.13',
+  'PAN-PRODUCTS-MIB' => '1.3.6.1.4.1.25461.2.3',
 };
 
 $GLPlugin::SNMP::mibs_and_oids = {
@@ -22,6 +23,18 @@ $GLPlugin::SNMP::mibs_and_oids = {
       sysUpTime => '1.3.6.1.2.1.1.3',
       sysName => '1.3.6.1.2.1.1.5',
   },
+  'MINI-IFMIB' => {
+      ifNumber => '1.3.6.1.2.1.2.1',
+      ifTableLastChange => '1.3.6.1.2.1.31.1.5',
+      ifTable => '1.3.6.1.2.1.2.2',
+      ifEntry => '1.3.6.1.2.1.2.2.1',
+      ifIndex => '1.3.6.1.2.1.2.2.1.1',
+      ifDescr => '1.3.6.1.2.1.2.2.1.2',
+      ifXTable => '1.3.6.1.2.1.31.1.1',
+      ifXEntry => '1.3.6.1.2.1.31.1.1.1',
+      ifName => '1.3.6.1.2.1.31.1.1.1.1',
+      ifAlias => '1.3.6.1.2.1.31.1.1.1.18',
+  },
   'IFMIB' => {
       ifNumber => '1.3.6.1.2.1.2.1',
       ifTableLastChange => '1.3.6.1.2.1.31.1.5',
@@ -1286,6 +1299,595 @@ $GLPlugin::SNMP::mibs_and_oids = {
     cfcFeatureCtrlOpStatus => 'CISCO-FEATURE-CONTROL-MIB::CiscoFeatureStatus',
     cfcFeatureCtrlOpStatusReason => '1.3.6.1.4.1.9.9.377.1.1.1.1.8',
   },
+  'CISCO-IPSEC-FLOW-MONITOR-MIB' => {
+    enterprises => '1.3.6.1.4.1',
+    cisco => '1.3.6.1.4.1.9',
+    ciscoMgmt => '1.3.6.1.4.1.9.9',
+    ciscoIpSecFlowMonitorMIB => '1.3.6.1.4.1.9.9.171',
+    ciscoIpSecFlowMonitorMIBDefinition => {
+      '1' => 'enabled',
+      '2' => 'disabled',
+    },
+    cipSecMIBObjects => '1.3.6.1.4.1.9.9.171.1',
+    cipSecLevels => '1.3.6.1.4.1.9.9.171.1.1',
+    cipSecMibLevel => '1.3.6.1.4.1.9.9.171.1.1.1',
+    cipSecPhaseOne => '1.3.6.1.4.1.9.9.171.1.2',
+    cikeGlobalStats => '1.3.6.1.4.1.9.9.171.1.2.1',
+    cikeGlobalActiveTunnels => '1.3.6.1.4.1.9.9.171.1.2.1.1',
+    cikeGlobalPreviousTunnels => '1.3.6.1.4.1.9.9.171.1.2.1.2',
+    cikeGlobalInOctets => '1.3.6.1.4.1.9.9.171.1.2.1.3',
+    cikeGlobalInPkts => '1.3.6.1.4.1.9.9.171.1.2.1.4',
+    cikeGlobalInDropPkts => '1.3.6.1.4.1.9.9.171.1.2.1.5',
+    cikeGlobalInNotifys => '1.3.6.1.4.1.9.9.171.1.2.1.6',
+    cikeGlobalInP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.1.7',
+    cikeGlobalInP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.1.8',
+    cikeGlobalInP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.1.9',
+    cikeGlobalInP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.1.10',
+    cikeGlobalOutOctets => '1.3.6.1.4.1.9.9.171.1.2.1.11',
+    cikeGlobalOutPkts => '1.3.6.1.4.1.9.9.171.1.2.1.12',
+    cikeGlobalOutDropPkts => '1.3.6.1.4.1.9.9.171.1.2.1.13',
+    cikeGlobalOutNotifys => '1.3.6.1.4.1.9.9.171.1.2.1.14',
+    cikeGlobalOutP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.1.15',
+    cikeGlobalOutP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.1.16',
+    cikeGlobalOutP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.1.17',
+    cikeGlobalOutP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.1.18',
+    cikeGlobalInitTunnels => '1.3.6.1.4.1.9.9.171.1.2.1.19',
+    cikeGlobalInitTunnelFails => '1.3.6.1.4.1.9.9.171.1.2.1.20',
+    cikeGlobalRespTunnelFails => '1.3.6.1.4.1.9.9.171.1.2.1.21',
+    cikeGlobalSysCapFails => '1.3.6.1.4.1.9.9.171.1.2.1.22',
+    cikeGlobalAuthFails => '1.3.6.1.4.1.9.9.171.1.2.1.23',
+    cikeGlobalDecryptFails => '1.3.6.1.4.1.9.9.171.1.2.1.24',
+    cikeGlobalHashValidFails => '1.3.6.1.4.1.9.9.171.1.2.1.25',
+    cikeGlobalNoSaFails => '1.3.6.1.4.1.9.9.171.1.2.1.26',
+    cikePeerTable => '1.3.6.1.4.1.9.9.171.1.2.2',
+    cikePeerEntry => '1.3.6.1.4.1.9.9.171.1.2.2.1',
+    cikePeerLocalType => '1.3.6.1.4.1.9.9.171.1.2.2.1.1',
+    cikePeerLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikePeerLocalValue => '1.3.6.1.4.1.9.9.171.1.2.2.1.2',
+    cikePeerRemoteType => '1.3.6.1.4.1.9.9.171.1.2.2.1.3',
+    cikePeerRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikePeerRemoteValue => '1.3.6.1.4.1.9.9.171.1.2.2.1.4',
+    cikePeerIntIndex => '1.3.6.1.4.1.9.9.171.1.2.2.1.5',
+    cikePeerLocalAddr => '1.3.6.1.4.1.9.9.171.1.2.2.1.6',
+    cikePeerRemoteAddr => '1.3.6.1.4.1.9.9.171.1.2.2.1.7',
+    cikePeerActiveTime => '1.3.6.1.4.1.9.9.171.1.2.2.1.8',
+    cikePeerActiveTunnelIndex => '1.3.6.1.4.1.9.9.171.1.2.2.1.9',
+    cikeTunnelTable => '1.3.6.1.4.1.9.9.171.1.2.3',
+    cikeTunnelEntry => '1.3.6.1.4.1.9.9.171.1.2.3.1',
+    cikeTunIndex => '1.3.6.1.4.1.9.9.171.1.2.3.1.1',
+    cikeTunLocalType => '1.3.6.1.4.1.9.9.171.1.2.3.1.2',
+    cikeTunLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeTunLocalValue => '1.3.6.1.4.1.9.9.171.1.2.3.1.3',
+    cikeTunLocalAddr => '1.3.6.1.4.1.9.9.171.1.2.3.1.4',
+    cikeTunLocalName => '1.3.6.1.4.1.9.9.171.1.2.3.1.5',
+    cikeTunRemoteType => '1.3.6.1.4.1.9.9.171.1.2.3.1.6',
+    cikeTunRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeTunRemoteValue => '1.3.6.1.4.1.9.9.171.1.2.3.1.7',
+    cikeTunRemoteAddr => '1.3.6.1.4.1.9.9.171.1.2.3.1.8',
+    cikeTunRemoteName => '1.3.6.1.4.1.9.9.171.1.2.3.1.9',
+    cikeTunNegoMode => '1.3.6.1.4.1.9.9.171.1.2.3.1.10',
+    cikeTunNegoModeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeNegoMode',
+    cikeTunDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.2.3.1.11',
+    cikeTunDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cikeTunEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.2.3.1.12',
+    cikeTunEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cikeTunHashAlgo => '1.3.6.1.4.1.9.9.171.1.2.3.1.13',
+    cikeTunHashAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeHashAlgo',
+    cikeTunAuthMethod => '1.3.6.1.4.1.9.9.171.1.2.3.1.14',
+    cikeTunAuthMethodDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeAuthMethod',
+    cikeTunLifeTime => '1.3.6.1.4.1.9.9.171.1.2.3.1.15',
+    cikeTunActiveTime => '1.3.6.1.4.1.9.9.171.1.2.3.1.16',
+    cikeTunSaRefreshThreshold => '1.3.6.1.4.1.9.9.171.1.2.3.1.17',
+    cikeTunTotalRefreshes => '1.3.6.1.4.1.9.9.171.1.2.3.1.18',
+    cikeTunInOctets => '1.3.6.1.4.1.9.9.171.1.2.3.1.19',
+    cikeTunInPkts => '1.3.6.1.4.1.9.9.171.1.2.3.1.20',
+    cikeTunInDropPkts => '1.3.6.1.4.1.9.9.171.1.2.3.1.21',
+    cikeTunInNotifys => '1.3.6.1.4.1.9.9.171.1.2.3.1.22',
+    cikeTunInP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.3.1.23',
+    cikeTunInP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.3.1.24',
+    cikeTunInP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.3.1.25',
+    cikeTunInP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.3.1.26',
+    cikeTunOutOctets => '1.3.6.1.4.1.9.9.171.1.2.3.1.27',
+    cikeTunOutPkts => '1.3.6.1.4.1.9.9.171.1.2.3.1.28',
+    cikeTunOutDropPkts => '1.3.6.1.4.1.9.9.171.1.2.3.1.29',
+    cikeTunOutNotifys => '1.3.6.1.4.1.9.9.171.1.2.3.1.30',
+    cikeTunOutP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.3.1.31',
+    cikeTunOutP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.3.1.32',
+    cikeTunOutP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.3.1.33',
+    cikeTunOutP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.3.1.34',
+    cikeTunStatus => '1.3.6.1.4.1.9.9.171.1.2.3.1.35',
+    cikeTunStatusDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TunnelStatus',
+    cikePeerCorrTable => '1.3.6.1.4.1.9.9.171.1.2.4',
+    cikePeerCorrEntry => '1.3.6.1.4.1.9.9.171.1.2.4.1',
+    cikePeerCorrLocalType => '1.3.6.1.4.1.9.9.171.1.2.4.1.1',
+    cikePeerCorrLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikePeerCorrLocalValue => '1.3.6.1.4.1.9.9.171.1.2.4.1.2',
+    cikePeerCorrRemoteType => '1.3.6.1.4.1.9.9.171.1.2.4.1.3',
+    cikePeerCorrRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikePeerCorrRemoteValue => '1.3.6.1.4.1.9.9.171.1.2.4.1.4',
+    cikePeerCorrIntIndex => '1.3.6.1.4.1.9.9.171.1.2.4.1.5',
+    cikePeerCorrSeqNum => '1.3.6.1.4.1.9.9.171.1.2.4.1.6',
+    cikePeerCorrIpSecTunIndex => '1.3.6.1.4.1.9.9.171.1.2.4.1.7',
+    cikePhase1GWStatsTable => '1.3.6.1.4.1.9.9.171.1.2.5',
+    cikePhase1GWStatsEntry => '1.3.6.1.4.1.9.9.171.1.2.5.1',
+    cikePhase1GWActiveTunnels => '1.3.6.1.4.1.9.9.171.1.2.5.1.1',
+    cikePhase1GWPreviousTunnels => '1.3.6.1.4.1.9.9.171.1.2.5.1.2',
+    cikePhase1GWInOctets => '1.3.6.1.4.1.9.9.171.1.2.5.1.3',
+    cikePhase1GWInPkts => '1.3.6.1.4.1.9.9.171.1.2.5.1.4',
+    cikePhase1GWInDropPkts => '1.3.6.1.4.1.9.9.171.1.2.5.1.5',
+    cikePhase1GWInNotifys => '1.3.6.1.4.1.9.9.171.1.2.5.1.6',
+    cikePhase1GWInP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.5.1.7',
+    cikePhase1GWInP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.5.1.8',
+    cikePhase1GWInP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.5.1.9',
+    cikePhase1GWInP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.5.1.10',
+    cikePhase1GWOutOctets => '1.3.6.1.4.1.9.9.171.1.2.5.1.11',
+    cikePhase1GWOutPkts => '1.3.6.1.4.1.9.9.171.1.2.5.1.12',
+    cikePhase1GWOutDropPkts => '1.3.6.1.4.1.9.9.171.1.2.5.1.13',
+    cikePhase1GWOutNotifys => '1.3.6.1.4.1.9.9.171.1.2.5.1.14',
+    cikePhase1GWOutP2Exchgs => '1.3.6.1.4.1.9.9.171.1.2.5.1.15',
+    cikePhase1GWOutP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.2.5.1.16',
+    cikePhase1GWOutP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.2.5.1.17',
+    cikePhase1GWOutP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.2.5.1.18',
+    cikePhase1GWInitTunnels => '1.3.6.1.4.1.9.9.171.1.2.5.1.19',
+    cikePhase1GWInitTunnelFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.20',
+    cikePhase1GWRespTunnelFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.21',
+    cikePhase1GWSysCapFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.22',
+    cikePhase1GWAuthFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.23',
+    cikePhase1GWDecryptFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.24',
+    cikePhase1GWHashValidFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.25',
+    cikePhase1GWNoSaFails => '1.3.6.1.4.1.9.9.171.1.2.5.1.26',
+    cipSecPhaseTwo => '1.3.6.1.4.1.9.9.171.1.3',
+    cipSecGlobalStats => '1.3.6.1.4.1.9.9.171.1.3.1',
+    cipSecGlobalActiveTunnels => '1.3.6.1.4.1.9.9.171.1.3.1.1',
+    cipSecGlobalPreviousTunnels => '1.3.6.1.4.1.9.9.171.1.3.1.2',
+    cipSecGlobalInOctets => '1.3.6.1.4.1.9.9.171.1.3.1.3',
+    cipSecGlobalHcInOctets => '1.3.6.1.4.1.9.9.171.1.3.1.4',
+    cipSecGlobalInOctWraps => '1.3.6.1.4.1.9.9.171.1.3.1.5',
+    cipSecGlobalInDecompOctets => '1.3.6.1.4.1.9.9.171.1.3.1.6',
+    cipSecGlobalHcInDecompOctets => '1.3.6.1.4.1.9.9.171.1.3.1.7',
+    cipSecGlobalInDecompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.1.8',
+    cipSecGlobalInPkts => '1.3.6.1.4.1.9.9.171.1.3.1.9',
+    cipSecGlobalInDrops => '1.3.6.1.4.1.9.9.171.1.3.1.10',
+    cipSecGlobalInReplayDrops => '1.3.6.1.4.1.9.9.171.1.3.1.11',
+    cipSecGlobalInAuths => '1.3.6.1.4.1.9.9.171.1.3.1.12',
+    cipSecGlobalInAuthFails => '1.3.6.1.4.1.9.9.171.1.3.1.13',
+    cipSecGlobalInDecrypts => '1.3.6.1.4.1.9.9.171.1.3.1.14',
+    cipSecGlobalInDecryptFails => '1.3.6.1.4.1.9.9.171.1.3.1.15',
+    cipSecGlobalOutOctets => '1.3.6.1.4.1.9.9.171.1.3.1.16',
+    cipSecGlobalHcOutOctets => '1.3.6.1.4.1.9.9.171.1.3.1.17',
+    cipSecGlobalOutOctWraps => '1.3.6.1.4.1.9.9.171.1.3.1.18',
+    cipSecGlobalOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.3.1.19',
+    cipSecGlobalHcOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.3.1.20',
+    cipSecGlobalOutUncompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.1.21',
+    cipSecGlobalOutPkts => '1.3.6.1.4.1.9.9.171.1.3.1.22',
+    cipSecGlobalOutDrops => '1.3.6.1.4.1.9.9.171.1.3.1.23',
+    cipSecGlobalOutAuths => '1.3.6.1.4.1.9.9.171.1.3.1.24',
+    cipSecGlobalOutAuthFails => '1.3.6.1.4.1.9.9.171.1.3.1.25',
+    cipSecGlobalOutEncrypts => '1.3.6.1.4.1.9.9.171.1.3.1.26',
+    cipSecGlobalOutEncryptFails => '1.3.6.1.4.1.9.9.171.1.3.1.27',
+    cipSecGlobalProtocolUseFails => '1.3.6.1.4.1.9.9.171.1.3.1.28',
+    cipSecGlobalNoSaFails => '1.3.6.1.4.1.9.9.171.1.3.1.29',
+    cipSecGlobalSysCapFails => '1.3.6.1.4.1.9.9.171.1.3.1.30',
+    cipSecTunnelTable => '1.3.6.1.4.1.9.9.171.1.3.2',
+    cipSecTunnelEntry => '1.3.6.1.4.1.9.9.171.1.3.2.1',
+    cipSecTunIndex => '1.3.6.1.4.1.9.9.171.1.3.2.1.1',
+    cipSecTunIkeTunnelIndex => '1.3.6.1.4.1.9.9.171.1.3.2.1.2',
+    cipSecTunIkeTunnelAlive => '1.3.6.1.4.1.9.9.171.1.3.2.1.3',
+    cipSecTunLocalAddr => '1.3.6.1.4.1.9.9.171.1.3.2.1.4',
+    cipSecTunRemoteAddr => '1.3.6.1.4.1.9.9.171.1.3.2.1.5',
+    cipSecTunKeyType => '1.3.6.1.4.1.9.9.171.1.3.2.1.6',
+    cipSecTunKeyTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::KeyType',
+    cipSecTunEncapMode => '1.3.6.1.4.1.9.9.171.1.3.2.1.7',
+    cipSecTunEncapModeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncapMode',
+    cipSecTunLifeSize => '1.3.6.1.4.1.9.9.171.1.3.2.1.8',
+    cipSecTunLifeTime => '1.3.6.1.4.1.9.9.171.1.3.2.1.9',
+    cipSecTunActiveTime => '1.3.6.1.4.1.9.9.171.1.3.2.1.10',
+    cipSecTunSaLifeSizeThreshold => '1.3.6.1.4.1.9.9.171.1.3.2.1.11',
+    cipSecTunSaLifeTimeThreshold => '1.3.6.1.4.1.9.9.171.1.3.2.1.12',
+    cipSecTunTotalRefreshes => '1.3.6.1.4.1.9.9.171.1.3.2.1.13',
+    cipSecTunExpiredSaInstances => '1.3.6.1.4.1.9.9.171.1.3.2.1.14',
+    cipSecTunCurrentSaInstances => '1.3.6.1.4.1.9.9.171.1.3.2.1.15',
+    cipSecTunInSaDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.3.2.1.16',
+    cipSecTunInSaDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cipSecTunInSaEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.17',
+    cipSecTunInSaEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cipSecTunInSaAhAuthAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.18',
+    cipSecTunInSaAhAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunInSaEspAuthAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.19',
+    cipSecTunInSaEspAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunInSaDecompAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.20',
+    cipSecTunInSaDecompAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::CompAlgo',
+    cipSecTunOutSaDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.3.2.1.21',
+    cipSecTunOutSaDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cipSecTunOutSaEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.22',
+    cipSecTunOutSaEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cipSecTunOutSaAhAuthAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.23',
+    cipSecTunOutSaAhAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunOutSaEspAuthAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.24',
+    cipSecTunOutSaEspAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunOutSaCompAlgo => '1.3.6.1.4.1.9.9.171.1.3.2.1.25',
+    cipSecTunOutSaCompAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::CompAlgo',
+    cipSecTunInOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.26',
+    cipSecTunHcInOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.27',
+    cipSecTunInOctWraps => '1.3.6.1.4.1.9.9.171.1.3.2.1.28',
+    cipSecTunInDecompOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.29',
+    cipSecTunHcInDecompOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.30',
+    cipSecTunInDecompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.2.1.31',
+    cipSecTunInPkts => '1.3.6.1.4.1.9.9.171.1.3.2.1.32',
+    cipSecTunInDropPkts => '1.3.6.1.4.1.9.9.171.1.3.2.1.33',
+    cipSecTunInReplayDropPkts => '1.3.6.1.4.1.9.9.171.1.3.2.1.34',
+    cipSecTunInAuths => '1.3.6.1.4.1.9.9.171.1.3.2.1.35',
+    cipSecTunInAuthFails => '1.3.6.1.4.1.9.9.171.1.3.2.1.36',
+    cipSecTunInDecrypts => '1.3.6.1.4.1.9.9.171.1.3.2.1.37',
+    cipSecTunInDecryptFails => '1.3.6.1.4.1.9.9.171.1.3.2.1.38',
+    cipSecTunOutOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.39',
+    cipSecTunHcOutOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.40',
+    cipSecTunOutOctWraps => '1.3.6.1.4.1.9.9.171.1.3.2.1.41',
+    cipSecTunOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.42',
+    cipSecTunHcOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.3.2.1.43',
+    cipSecTunOutUncompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.2.1.44',
+    cipSecTunOutPkts => '1.3.6.1.4.1.9.9.171.1.3.2.1.45',
+    cipSecTunOutDropPkts => '1.3.6.1.4.1.9.9.171.1.3.2.1.46',
+    cipSecTunOutAuths => '1.3.6.1.4.1.9.9.171.1.3.2.1.47',
+    cipSecTunOutAuthFails => '1.3.6.1.4.1.9.9.171.1.3.2.1.48',
+    cipSecTunOutEncrypts => '1.3.6.1.4.1.9.9.171.1.3.2.1.49',
+    cipSecTunOutEncryptFails => '1.3.6.1.4.1.9.9.171.1.3.2.1.50',
+    cipSecTunStatus => '1.3.6.1.4.1.9.9.171.1.3.2.1.51',
+    cipSecTunStatusDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TunnelStatus',
+    cipSecEndPtTable => '1.3.6.1.4.1.9.9.171.1.3.3',
+    cipSecEndPtEntry => '1.3.6.1.4.1.9.9.171.1.3.3.1',
+    cipSecEndPtIndex => '1.3.6.1.4.1.9.9.171.1.3.3.1.1',
+    cipSecEndPtLocalName => '1.3.6.1.4.1.9.9.171.1.3.3.1.2',
+    cipSecEndPtLocalType => '1.3.6.1.4.1.9.9.171.1.3.3.1.3',
+    cipSecEndPtLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EndPtType',
+    cipSecEndPtLocalAddr1 => '1.3.6.1.4.1.9.9.171.1.3.3.1.4',
+    cipSecEndPtLocalAddr2 => '1.3.6.1.4.1.9.9.171.1.3.3.1.5',
+    cipSecEndPtLocalProtocol => '1.3.6.1.4.1.9.9.171.1.3.3.1.6',
+    cipSecEndPtLocalPort => '1.3.6.1.4.1.9.9.171.1.3.3.1.7',
+    cipSecEndPtRemoteName => '1.3.6.1.4.1.9.9.171.1.3.3.1.8',
+    cipSecEndPtRemoteType => '1.3.6.1.4.1.9.9.171.1.3.3.1.9',
+    cipSecEndPtRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EndPtType',
+    cipSecEndPtRemoteAddr1 => '1.3.6.1.4.1.9.9.171.1.3.3.1.10',
+    cipSecEndPtRemoteAddr2 => '1.3.6.1.4.1.9.9.171.1.3.3.1.11',
+    cipSecEndPtRemoteProtocol => '1.3.6.1.4.1.9.9.171.1.3.3.1.12',
+    cipSecEndPtRemotePort => '1.3.6.1.4.1.9.9.171.1.3.3.1.13',
+    cipSecSpiTable => '1.3.6.1.4.1.9.9.171.1.3.4',
+    cipSecSpiEntry => '1.3.6.1.4.1.9.9.171.1.3.4.1',
+    cipSecSpiIndex => '1.3.6.1.4.1.9.9.171.1.3.4.1.1',
+    cipSecSpiDirection => '1.3.6.1.4.1.9.9.171.1.3.4.1.2',
+    cipSecSpiDirectionDefinition => {
+      '1' => 'in',
+      '2' => 'out',
+    },
+    cipSecSpiValue => '1.3.6.1.4.1.9.9.171.1.3.4.1.3',
+    cipSecSpiProtocol => '1.3.6.1.4.1.9.9.171.1.3.4.1.4',
+    cipSecSpiProtocolDefinition => {
+      '1' => 'ah',
+      '2' => 'esp',
+      '3' => 'ipcomp',
+    },
+    cipSecSpiStatus => '1.3.6.1.4.1.9.9.171.1.3.4.1.5',
+    cipSecSpiStatusDefinition => {
+      '1' => 'active',
+      '2' => 'expiring',
+    },
+    cipSecPhase2GWStatsTable => '1.3.6.1.4.1.9.9.171.1.3.5',
+    cipSecPhase2GWStatsEntry => '1.3.6.1.4.1.9.9.171.1.3.5.1',
+    cipSecPhase2GWActiveTunnels => '1.3.6.1.4.1.9.9.171.1.3.5.1.1',
+    cipSecPhase2GWPreviousTunnels => '1.3.6.1.4.1.9.9.171.1.3.5.1.2',
+    cipSecPhase2GWInOctets => '1.3.6.1.4.1.9.9.171.1.3.5.1.3',
+    cipSecPhase2GWInOctWraps => '1.3.6.1.4.1.9.9.171.1.3.5.1.4',
+    cipSecPhase2GWInDecompOctets => '1.3.6.1.4.1.9.9.171.1.3.5.1.5',
+    cipSecPhase2GWInDecompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.5.1.6',
+    cipSecPhase2GWInPkts => '1.3.6.1.4.1.9.9.171.1.3.5.1.7',
+    cipSecPhase2GWInDrops => '1.3.6.1.4.1.9.9.171.1.3.5.1.8',
+    cipSecPhase2GWInReplayDrops => '1.3.6.1.4.1.9.9.171.1.3.5.1.9',
+    cipSecPhase2GWInAuths => '1.3.6.1.4.1.9.9.171.1.3.5.1.10',
+    cipSecPhase2GWInAuthFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.11',
+    cipSecPhase2GWInDecrypts => '1.3.6.1.4.1.9.9.171.1.3.5.1.12',
+    cipSecPhase2GWInDecryptFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.13',
+    cipSecPhase2GWOutOctets => '1.3.6.1.4.1.9.9.171.1.3.5.1.14',
+    cipSecPhase2GWOutOctWraps => '1.3.6.1.4.1.9.9.171.1.3.5.1.15',
+    cipSecPhase2GWOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.3.5.1.16',
+    cipSecPhase2GWOutUncompOctWraps => '1.3.6.1.4.1.9.9.171.1.3.5.1.17',
+    cipSecPhase2GWOutPkts => '1.3.6.1.4.1.9.9.171.1.3.5.1.18',
+    cipSecPhase2GWOutDrops => '1.3.6.1.4.1.9.9.171.1.3.5.1.19',
+    cipSecPhase2GWOutAuths => '1.3.6.1.4.1.9.9.171.1.3.5.1.20',
+    cipSecPhase2GWOutAuthFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.21',
+    cipSecPhase2GWOutEncrypts => '1.3.6.1.4.1.9.9.171.1.3.5.1.22',
+    cipSecPhase2GWOutEncryptFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.23',
+    cipSecPhase2GWProtocolUseFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.24',
+    cipSecPhase2GWNoSaFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.25',
+    cipSecPhase2GWSysCapFails => '1.3.6.1.4.1.9.9.171.1.3.5.1.26',
+    cipSecHistory => '1.3.6.1.4.1.9.9.171.1.4',
+    cipSecHistGlobal => '1.3.6.1.4.1.9.9.171.1.4.1',
+    cipSecHistGlobalCntl => '1.3.6.1.4.1.9.9.171.1.4.1.1',
+    cipSecHistTableSize => '1.3.6.1.4.1.9.9.171.1.4.1.1.1',
+    cipSecHistCheckPoint => '1.3.6.1.4.1.9.9.171.1.4.1.1.2',
+    cipSecHistCheckPointDefinition => {
+      '1' => 'ready',
+      '2' => 'checkPoint',
+    },
+    cipSecHistPhaseOne => '1.3.6.1.4.1.9.9.171.1.4.2',
+    cikeTunnelHistTable => '1.3.6.1.4.1.9.9.171.1.4.2.1',
+    cikeTunnelHistEntry => '1.3.6.1.4.1.9.9.171.1.4.2.1.1',
+    cikeTunHistIndex => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.1',
+    cikeTunHistTermReason => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.2',
+    cikeTunHistTermReasonDefinition => {
+      '1' => 'other',
+      '2' => 'normal',
+      '3' => 'operRequest',
+      '4' => 'peerDelRequest',
+      '5' => 'peerLost',
+      '6' => 'localFailure',
+      '7' => 'checkPointReg',
+    },
+    cikeTunHistActiveIndex => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.3',
+    cikeTunHistPeerLocalType => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.4',
+    cikeTunHistPeerLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeTunHistPeerLocalValue => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.5',
+    cikeTunHistPeerIntIndex => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.6',
+    cikeTunHistPeerRemoteType => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.7',
+    cikeTunHistPeerRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeTunHistPeerRemoteValue => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.8',
+    cikeTunHistLocalAddr => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.9',
+    cikeTunHistLocalName => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.10',
+    cikeTunHistRemoteAddr => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.11',
+    cikeTunHistRemoteName => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.12',
+    cikeTunHistNegoMode => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.13',
+    cikeTunHistNegoModeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeNegoMode',
+    cikeTunHistDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.14',
+    cikeTunHistDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cikeTunHistEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.15',
+    cikeTunHistEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cikeTunHistHashAlgo => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.16',
+    cikeTunHistHashAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeHashAlgo',
+    cikeTunHistAuthMethod => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.17',
+    cikeTunHistAuthMethodDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkeAuthMethod',
+    cikeTunHistLifeTime => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.18',
+    cikeTunHistStartTime => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.19',
+    cikeTunHistActiveTime => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.20',
+    cikeTunHistTotalRefreshes => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.21',
+    cikeTunHistTotalSas => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.22',
+    cikeTunHistInOctets => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.23',
+    cikeTunHistInPkts => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.24',
+    cikeTunHistInDropPkts => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.25',
+    cikeTunHistInNotifys => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.26',
+    cikeTunHistInP2Exchgs => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.27',
+    cikeTunHistInP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.28',
+    cikeTunHistInP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.29',
+    cikeTunHistInP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.30',
+    cikeTunHistOutOctets => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.31',
+    cikeTunHistOutPkts => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.32',
+    cikeTunHistOutDropPkts => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.33',
+    cikeTunHistOutNotifys => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.34',
+    cikeTunHistOutP2Exchgs => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.35',
+    cikeTunHistOutP2ExchgInvalids => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.36',
+    cikeTunHistOutP2ExchgRejects => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.37',
+    cikeTunHistOutP2SaDelRequests => '1.3.6.1.4.1.9.9.171.1.4.2.1.1.38',
+    cipSecHistPhaseTwo => '1.3.6.1.4.1.9.9.171.1.4.3',
+    cipSecTunnelHistTable => '1.3.6.1.4.1.9.9.171.1.4.3.1',
+    cipSecTunnelHistEntry => '1.3.6.1.4.1.9.9.171.1.4.3.1.1',
+    cipSecTunHistIndex => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.1',
+    cipSecTunHistTermReason => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.2',
+    cipSecTunHistTermReasonDefinition => {
+      '1' => 'other',
+      '2' => 'normal',
+      '3' => 'operRequest',
+      '4' => 'peerDelRequest',
+      '5' => 'peerLost',
+      '6' => 'seqNumRollOver',
+      '7' => 'checkPointReq',
+    },
+    cipSecTunHistActiveIndex => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.3',
+    cipSecTunHistLocalAddr => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.5',
+    cipSecTunHistRemoteAddr => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.6',
+    cipSecTunHistKeyType => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.7',
+    cipSecTunHistKeyTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::KeyType',
+    cipSecTunHistEncapMode => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.8',
+    cipSecTunHistEncapModeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncapMode',
+    cipSecTunHistLifeSize => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.9',
+    cipSecTunHistLifeTime => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.10',
+    cipSecTunHistStartTime => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.11',
+    cipSecTunHistActiveTime => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.12',
+    cipSecTunHistTotalRefreshes => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.13',
+    cipSecTunHistTotalSas => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.14',
+    cipSecTunHistInSaDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.15',
+    cipSecTunHistInSaDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cipSecTunHistInSaEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.16',
+    cipSecTunHistInSaEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cipSecTunHistInSaAhAuthAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.17',
+    cipSecTunHistInSaAhAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunHistInSaEspAuthAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.18',
+    cipSecTunHistInSaEspAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunHistInSaDecompAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.19',
+    cipSecTunHistInSaDecompAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::CompAlgo',
+    cipSecTunHistOutSaDiffHellmanGrp => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.20',
+    cipSecTunHistOutSaDiffHellmanGrpDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::DiffHellmanGrp',
+    cipSecTunHistOutSaEncryptAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.21',
+    cipSecTunHistOutSaEncryptAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EncryptAlgo',
+    cipSecTunHistOutSaAhAuthAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.22',
+    cipSecTunHistOutSaAhAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunHistOutSaEspAuthAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.23',
+    cipSecTunHistOutSaEspAuthAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::AuthAlgo',
+    cipSecTunHistOutSaCompAlgo => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.24',
+    cipSecTunHistOutSaCompAlgoDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::CompAlgo',
+    cipSecTunHistInOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.25',
+    cipSecTunHistHcInOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.26',
+    cipSecTunHistInOctWraps => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.27',
+    cipSecTunHistInDecompOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.28',
+    cipSecTunHistHcInDecompOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.29',
+    cipSecTunHistInDecompOctWraps => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.30',
+    cipSecTunHistInPkts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.31',
+    cipSecTunHistInDropPkts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.32',
+    cipSecTunHistInReplayDropPkts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.33',
+    cipSecTunHistInAuths => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.34',
+    cipSecTunHistInAuthFails => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.35',
+    cipSecTunHistInDecrypts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.36',
+    cipSecTunHistInDecryptFails => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.37',
+    cipSecTunHistOutOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.38',
+    cipSecTunHistHcOutOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.39',
+    cipSecTunHistOutOctWraps => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.40',
+    cipSecTunHistOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.41',
+    cipSecTunHistHcOutUncompOctets => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.42',
+    cipSecTunHistOutUncompOctWraps => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.43',
+    cipSecTunHistOutPkts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.44',
+    cipSecTunHistOutDropPkts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.45',
+    cipSecTunHistOutAuths => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.46',
+    cipSecTunHistOutAuthFails => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.47',
+    cipSecTunHistOutEncrypts => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.48',
+    cipSecTunHistOutEncryptFails => '1.3.6.1.4.1.9.9.171.1.4.3.1.1.49',
+    cipSecEndPtHistTable => '1.3.6.1.4.1.9.9.171.1.4.3.2',
+    cipSecEndPtHistEntry => '1.3.6.1.4.1.9.9.171.1.4.3.2.1',
+    cipSecEndPtHistIndex => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.1',
+    cipSecEndPtHistTunIndex => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.2',
+    cipSecEndPtHistActiveIndex => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.3',
+    cipSecEndPtHistLocalName => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.4',
+    cipSecEndPtHistLocalType => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.5',
+    cipSecEndPtHistLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EndPtType',
+    cipSecEndPtHistLocalAddr1 => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.6',
+    cipSecEndPtHistLocalAddr2 => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.7',
+    cipSecEndPtHistLocalProtocol => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.8',
+    cipSecEndPtHistLocalPort => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.9',
+    cipSecEndPtHistRemoteName => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.10',
+    cipSecEndPtHistRemoteType => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.11',
+    cipSecEndPtHistRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::EndPtType',
+    cipSecEndPtHistRemoteAddr1 => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.12',
+    cipSecEndPtHistRemoteAddr2 => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.13',
+    cipSecEndPtHistRemoteProtocol => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.14',
+    cipSecEndPtHistRemotePort => '1.3.6.1.4.1.9.9.171.1.4.3.2.1.15',
+    cipSecFailures => '1.3.6.1.4.1.9.9.171.1.5',
+    cipSecFailGlobal => '1.3.6.1.4.1.9.9.171.1.5.1',
+    cipSecFailGlobalCntl => '1.3.6.1.4.1.9.9.171.1.5.1.1',
+    cipSecFailTableSize => '1.3.6.1.4.1.9.9.171.1.5.1.1.1',
+    cipSecFailPhaseOne => '1.3.6.1.4.1.9.9.171.1.5.2',
+    cikeFailTable => '1.3.6.1.4.1.9.9.171.1.5.2.1',
+    cikeFailEntry => '1.3.6.1.4.1.9.9.171.1.5.2.1.1',
+    cikeFailIndex => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.1',
+    cikeFailReason => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.2',
+    cikeFailReasonDefinition => {
+      '1' => 'other',
+      '2' => 'peerDelRequest',
+      '3' => 'peerLost',
+      '4' => 'localFailure',
+      '5' => 'authFailure',
+      '6' => 'hashValidation',
+      '7' => 'encryptFailure',
+      '8' => 'internalError',
+      '9' => 'sysCapExceeded',
+      '10' => 'proposalFailure',
+      '11' => 'peerCertUnavailable',
+      '12' => 'peerCertNotValid',
+      '13' => 'localCertExpired',
+      '14' => 'crlFailure',
+      '15' => 'peerEncodingError',
+      '16' => 'nonExistentSa',
+      '17' => 'operRequest',
+    },
+    cikeFailTime => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.3',
+    cikeFailLocalType => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.4',
+    cikeFailLocalTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeFailLocalValue => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.5',
+    cikeFailRemoteType => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.6',
+    cikeFailRemoteTypeDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::IkePeerType',
+    cikeFailRemoteValue => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.7',
+    cikeFailLocalAddr => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.8',
+    cikeFailRemoteAddr => '1.3.6.1.4.1.9.9.171.1.5.2.1.1.9',
+    cipSecFailPhaseTwo => '1.3.6.1.4.1.9.9.171.1.5.3',
+    cipSecFailTable => '1.3.6.1.4.1.9.9.171.1.5.3.1',
+    cipSecFailEntry => '1.3.6.1.4.1.9.9.171.1.5.3.1.1',
+    cipSecFailIndex => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.1',
+    cipSecFailReason => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.2',
+    cipSecFailReasonDefinition => {
+      '1' => 'other',
+      '2' => 'internalError',
+      '3' => 'peerEncodingError',
+      '4' => 'proposalFailure',
+      '5' => 'protocolUseFail',
+      '6' => 'nonExistentSa',
+      '7' => 'decryptFailure',
+      '8' => 'encryptFailure',
+      '9' => 'inAuthFailure',
+      '10' => 'outAuthFailure',
+      '11' => 'compression',
+      '12' => 'sysCapExceeded',
+      '13' => 'peerDelRequest',
+      '14' => 'peerLost',
+      '15' => 'seqNumRollOver',
+      '16' => 'operRequest',
+    },
+    cipSecFailTime => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.3',
+    cipSecFailTunnelIndex => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.4',
+    cipSecFailSaSpi => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.5',
+    cipSecFailPktSrcAddr => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.6',
+    cipSecFailPktDstAddr => '1.3.6.1.4.1.9.9.171.1.5.3.1.1.7',
+    cipSecTrapCntl => '1.3.6.1.4.1.9.9.171.1.6',
+    cipSecTrapCntlIkeTunnelStart => '1.3.6.1.4.1.9.9.171.1.6.1',
+    cipSecTrapCntlIkeTunnelStartDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIkeTunnelStop => '1.3.6.1.4.1.9.9.171.1.6.2',
+    cipSecTrapCntlIkeTunnelStopDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIkeSysFailure => '1.3.6.1.4.1.9.9.171.1.6.3',
+    cipSecTrapCntlIkeSysFailureDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIkeCertCrlFailure => '1.3.6.1.4.1.9.9.171.1.6.4',
+    cipSecTrapCntlIkeCertCrlFailureDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIkeProtocolFail => '1.3.6.1.4.1.9.9.171.1.6.5',
+    cipSecTrapCntlIkeProtocolFailDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIkeNoSa => '1.3.6.1.4.1.9.9.171.1.6.6',
+    cipSecTrapCntlIkeNoSaDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecTunnelStart => '1.3.6.1.4.1.9.9.171.1.6.7',
+    cipSecTrapCntlIpSecTunnelStartDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecTunnelStop => '1.3.6.1.4.1.9.9.171.1.6.8',
+    cipSecTrapCntlIpSecTunnelStopDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecSysFailure => '1.3.6.1.4.1.9.9.171.1.6.9',
+    cipSecTrapCntlIpSecSysFailureDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecSetUpFailure => '1.3.6.1.4.1.9.9.171.1.6.10',
+    cipSecTrapCntlIpSecSetUpFailureDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecEarlyTunTerm => '1.3.6.1.4.1.9.9.171.1.6.11',
+    cipSecTrapCntlIpSecEarlyTunTermDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecProtocolFail => '1.3.6.1.4.1.9.9.171.1.6.12',
+    cipSecTrapCntlIpSecProtocolFailDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecTrapCntlIpSecNoSa => '1.3.6.1.4.1.9.9.171.1.6.13',
+    cipSecTrapCntlIpSecNoSaDefinition => 'CISCO-IPSEC-FLOW-MONITOR-MIB::TrapStatus',
+    cipSecMIBNotificationPrefix => '1.3.6.1.4.1.9.9.171.2',
+    cipSecMIBNotifications => '1.3.6.1.4.1.9.9.171.2.0.1.2.3.4.5.6.7.8.9.10.11.12.13',
+    cipSecMIBConformance => '1.3.6.1.4.1.9.9.171.3',
+    cipSecMIBGroups => '1.3.6.1.4.1.9.9.171.3.1',
+    cipSecMIBCompliances => '1.3.6.1.4.1.9.9.171.3.1.8',
+    hardware => '1.3.6.1.4.1.3764.1.1.200',
+  },
+  'CISCO-ETHERNET-FABRIC-EXTENDER-MIB' => {
+    enterprises => '1.3.6.1.4.1',
+    cisco => '1.3.6.1.4.1.9',
+    ciscoEthernetFabricExtenderMIB => '1.3.6.1.4.1.9.9.691',
+    ciscoEthernetFabricExtenderMIBNotifs => '1.3.6.1.4.1.9.9.691.0',
+    ciscoEthernetFabricExtenderObjects => '1.3.6.1.4.1.9.9.691.1',
+    cefexConfig => '1.3.6.1.4.1.9.9.691.1.1',
+    cefexConfigDefinition => {
+      '1' => 'static',
+    },
+    cefexBindingTable => '1.3.6.1.4.1.9.9.691.1.1.1',
+    cefexBindingEntry => '1.3.6.1.4.1.9.9.691.1.1.1.1',
+    cefexBindingInterfaceOnCoreSwitch => '1.3.6.1.4.1.9.9.691.1.1.1.1.1',
+    cefexBindingExtenderIndex => '1.3.6.1.4.1.9.9.691.1.1.1.1.2',
+    cefexBindingCreationTime => '1.3.6.1.4.1.9.9.691.1.1.1.1.3',
+    cefexBindingRowStatus => '1.3.6.1.4.1.9.9.691.1.1.1.1.4',
+    cefexBindingRowStatusDefinition => 'SNMPv2-TC-v1::RowStatus',
+    cefexConfigTable => '1.3.6.1.4.1.9.9.691.1.1.2',
+    cefexConfigEntry => '1.3.6.1.4.1.9.9.691.1.1.2.1',
+    cefexConfigExtenderName => '1.3.6.1.4.1.9.9.691.1.1.2.1.1',
+    cefexConfigSerialNumCheck => '1.3.6.1.4.1.9.9.691.1.1.2.1.2',
+    cefexConfigSerialNum => '1.3.6.1.4.1.9.9.691.1.1.2.1.3',
+    cefexConfigPinningFailOverMode => '1.3.6.1.4.1.9.9.691.1.1.2.1.4',
+    cefexConfigPinningFailOverModeDefinition => 'CISCO-ETHERNET-FABRIC-EXTENDER-MIB::CiscoPortPinningMode',
+    cefexConfigPinningMaxLinks => '1.3.6.1.4.1.9.9.691.1.1.2.1.5',
+    cefexConfigCreationTime => '1.3.6.1.4.1.9.9.691.1.1.2.1.6',
+    cefexConfigRowStatus => '1.3.6.1.4.1.9.9.691.1.1.2.1.7',
+    cefexConfigRowStatusDefinition => 'SNMPv2-TC-v1::RowStatus',
+    ciscoEthernetFabricExtenderMIBConformance => '1.3.6.1.4.1.9.9.691.2',
+    cEthernetFabricExtenderMIBCompliances => '1.3.6.1.4.1.9.9.691.2.1',
+    cEthernetFabricExtenderMIBGroups => '1.3.6.1.4.1.9.9.691.2.1.1.1',
+    hardware => '1.3.6.1.4.1.3764.1.1.200',
+  },
   'AIRESPACE-SWITCHING-MIB' => {
       bsnSwitching => '1.3.6.1.4.1.14179.1',
       agentInfoGroup => '1.3.6.1.4.1.14179.1.1',
@@ -4578,6 +5180,61 @@ $GLPlugin::SNMP::mibs_and_oids = {
       },
       deviceUsageTime => '1.3.6.1.4.1.3417.2.4.1.1.1.7',
   },
+  'ENTITY-SENSOR-MIB' => {
+      entitySensorObjects => '1.3.6.1.2.1.99.1',
+      entitySensorConformance => '1.3.6.1.2.1.99.3',
+      entitySensorObjects => '1.3.6.1.2.1.99.1',
+      entPhySensorTable => '1.3.6.1.2.1.99.1.1',
+      entPhySensorEntry => '1.3.6.1.2.1.99.1.1.1',
+      entPhySensorType => '1.3.6.1.2.1.99.1.1.1.1',
+      entPhySensorTypeDefinition => {
+        1 => 'other',
+        2 => 'unknown',
+        3 => 'voltsAC',
+        4 => 'voltsDC',
+        5 => 'amperes',
+        6 => 'watts',
+        7 => 'hertz',
+        8 => 'celsius',
+        9 => 'percentRH',
+        10 => 'rpm',
+        11 => 'cmm',
+        12 => 'truthvalue',
+      },
+      entPhySensorScale => '1.3.6.1.2.1.99.1.1.1.2',
+      entPhySensorScaleDefinition => {
+        1 => 'yocto',
+        2 => 'zepto',
+        3 => 'atto',
+        4 => 'femto',
+        5 => 'pico',
+        6 => 'nano',
+        7 => 'micro',
+        8 => 'milli',
+        9 => 'units',
+        10 => 'kilo',
+        11 => 'mega',
+        12 => 'giga',
+        13 => 'tera',
+        14 => 'exa',
+        15 => 'peta',
+        16 => 'zetta',
+        17 => 'yotta',
+      },
+      entPhySensorPrecision => '1.3.6.1.2.1.99.1.1.1.3',
+      entPhySensorValue => '1.3.6.1.2.1.99.1.1.1.4',
+      entPhySensorOperStatus => '1.3.6.1.2.1.99.1.1.1.5',
+      entPhySensorOperStatusDefinition => {
+        1 => 'ok',
+        2 => 'unavailable',
+        3 => 'nonoperational',
+      },
+      entPhySensorUnitsDisplay => '1.3.6.1.2.1.99.1.1.1.6',
+      entPhySensorValueTimeStamp => '1.3.6.1.2.1.99.1.1.1.7',
+      entPhySensorValueUpdateRate => '1.3.6.1.2.1.99.1.1.1.8',
+      entitySensorCompliances => '1.3.6.1.2.1.99.3.1',
+      entitySensorGroups => '1.3.6.1.2.1.99.3.2',
+  },
   'BLUECOAT-SG-PROXY-MIB' => {
       blueCoatMgmt => '1.3.6.1.4.1.3417.2',
       bluecoatSGProxyMIB => '1.3.6.1.4.1.3417.2.11',
@@ -5677,6 +6334,68 @@ $GLPlugin::SNMP::mibs_and_oids = {
     SecurityViolation => '1.3.6.1.4.1.244.1.11.4.4',
     Generic => '1.3.6.1.4.1.244.1.11.4.5',
   },
+  'xPAN-PRODUCTS-MIB' => {
+    "x"=>1.3.6.1.4.1.25461.2.3.9
+  },
+  'PAN-COMMON-MIB' => {
+    panCommonConfMib => '1.3.6.1.4.1.25461.2.1.1',
+    panCommonObjs => '1.3.6.1.4.1.25461.2.1.2',
+    panCommonEvents => '1.3.6.1.4.1.25461.2.1.3',
+    panSys => '1.3.6.1.4.1.25461.2.1.2.1',
+    panChassis => '1.3.6.1.4.1.25461.2.1.2.2',
+    panSession => '1.3.6.1.4.1.25461.2.1.2.3',
+    panMgmt => '1.3.6.1.4.1.25461.2.1.2.4',
+    panGlobalProtect => '1.3.6.1.4.1.25461.2.1.2.5',
+    panSys => '1.3.6.1.4.1.25461.2.1.2.1',
+    panSysSwVersion => '1.3.6.1.4.1.25461.2.1.2.1.1.0',
+    panSysHwVersion => '1.3.6.1.4.1.25461.2.1.2.1.2.0',
+    panSysSerialNumber => '1.3.6.1.4.1.25461.2.1.2.1.3.0',
+    panSysTimeZoneOffset => '1.3.6.1.4.1.25461.2.1.2.1.4.0',
+    panSysDaylightSaving => '1.3.6.1.4.1.25461.2.1.2.1.5.0',
+    panSysVpnClientVersion => '1.3.6.1.4.1.25461.2.1.2.1.6.0',
+    panSysAppVersion => '1.3.6.1.4.1.25461.2.1.2.1.7.0',
+    panSysAvVersion => '1.3.6.1.4.1.25461.2.1.2.1.8.0',
+    panSysThreatVersion => '1.3.6.1.4.1.25461.2.1.2.1.9.0',
+    panSysUrlFilteringVersion => '1.3.6.1.4.1.25461.2.1.2.1.10.0',
+    panSysHAState => '1.3.6.1.4.1.25461.2.1.2.1.11.0',
+    panSysHAPeerState => '1.3.6.1.4.1.25461.2.1.2.1.12.0',
+    panSysHAMode => '1.3.6.1.4.1.25461.2.1.2.1.13.0',
+    panSysUrlFilteringDatabase => '1.3.6.1.4.1.25461.2.1.2.1.14.0',
+    panSysGlobalProtectClientVersion => '1.3.6.1.4.1.25461.2.1.2.1.15.0',
+    panSysOpswatDatafileVersion => '1.3.6.1.4.1.25461.2.1.2.1.16.0',
+    panChassis => '1.3.6.1.4.1.25461.2.1.2.2',
+    panChassisType => '1.3.6.1.4.1.25461.2.1.2.2.1.0',
+    panMSeriesMode => '1.3.6.1.4.1.25461.2.1.2.2.2.0',
+    panSession => '1.3.6.1.4.1.25461.2.1.2.3',
+    panSessionUtilization => '1.3.6.1.4.1.25461.2.1.2.3.1.0',
+    panSessionMax => '1.3.6.1.4.1.25461.2.1.2.3.2.0',
+    panSessionActive => '1.3.6.1.4.1.25461.2.1.2.3.3.0',
+    panSessionActiveTcp => '1.3.6.1.4.1.25461.2.1.2.3.4.0',
+    panSessionActiveUdp => '1.3.6.1.4.1.25461.2.1.2.3.5.0',
+    panSessionActiveICMP => '1.3.6.1.4.1.25461.2.1.2.3.6.0',
+    panSessionActiveSslProxy => '1.3.6.1.4.1.25461.2.1.2.3.7.0',
+    panSessionSslProxyUtilization => '1.3.6.1.4.1.25461.2.1.2.3.8.0',
+    panVsysTable => '1.3.6.1.4.1.25461.2.1.2.3.9',
+    panVsysEntry => '1.3.6.1.4.1.25461.2.1.2.3.9.1',
+    panVsysId => '1.3.6.1.4.1.25461.2.1.2.3.9.1.1',
+    panVsysName => '1.3.6.1.4.1.25461.2.1.2.3.9.1.2',
+    panVsysSessionUtilizationPct => '1.3.6.1.4.1.25461.2.1.2.3.9.1.3',
+    panVsysActiveSessions => '1.3.6.1.4.1.25461.2.1.2.3.9.1.4',
+    panVsysMaxSessions => '1.3.6.1.4.1.25461.2.1.2.3.9.1.5',
+    panMgmt => '1.3.6.1.4.1.25461.2.1.2.4',
+    panMgmtPanoramaConnected => '1.3.6.1.4.1.25461.2.1.2.4.1.0',
+    panMgmtPanorama2Connected => '1.3.6.1.4.1.25461.2.1.2.4.2.0',
+    panGPGatewayUtilization => '1.3.6.1.4.1.25461.2.1.2.5.1',
+    panGPGatewayUtilization => '1.3.6.1.4.1.25461.2.1.2.5.1',
+    panGPGWUtilizationPct => '1.3.6.1.4.1.25461.2.1.2.5.1.1.0',
+    panGPGWUtilizationMaxTunnels => '1.3.6.1.4.1.25461.2.1.2.5.1.2.0',
+    panGPGWUtilizationActiveTunnels => '1.3.6.1.4.1.25461.2.1.2.5.1.3.0',
+    panCommonEventObjs => '1.3.6.1.4.1.25461.2.1.3.1',
+    panCommonEventEvents => '1.3.6.1.4.1.25461.2.1.3.2',
+    panCommonEventEventsV2 => '1.3.6.1.4.1.25461.2.1.3.2.0',
+    panCommonEventObjs => '1.3.6.1.4.1.25461.2.1.3.1',
+    panCommonEventDescr => '1.3.6.1.4.1.25461.2.1.3.1.1.0',
+  },
 };
 
 $GLPlugin::SNMP::definitions = {
@@ -6343,5 +7062,144 @@ $GLPlugin::SNMP::definitions = {
       4 => 'actionInProgress',
     },
   },
+  'CISCO-IPSEC-FLOW-MONITOR-MIB' => {
+    AuthAlgo => {
+      '1' => 'none',
+      '2' => 'hmacMd5',
+      '3' => 'hmacSha',
+    },
+    CompAlgo => {
+      '1' => 'none',
+      '2' => 'ldf',
+    },
+    DiffHellmanGrp => {
+      '1' => 'none',
+      '2' => 'dhGroup1',
+      '3' => 'dhGroup2',
+    },
+    EncapMode => {
+      '1' => 'tunnel',
+      '2' => 'transport',
+    },
+    EncryptAlgo => {
+      '1' => 'none',
+      '2' => 'des',
+      '3' => 'des3',
+    },
+    EndPtType => {
+      '1' => 'singleIpAddr',
+      '2' => 'ipAddrRange',
+      '3' => 'ipSubnet',
+    },
+    IkeAuthMethod => {
+      '1' => 'none',
+      '2' => 'preSharedKey',
+      '3' => 'rsaSig',
+      '4' => 'rsaEncrypt',
+      '5' => 'revPublicKey',
+    },
+    IkeHashAlgo => {
+      '1' => 'none',
+      '2' => 'md5',
+      '3' => 'sha',
+    },
+    IkeNegoMode => {
+      '1' => 'main',
+      '2' => 'aggressive',
+    },
+    IkePeerType => {
+      '1' => 'ipAddrPeer',
+      '2' => 'namePeer',
+    },
+    KeyType => {
+      '1' => 'ike',
+      '2' => 'manual',
+    },
+    TrapStatus => {
+      '1' => 'enabled',
+      '2' => 'disabled',
+    },
+    TunnelStatus => {
+      '1' => 'active',
+      '2' => 'destroy',
+    },
+    cikeFailReason => {
+      '1' => 'other',
+      '2' => 'peerDelRequest',
+      '3' => 'peerLost',
+      '4' => 'localFailure',
+      '5' => 'authFailure',
+      '6' => 'hashValidation',
+      '7' => 'encryptFailure',
+      '8' => 'internalError',
+      '9' => 'sysCapExceeded',
+      '10' => 'proposalFailure',
+      '11' => 'peerCertUnavailable',
+      '12' => 'peerCertNotValid',
+      '13' => 'localCertExpired',
+      '14' => 'crlFailure',
+      '15' => 'peerEncodingError',
+      '16' => 'nonExistentSa',
+      '17' => 'operRequest',
+    },
+    cikeTunHistTermReason => {
+      '1' => 'other',
+      '2' => 'normal',
+      '3' => 'operRequest',
+      '4' => 'peerDelRequest',
+      '5' => 'peerLost',
+      '6' => 'localFailure',
+      '7' => 'checkPointReg',
+    },
+    cipSecFailReason => {
+      '1' => 'other',
+      '2' => 'internalError',
+      '3' => 'peerEncodingError',
+      '4' => 'proposalFailure',
+      '5' => 'protocolUseFail',
+      '6' => 'nonExistentSa',
+      '7' => 'decryptFailure',
+      '8' => 'encryptFailure',
+      '9' => 'inAuthFailure',
+      '10' => 'outAuthFailure',
+      '11' => 'compression',
+      '12' => 'sysCapExceeded',
+      '13' => 'peerDelRequest',
+      '14' => 'peerLost',
+      '15' => 'seqNumRollOver',
+      '16' => 'operRequest',
+    },
+    cipSecHistCheckPoint => {
+      '1' => 'ready',
+      '2' => 'checkPoint',
+    },
+    cipSecSpiDirection => {
+      '1' => 'in',
+      '2' => 'out',
+    },
+    cipSecSpiProtocol => {
+      '1' => 'ah',
+      '2' => 'esp',
+      '3' => 'ipcomp',
+    },
+    cipSecSpiStatus => {
+      '1' => 'active',
+      '2' => 'expiring',
+    },
+    cipSecTunHistTermReason => {
+      '1' => 'other',
+      '2' => 'normal',
+      '3' => 'operRequest',
+      '4' => 'peerDelRequest',
+      '5' => 'peerLost',
+      '6' => 'seqNumRollOver',
+      '7' => 'checkPointReq',
+    },
+  },
+  'CISCO-ETHERNET-FABRIC-EXTENDER-MIB' => {
+    CiscoPortPinningMode => {
+      '1' => 'static',
+    },
+  },
 };
 
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Nortel.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Nortel.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Nortel.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Nortel.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto.pm
new file mode 100644
index 0000000..a4fa46e
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto.pm
@@ -0,0 +1,26 @@
+package Classes::PaloAlto;
+our @ISA = qw(Classes::Device);
+use strict;
+
+sub init {
+  my $self = shift;
+  if ($self->mode =~ /device::hardware::health/) {
+    $self->analyze_and_check_environmental_subsystem("Classes::ENTITYSENSORMIB::Component::EnvironmentalSubsystem");
+    $self->analyze_and_check_environmental_subsystem("Classes::HOSTRESOURCESMIB::Component::EnvironmentalSubsystem");
+    # entity-state-mib gibts u.u. auch
+    # The entStateTable will have entries for Line Cards, Fan Trays and Power supplies. Since these entities only apply to chassis systems, only PA-7000 series devices will support this MIB.
+    # gibts aber erst, wenn einer die entwicklung zahlt. bis dahin ist es
+    # mir scheissegal, wenn euch die firewalls abkacken, ihr freibiervisagen
+  } elsif ($self->mode =~ /device::hardware::load/) {
+    # CPU util on management plane
+    # Utilization of CPUs on dataplane that are used for system functions
+    $self->analyze_and_check_cpu_subsystem("Classes::HOSTRESOURCESMIB::Component::CpuSubsystem");
+  } elsif ($self->mode =~ /device::hardware::memory/) {
+    $self->analyze_and_check_mem_subsystem("Classes::HOSTRESOURCESMIB::Component::MemSubsystem");
+  } elsif ($self->mode =~ /device::ha::/) {
+    $self->analyze_and_check_ha_subsystem("Classes::PaloAlto::Component::HaSubsystem");
+  } else {
+    $self->no_such_mode();
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/CpuSubsystem.pm
new file mode 100644
index 0000000..41b151d
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/CpuSubsystem.pm
@@ -0,0 +1,40 @@
+package Classes::PaloALto::Component::CpuSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_objects('NETSCREEN-RESOURCE-MIB', (qw(
+      nsResCpuAvg)));
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('checking cpus');
+  $self->add_info(sprintf 'cpu usage is %.2f%%', $self->{nsResCpuAvg});
+  $self->set_thresholds(warning => 50, critical => 90);
+  $self->add_message($self->check_thresholds($self->{nsResCpuAvg}));
+  $self->add_perfdata(
+      label => 'cpu_usage',
+      value => $self->{nsResCpuAvg},
+      uom => '%',
+  );
+}
+
+
+package Classes::PaloALto::Component::CpuSubsystem::Load;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf '%s is %.2f', lc $self->{laNames}, $self->{laLoadFloat});
+  $self->set_thresholds(warning => $self->{laConfig},
+      critical => $self->{laConfig});
+  $self->add_message($self->check_thresholds($self->{laLoadFloat}));
+  $self->add_perfdata(
+      label => lc $self->{laNames},
+      value => $self->{laLoadFloat},
+  );
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/EnvironmentalSubsystem.pm
new file mode 100644
index 0000000..ac2f0ab
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/EnvironmentalSubsystem.pm
@@ -0,0 +1,92 @@
+package Classes::PaloAlto::Component::EnvironmentalSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+#######################
+$self->no_such_mode();
+die;
+## entitymib, pan enhancement
+  $self->get_snmp_objects("NETSCREEN-CHASSIS-MIB", (qw(
+      sysBatteryStatus)));
+  $self->get_snmp_tables("NETSCREEN-CHASSIS-MIB", [
+      ['fans', 'nsFanTable', 'Classes::PaloAlto::Component::EnvironmentalSubsystem::Fan'],
+      ['power', 'nsPowerTable', 'Classes::PaloAlto::Component::EnvironmentalSubsystem::Power'],
+      ['slots', 'nsSlotTable', 'Classes::PaloAlto::Component::EnvironmentalSubsystem::Slot'],
+      ['temperatures', 'nsTemperatureTable', 'Classes::PaloAlto::Component::EnvironmentalSubsystem::Temperature'],
+  ]);
+}
+
+sub check {
+  my $self = shift;
+  foreach (@{$self->{fans}}, @{$self->{power}}, @{$self->{slots}}, @{$self->{temperatures}}) {
+    $_->check();
+  }
+}
+
+
+package Classes::PaloAlto::Component::EnvironmentalSubsystem::Fan;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf "fan %s (%s) is %s",
+      $self->{nsFanId}, $self->{nsFanDesc}, $self->{nsFanStatus});
+  if ($self->{nsFanStatus} eq "notInstalled") {
+  } elsif ($self->{nsFanStatus} eq "good") {
+    $self->add_ok();
+  } elsif ($self->{nsFanStatus} eq "fail") {
+    $self->add_warning();
+  }
+}
+
+
+package Classes::PaloAlto::Component::EnvironmentalSubsystem::Power;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf "power supply %s (%s) is %s",
+      $self->{nsPowerId}, $self->{nsPowerDesc}, $self->{nsPowerStatus});
+  if ($self->{nsPowerStatus} eq "good") {
+    $self->add_ok();
+  } elsif ($self->{nsPowerStatus} eq "fail") {
+    $self->add_warning();
+  }
+}
+
+
+package Classes::PaloAlto::Component::EnvironmentalSubsystem::Slot;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf "%s slot %s (%s) is %s",
+      $self->{nsSlotType}, $self->{nsSlotId}, $self->{nsSlotSN}, $self->{nsSlotStatus});
+  if ($self->{nsSlotStatus} eq "good") {
+    $self->add_ok();
+  } elsif ($self->{nsSlotStatus} eq "fail") {
+    $self->add_warning();
+  }
+}
+
+
+package Classes::PaloAlto::Component::EnvironmentalSubsystem::Temperature;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  $self->add_info(sprintf "temperature %s is %sC",
+      $self->{nsTemperatureId}, $self->{nsTemperatureDesc}, $self->{nsTemperatureCur});
+  $self->add_ok();
+  $self->add_perfdata(
+      label => 'temp_'.$self->{nsTemperatureId},
+      value => $self->{nsTemperatureCur},
+  );
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/HaSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/HaSubsystem.pm
new file mode 100644
index 0000000..88ed681
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/HaSubsystem.pm
@@ -0,0 +1,42 @@
+package Classes::PaloAlto::Component::HaSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
+
+sub init {
+  my $self = shift;
+  if ($self->mode =~ /device::ha::role/) {
+  $self->get_snmp_objects('PAN-COMMON-MIB', (qw(
+      panSysHAMode panSysHAState panSysHAPeerState)));
+    if (! $self->opts->role()) {
+      $self->opts->override_opt('role', 'active');
+    }
+  }
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('checking ha');
+  $self->add_info(sprintf 'ha mode is %s, state is %s, peer state is %s', 
+      $self->{panSysHAMode},
+      $self->{panSysHAState},
+      $self->{panSysHAPeerState},
+  );
+  if ($self->{panSysHAMode} eq 'disabled') {
+    $self->add_message(
+        defined $self->opts->mitigation() ? $self->opts->mitigation() : WARNING,
+        'ha was not started');
+  } else {
+    if ($self->{panSysHAState} ne $self->opts->role()) {
+      $self->add_message(
+          defined $self->opts->mitigation() ? $self->opts->mitigation() : WARNING,
+          $self->{info});
+      $self->add_message(
+          defined $self->opts->mitigation() ? $self->opts->mitigation() : WARNING,
+          sprintf "expected role %s", $self->opts->role())
+    } else {
+      $self->add_ok();
+    }
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/MemSubsystem.pm
new file mode 100644
index 0000000..743c609
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/PaloAlto/Component/MemSubsystem.pm
@@ -0,0 +1,30 @@
+package Classes::PaloALto::Component::MemSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_objects('NETSCREEN-RESOURCE-MIB', (qw(
+      nsResMemAllocate nsResMemLeft nsResMemFrag)));
+  my $mem_total = $self->{nsResMemAllocate} + $self->{nsResMemLeft};
+  $self->{mem_usage} = $self->{nsResMemAllocate} / $mem_total * 100;
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('checking memory');
+  if (defined $self->{mem_usage}) {
+    $self->add_info(sprintf 'memory usage is %.2f%%', $self->{mem_usage});
+    $self->set_thresholds(warning => 80,
+        critical => 90);
+    $self->add_message($self->check_thresholds($self->{mem_usage}));
+    $self->add_perfdata(
+        label => 'memory_usage',
+        value => $self->{mem_usage},
+        uom => '%',
+    );
+  } else {
+    $self->add_unknown('cannot aquire memory usage');
+  }
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/ConnectionSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/DiskSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/EnvironmentalSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/SecuritySubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
new file mode 100644
index 0000000..2923a52
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SGOS/Component/SensorSubsystem.pm
@@ -0,0 +1,102 @@
+package Classes::SGOS::Component::SensorSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->get_snmp_tables('SENSOR-MIB', [
+      ['sensors', 'deviceSensorValueTable', 'Classes::SGOS::Component::SensorSubsystem::Sensor'],
+  ]);
+}
+
+sub check {
+  my $self = shift;
+  my $psus = {};
+  foreach my $sensor (@{$self->{sensors}}) {
+    if ($sensor->{deviceSensorName} =~ /^PSU\s+(\d+)\s+(.*)/) {
+      $psus->{$1}->{sensors}->{$2}->{code} = $sensor->{deviceSensorCode};
+      $psus->{$1}->{sensors}->{$2}->{status} = $sensor->{deviceSensorStatus};
+    }
+  }
+  foreach my $psu (keys %{$psus}) {
+    if ($psus->{$psu}->{sensors}->{'ambient temperature'}->{code} &&
+        $psus->{$psu}->{sensors}->{'ambient temperature'}->{code} eq 'unknown' &&
+        $psus->{$psu}->{sensors}->{'ambient temperature'}->{status} &&
+        $psus->{$psu}->{sensors}->{'ambient temperature'}->{status} eq 'nonoperational' &&
+        $psus->{$psu}->{sensors}->{'core temperature'}->{code} &&
+        $psus->{$psu}->{sensors}->{'core temperature'}->{code} eq 'unknown' &&
+        $psus->{$psu}->{sensors}->{'core temperature'}->{status} &&
+        $psus->{$psu}->{sensors}->{'core temperature'}->{status} eq 'nonoperational' &&
+        $psus->{$psu}->{sensors}->{'status'}->{code} &&
+        $psus->{$psu}->{sensors}->{'status'}->{code} eq 'no-power' &&
+        $psus->{$psu}->{sensors}->{'status'}->{status} &&
+        $psus->{$psu}->{sensors}->{'status'}->{status} eq 'ok') {
+      $psus->{$psu}->{'exists'} = 0;
+      $self->add_info(sprintf 'psu %d probably doesn\'t exist', $psu);
+    } else {
+      $psus->{$psu}->{'exists'} = 1;
+    }
+  }
+  foreach my $sensor (@{$self->{sensors}}) {
+    if ($sensor->{deviceSensorName} =~ /^PSU\s+(\d+)\s+(.*)/) {
+      if (! $psus->{$1}->{exists}) {
+        $sensor->{deviceSensorCode} = sprintf 'not-installed (real code: %s)',
+            $sensor->{deviceSensorCode};
+        $sensor->blacklist();
+      }
+    }
+  }
+  foreach my $sensor (@{$self->{sensors}}) {
+    $sensor->check();
+  }
+}
+
+
+package Classes::SGOS::Component::SensorSubsystem::Sensor;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+sub check {
+  my $self = shift;
+  if ($self->{deviceSensorScale}) {
+    $self->{deviceSensorValue} *= 10 ** $self->{deviceSensorScale};
+  }
+  $self->add_info(sprintf 'sensor %s (%s %s) is %s',
+      $self->{deviceSensorName},
+      $self->{deviceSensorValue},
+      $self->{deviceSensorUnits},
+      $self->{deviceSensorCode});
+  if ($self->{deviceSensorCode} =~ /^not-installed/) {
+  } elsif ($self->{deviceSensorCode} eq "unknown") {
+  } else {
+    if ($self->{deviceSensorCode} ne "ok") {
+      if ($self->{deviceSensorCode} =~ /warning/) {
+        $self->add_warning();
+      } else {
+        $self->add_critical();
+      }
+    }
+    $self->add_perfdata(
+        label => sprintf('sensor_%s', $self->{deviceSensorName}),
+        value => $self->{deviceSensorValue},
+    ) if $self->{deviceSensorUnits} =~ /^(volts|celsius|rpm)/;
+  }
+}
+
+__END__
+PSU2 angeblich ok
+sensor PSU 1 status (8 specialEnum) is ok
+sensor PSU 2 status (32 specialEnum) is unknown
+sensor PSU 1 core temperature (38 celsius) is ok
+sensor PSU 1 ambient temperature (23 celsius) is ok
+sensor PSU 2 core temperature (48 celsius) is unknown
+sensor PSU 2 ambient temperature (25 celsius) is ok
+
+PSU2 nicht verbaut
+sensor PSU 1 status (8 specialEnum) is ok
+sensor PSU 2 status (1 specialEnum) is no-power
+sensor PSU 1 core temperature (41 celsius) is ok
+sensor PSU 1 ambient temperature (25 celsius) is ok
+sensor PSU 2 core temperature (48 celsius) is unknown
+sensor PSU 2 ambient temperature (48 celsius) is unknown
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SecureOS.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SecureOS.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/SecureOS.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/SecureOS.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Server/Linux.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Server/Linux.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/Server/Linux.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Server/Linux.pm
diff --git a/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Server/Windows.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Server/Windows.pm
new file mode 100644
index 0000000..2a89ff8
--- /dev/null
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/Server/Windows.pm
@@ -0,0 +1,303 @@
+package Server::Windows;
+our @ISA = qw(Classes::Device);
+use strict;
+
+
+sub init {
+  my $self = shift;
+  if ($self->mode =~ /device::interfaces/) {
+    $self->analyze_and_check_interface_subsystem('Server::Windows::Component::InterfaceSubsystem');
+  }
+}
+
+
+package Server::Windows::Component::InterfaceSubsystem;
+our @ISA = qw(GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my $self = shift;
+  $self->{interfaces} = [];
+# bits per second
+  if ($self->mode =~ /device::interfaces::list/) {
+    my $dbh = DBI->connect('dbi:WMI:');
+    my $sth = $dbh->prepare("select * from Win32_PerfRawData_Tcpip_NetworkInterface");
+    $sth->execute();
+    while (my $member_arr = $sth->fetchrow_arrayref()) {
+      my $member = $member_arr->[0];
+      my $tmpif = {
+        ifDescr => $member->{Name},
+      };
+      push(@{$self->{interfaces}},
+        Server::Windows::Component::InterfaceSubsystem::Interface->new(%{$tmpif}));
+    }
+  } else {
+    my $dbh = DBI->connect('dbi:WMI:');
+    my $sth = $dbh->prepare("select * from Win32_PerfRawData_Tcpip_NetworkInterface");
+    $sth->execute();
+    while (my $member_arr = $sth->fetchrow_arrayref()) {
+      my $i = 0;
+      my $member = $member_arr->[0];
+      my $name = $member->{Name};
+      $name =~ s/.*\///g;
+      if ($self->opts->name) {
+        if ($self->opts->regexp) {
+          my $pattern = $self->opts->name;
+          if ($name !~ /$pattern/i) {
+            next;
+          }
+        } elsif (lc $name ne lc $self->opts->name) {
+          next;
+        }
+      }
+      *SAVEERR = *STDERR;
+      open ERR ,'>/dev/null';
+      *STDERR = *ERR;
+      my $tmpif = {
+        ifDescr => $name,
+        ifSpeed => $member->{CurrentBandwidth},
+        ifInOctets => $member->{BytesReceivedPerSec},
+        ifInDiscards => $member->{PacketsReceivedDiscarded},
+        ifInErrors => $member->{PacketsReceivedErrors},
+        ifOutOctets => $member->{BytesSentPerSec},
+        ifOutDiscards => $member->{PacketsOutboundDiscarded},
+        ifOutErrors => $member->{PacketsOutboundErrors},
+      };
+      *STDERR = *SAVEERR;
+      foreach (keys %{$tmpif}) {
+        chomp($tmpif->{$_}) if defined $tmpif->{$_};
+      }
+      if (defined $self->opts->ifspeed) {
+        $tmpif->{ifSpeed} = $self->opts->ifspeed * 1024*1024;
+      }
+      if (! defined $tmpif->{ifSpeed}) {
+        $self->add_unknown(sprintf "There is no /sys/class/net/%s/speed. Use --ifspeed", $name);
+      } else {
+        push(@{$self->{interfaces}},
+          Server::Windows::Component::InterfaceSubsystem::Interface->new(%{$tmpif}));
+      }
+    }
+  }
+}
+
+sub check {
+  my $self = shift;
+  $self->add_info('checking interfaces');
+  if (scalar(@{$self->{interfaces}}) == 0) {
+    $self->add_unknown('no interfaces');
+    return;
+  }
+  if ($self->mode =~ /device::interfaces::list/) {
+    foreach (sort {$a->{ifDescr} cmp $b->{ifDescr}} @{$self->{interfaces}}) {
+      $_->list();
+    }
+  } else {
+    foreach (@{$self->{interfaces}}) {
+      $_->check();
+    }
+  }
+}
+
+
+package Server::Windows::Component::InterfaceSubsystem::Interface;
+our @ISA = qw(GLPlugin::SNMP::TableItem);
+use strict;
+
+
+sub finish {
+  my $self = shift;
+  foreach (qw(ifSpeed ifInOctets ifInDiscards ifInErrors ifOutOctets ifOutDiscards ifOutErrors)) {
+    $self->{$_} = 0 if ! defined $self->{$_};
+  }
+  if ($self->mode =~ /device::interfaces::traffic/) {
+    $self->valdiff({name => $self->{ifDescr}}, qw(ifInOctets ifInDiscards ifInErrors ifOutOctets ifOutDiscards ifOutErrors));
+  } elsif ($self->mode =~ /device::interfaces::usage/) {
+    $self->valdiff({name => $self->{ifDescr}}, qw(ifInOctets ifOutOctets));
+    if ($self->{ifSpeed} == 0) {
+      # vlan graffl
+      $self->{inputUtilization} = 0;
+      $self->{outputUtilization} = 0;
+      $self->{maxInputRate} = 0;
+      $self->{maxOutputRate} = 0;
+    } else {
+      $self->{inputUtilization} = $self->{delta_ifInOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->{ifSpeed});
+      $self->{outputUtilization} = $self->{delta_ifOutOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->{ifSpeed});
+      $self->{maxInputRate} = $self->{ifSpeed};
+      $self->{maxOutputRate} = $self->{ifSpeed};
+    }
+    if (defined $self->opts->ifspeedin) {
+      $self->{inputUtilization} = $self->{delta_ifInOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->opts->ifspeedin);
+      $self->{maxInputRate} = $self->opts->ifspeedin;
+    }
+    if (defined $self->opts->ifspeedout) {
+      $self->{outputUtilization} = $self->{delta_ifOutOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->opts->ifspeedout);
+      $self->{maxOutputRate} = $self->opts->ifspeedout;
+    }
+    if (defined $self->opts->ifspeed) {
+      $self->{inputUtilization} = $self->{delta_ifInOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->opts->ifspeed);
+      $self->{outputUtilization} = $self->{delta_ifOutOctets} * 8 * 100 /
+          ($self->{delta_timestamp} * $self->opts->ifspeed);
+      $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};
+    $self->{maxInputRate} /= 8; # auf octets umrechnen wie die in/out
+    $self->{maxOutputRate} /= 8;
+    my $factor = 1/8; # default Bits
+    if ($self->opts->units) {
+      if ($self->opts->units eq "GB") {
+        $factor = 1024 * 1024 * 1024;
+      } elsif ($self->opts->units eq "MB") {
+        $factor = 1024 * 1024;
+      } elsif ($self->opts->units eq "KB") {
+        $factor = 1024;
+      } elsif ($self->opts->units eq "GBi") {
+        $factor = 1024 * 1024 * 1024 / 8;
+      } elsif ($self->opts->units eq "MBi") {
+        $factor = 1024 * 1024 / 8;
+      } elsif ($self->opts->units eq "KBi") {
+        $factor = 1024 / 8;
+      } elsif ($self->opts->units eq "B") {
+        $factor = 1;
+      } elsif ($self->opts->units eq "Bit") {
+        $factor = 1/8;
+      }
+    }
+    $self->{inputRate} /= $factor;
+    $self->{outputRate} /= $factor;
+    $self->{maxInputRate} /= $factor;
+    $self->{maxOutputRate} /= $factor;
+  } elsif ($self->mode =~ /device::interfaces::errors/) {
+    $self->valdiff({name => $self->{ifDescr}}, qw(ifInErrors ifOutErrors));
+    $self->{inputErrorRate} = $self->{delta_ifInErrors} 
+        / $self->{delta_timestamp};
+    $self->{outputErrorRate} = $self->{delta_ifOutErrors} 
+        / $self->{delta_timestamp};
+  } elsif ($self->mode =~ /device::interfaces::discards/) {
+    $self->valdiff({name => $self->{ifDescr}}, qw(ifInDiscards ifOutDiscards));
+    $self->{inputDiscardRate} = $self->{delta_ifInDiscards} 
+        / $self->{delta_timestamp};
+    $self->{outputDiscardRate} = $self->{delta_ifOutDiscards} 
+        / $self->{delta_timestamp};
+  } elsif ($self->mode =~ /device::interfaces::operstatus/) {
+  }
+  return $self;
+}
+
+
+sub check {
+  my $self = shift;
+  if ($self->mode =~ /device::interfaces::usage/) {
+    $self->add_info(sprintf 'interface %s usage is in:%.2f%% (%s) out:%.2f%% (%s)',
+        $self->{ifDescr}, 
+        $self->{inputUtilization}, 
+        sprintf("%.2f%s/s", $self->{inputRate},
+            ($self->opts->units ? $self->opts->units : 'Bits')),
+        $self->{outputUtilization},
+        sprintf("%.2f%s/s", $self->{outputRate},
+            ($self->opts->units ? $self->opts->units : 'Bits')));
+    $self->set_thresholds(
+        metric => $self->{ifDescr}.'_usage_in',
+        warning => 80,
+        critical => 90
+    );
+    my $in = $self->check_thresholds(
+        metric => $self->{ifDescr}.'_usage_in',
+        value => $self->{inputUtilization}
+    );
+    $self->set_thresholds(
+        metric => $self->{ifDescr}.'_usage_out',
+        warning => 80,
+        critical => 90
+    );
+    my $out = $self->check_thresholds(
+        metric => $self->{ifDescr}.'_usage_out',
+        value => $self->{outputUtilization}
+    );
+    my $level = ($in > $out) ? $in : ($out > $in) ? $out : $in;
+    $self->add_message($level);
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_usage_in',
+        value => $self->{inputUtilization},
+        uom => '%',
+    );
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_usage_out',
+        value => $self->{outputUtilization},
+        uom => '%',
+    );
+
+    my ($inwarning, $incritical) = $self->get_thresholds(
+        metric => $self->{ifDescr}.'_usage_in',
+    );
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_traffic_in',
+        value => $self->{inputRate},
+        uom => $self->opts->units,
+        places => 2,
+        min => 0,
+        max => $self->{maxInputRate},
+        warning => $self->{maxInputRate} / 100 * $inwarning,
+        critical => $self->{maxInputRate} / 100 * $incritical,
+    );
+    my ($outwarning, $outcritical) = $self->get_thresholds(
+        metric => $self->{ifDescr}.'_usage_out',
+    );
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_traffic_out',
+        value => $self->{outputRate},
+        uom => $self->opts->units,
+        places => 2,
+        min => 0,
+        max => $self->{maxOutputRate},
+        warning => $self->{maxOutputRate} / 100 * $outwarning,
+        critical => $self->{maxOutputRate} / 100 * $outcritical,
+    );
+  } elsif ($self->mode =~ /device::interfaces::errors/) {
+    $self->add_info(sprintf 'interface %s errors in:%.2f/s out:%.2f/s ',
+        $self->{ifDescr},
+        $self->{inputErrorRate} , $self->{outputErrorRate});
+    $self->set_thresholds(warning => 1, critical => 10);
+    my $in = $self->check_thresholds($self->{inputErrorRate});
+    my $out = $self->check_thresholds($self->{outputErrorRate});
+    my $level = ($in > $out) ? $in : ($out > $in) ? $out : $in;
+    $self->add_message($level);
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_errors_in',
+        value => $self->{inputErrorRate},
+    );
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_errors_out',
+        value => $self->{outputErrorRate},
+    );
+  } elsif ($self->mode =~ /device::interfaces::discards/) {
+    $self->add_info(sprintf 'interface %s discards in:%.2f/s out:%.2f/s ',
+        $self->{ifDescr},
+        $self->{inputDiscardRate} , $self->{outputDiscardRate});
+    $self->set_thresholds(warning => 1, critical => 10);
+    my $in = $self->check_thresholds($self->{inputDiscardRate});
+    my $out = $self->check_thresholds($self->{outputDiscardRate});
+    my $level = ($in > $out) ? $in : ($out > $in) ? $out : $in;
+    $self->add_message($level);
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_discards_in',
+        value => $self->{inputDiscardRate},
+    );
+    $self->add_perfdata(
+        label => $self->{ifDescr}.'_discards_out',
+        value => $self->{outputDiscardRate},
+    );
+  }
+}
+
+sub list {
+  my $self = shift;
+  printf "%s\n", $self->{ifDescr};
+}
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB/Components/CpuSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UCDMIB/Components/MemSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
similarity index 79%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
index 1cbddcf..8a3cfc1 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/InterfaceSubsystem.pm
@@ -2,53 +2,48 @@ package Classes::UPNP::AVM::FritzBox7390::Component::InterfaceSubsystem;
 our @ISA = qw(Classes::IFMIB::Component::InterfaceSubsystem);
 use strict;
 
+
 sub init {
   my $self = shift;
   if ($self->mode =~ /device::interfaces/) {
     $self->{ifDescr} = "WAN";
+    my $service = (grep { $_->{serviceId} =~ /WANIPConn1/ } @{$self->get_variable('services')})[0];
     $self->{ExternalIPAddress} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANIPConn1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANIPConnection:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetExternalIPAddress()
       -> result;
     $self->{ConnectionStatus} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANIPConn1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANIPConnection:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetStatusInfo()
       -> valueof("//GetStatusInfoResponse/NewConnectionStatus");;
+    $service = (grep { $_->{serviceId} =~ /WANCommonIFC1/ } @{$self->get_variable('services')})[0];
     $self->{PhysicalLinkStatus} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANCommonIFC1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetCommonLinkProperties()
       -> valueof("//GetCommonLinkPropertiesResponse/NewPhysicalLinkStatus");
     $self->{Layer1UpstreamMaxBitRate} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANCommonIFC1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetCommonLinkProperties()
       -> valueof("//GetCommonLinkPropertiesResponse/NewLayer1UpstreamMaxBitRate");
     $self->{Layer1DownstreamMaxBitRate} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANCommonIFC1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetCommonLinkProperties()
       -> valueof("//GetCommonLinkPropertiesResponse/NewLayer1DownstreamMaxBitRate");
     $self->{TotalBytesSent} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANCommonIFC1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetTotalBytesSent()
       -> result;
     $self->{TotalBytesReceived} = SOAP::Lite
-      -> proxy(sprintf 'http://%s:%s/upnp/control/WANCommonIFC1',
-        $self->opts->hostname, $self->opts->port)
-      -> uri('urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1')
+      -> proxy($service->{controlURL})
+      -> uri($service->{serviceType})
       -> GetTotalBytesReceived()
       -> result;
-  
     if ($self->mode =~ /device::interfaces::usage/) {
       $self->valdiff({name => $self->{ifDescr}}, qw(TotalBytesSent TotalBytesReceived));
       $self->{inputUtilization} = $self->{delta_TotalBytesReceived} * 8 * 100 /
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Classes/UPNP/AVM/FritzBox7390/Components/SmartHomeSubsystem.pm
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPlugin.pm
similarity index 97%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPlugin.pm
index 9fe4ff6..ddca349 100755
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPlugin.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPlugin.pm
@@ -138,7 +138,17 @@ sub validate_args {
     $ENV{NRPE_MULTILINESUPPORT} = 0;
   }
   if (! $self->opts->statefilesdir) {
-    if (exists $ENV{OMD_ROOT}) {
+    if ($^O =~ /MSWin/) {
+      if (defined $ENV{TEMP}) {
+        $self->override_opt('statefilesdir', $ENV{TEMP}."/".$GLPlugin::plugin->{name});
+      } elsif (defined $ENV{TMP}) {
+        $self->override_opt('statefilesdir', $ENV{TMP}."/".$GLPlugin::plugin->{name});
+      } elsif (defined $ENV{windir}) {
+        $self->override_opt('statefilesdir', File::Spec->catfile($ENV{windir}, 'Temp')."/".$GLPlugin::plugin->{name});
+      } else {
+        $self->override_opt('statefilesdir', "C:/".$GLPlugin::plugin->{name});
+      }
+    } elsif (exists $ENV{OMD_ROOT}) {
       $self->override_opt('statefilesdir', $ENV{OMD_ROOT}."/var/tmp/".$GLPlugin::plugin->{name});
     } else {
       $self->override_opt('statefilesdir', "/var/tmp/".$GLPlugin::plugin->{name});
@@ -492,9 +502,11 @@ sub getopts {
   # bzw. durch den exit3 ein evt. unsauberes beenden der verbindung.
   if ((! grep { $self->opts->mode eq $_ } map { $_->{spec} } @{$GLPlugin::plugin->{modes}}) &&
       (! grep { $self->opts->mode eq $_ } map { defined $_->{alias} ? @{$_->{alias}} : () } @{$GLPlugin::plugin->{modes}})) {
-    printf "UNKNOWN - mode %s\n", $self->opts->mode;
-    $self->opts->print_help();
-    exit 3;
+    if ($self->opts->mode !~ /^my-/) {
+      printf "UNKNOWN - mode %s\n", $self->opts->mode;
+      $self->opts->print_help();
+      exit 3;
+    }
   }
 }
 
@@ -1443,7 +1455,9 @@ sub check_thresholds {
     $warningrange = $self->{thresholds}->{default}->{warning};
     $criticalrange = $self->{thresholds}->{default}->{critical};
   }
-  if ($warningrange =~ /^([-+]?[0-9]*\.?[0-9]+)$/) {
+  if (! defined $warningrange) {
+    # there was no set_thresholds for defaults, no --warning, no --warningx
+  } elsif ($warningrange =~ /^([-+]?[0-9]*\.?[0-9]+)$/) {
     # warning = 10, warn if > 10 or < 0
     $level = $ERRORS{WARNING}
         if ($value > $1 || $value < 0);
@@ -1464,7 +1478,9 @@ sub check_thresholds {
     $level = $ERRORS{WARNING}
         if ($value >= $1 && $value <= $2);
   }
-  if ($criticalrange =~ /^([-+]?[0-9]*\.?[0-9]+)$/) {
+  if (! defined $criticalrange) {
+    # there was no set_thresholds for defaults, no --critical, no --criticalx
+  } elsif ($criticalrange =~ /^([-+]?[0-9]*\.?[0-9]+)$/) {
     # critical = 10, crit if > 10 or < 0
     $level = $ERRORS{CRITICAL}
         if ($value > $1 || $value < 0);
@@ -1743,3 +1759,4 @@ sub check {
   # normal tableitems should have their own check-method
 }
 
+
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginSNMP.pm
similarity index 96%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginSNMP.pm
index 030b2e4..c79f444 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginSNMP.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginSNMP.pm
@@ -744,7 +744,7 @@ sub check_snmp_and_model {
         } elsif (/^([\d\.]+) = Hex-STRING: (.*)/) {
           $response->{$1} = "0x".$2;
           $response->{$1} =~ s/\s+$//;
-        } elsif (/^([\d\.]+) = \w+: (\-*\d+)/) {
+        } elsif (/^([\d\.]+) = \w+: (\-*\d+)\s*$/) {
           $response->{$1} = $2;
         } elsif (/^([\d\.]+) = \w+: "(.*?)"/) {
           $response->{$1} = $2;
@@ -842,7 +842,8 @@ sub check_snmp_and_model {
     my $tac = time;
     if (defined $sysUptime && defined $sysDescr) {
       # drecksschrott asa liefert negative werte
-      if (defined $snmpEngineTime && $snmpEngineTime > 0) {
+      # und drecksschrott socomec liefert: wrong type (should be INTEGER): NULL
+      if (defined $snmpEngineTime && $snmpEngineTime =~ /^\d+$/ && $snmpEngineTime > 0) {
         $self->{uptime} = $snmpEngineTime;
       } else {
         $self->{uptime} = $self->timeticks($sysUptime);
@@ -867,6 +868,14 @@ sub check_snmp_and_model {
   }
 }
 
+sub mult_snmp_max_msg_size {
+  my $self = shift;
+  my $factor = shift || 10;
+  $self->debug(sprintf "raise maxmsgsize %d * %d", 
+      $factor, $GLPlugin::SNMP::session->max_msg_size());
+  $GLPlugin::SNMP::session->max_msg_size($factor * $GLPlugin::SNMP::session->max_msg_size()) if $GLPlugin::SNMP::session;
+}
+
 sub no_such_model {
   my $self = shift;
   printf "Model %s is not implemented\n", $self->{productname};
@@ -1232,9 +1241,50 @@ sub get_snmp_table_objects {
   }
   my $entry = $table;
   $entry =~ s/Table/Entry/g;
-  if (scalar(@{$indices}) == 1) {
-    if (exists $GLPlugin::SNMP::mibs_and_oids->{$mib} &&
-        exists $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$table}) {
+  if (exists $GLPlugin::SNMP::mibs_and_oids->{$mib} &&
+      exists $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$table}) {
+    if (scalar(@{$indices}) == 1 && $indices->[0] == -1) {
+      # get mini-version of a table
+      my $result = {};
+      my $eoid = $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry}.'.';
+      my $eoidlen = length($eoid);
+      my @columns = map {
+          $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$_}
+      } grep {
+        substr($GLPlugin::SNMP::mibs_and_oids->{$mib}->{$_}, 0, $eoidlen) eq
+            $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry}.'.'
+      } keys %{$GLPlugin::SNMP::mibs_and_oids->{$mib}};
+      my $ifresult = $self->get_entries(
+          -columns => \@columns,
+      );
+      map { $result->{$_} = $ifresult->{$_} }
+          keys %{$ifresult};
+      if ($augmenting_table &&
+          exists $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$augmenting_table}) {
+        my $entry = $augmenting_table;
+        $entry =~ s/Table/Entry/g;
+        my $eoid = $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry}.'.';
+        my $eoidlen = length($eoid);
+        my @columns = map {
+            $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$_}
+        } grep {
+          substr($GLPlugin::SNMP::mibs_and_oids->{$mib}->{$_}, 0, $eoidlen) eq $eoid
+        } keys %{$GLPlugin::SNMP::mibs_and_oids->{$mib}};
+        my $ifresult = $self->get_entries(
+            -columns => \@columns,
+        );
+        map { $result->{$_} = $ifresult->{$_} }
+            keys %{$ifresult};
+      }
+      my @indices = 
+          $self->get_indices(
+              -baseoid => $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry},
+              -oids => [keys %{$result}]);
+      $self->debug(sprintf "get_snmp_table_objects get_table returns %d indices",
+          scalar(@indices));
+      @entries = $self->make_symbolic($mib, $result, \@indices);
+      @entries = map { $_->{indices} = shift @indices; $_ } @entries;
+    } elsif (scalar(@{$indices}) == 1) {
       my $result = {};
       my $eoid = $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry}.'.';
       my $eoidlen = length($eoid);
@@ -1273,12 +1323,9 @@ sub get_snmp_table_objects {
       }
       @entries = $self->make_symbolic($mib, $result, $indices);
       @entries = map { $_->{indices} = shift @{$indices}; $_ } @entries;
-    }
-  } elsif (scalar(@{$indices}) > 1) {
+    } elsif (scalar(@{$indices}) > 1) {
     # man koennte hier pruefen, ob die indices aufeinanderfolgen
     # und dann get_entries statt get_table aufrufen
-    if (exists $GLPlugin::SNMP::mibs_and_oids->{$mib} &&
-        exists $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$table}) {
       my $result = {};
       my $eoid = $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry}.'.';
       my $eoidlen = length($eoid);
@@ -1341,10 +1388,7 @@ sub get_snmp_table_objects {
       # $self->get_indices($GLPlugin::SNMP::mibs_and_oids->{$mib}->{$entry});
       @entries = $self->make_symbolic($mib, $result, $indices);
       @entries = map { $_->{indices} = shift @{$indices}; $_ } @entries;
-    }
-  } else {
-    if (exists $GLPlugin::SNMP::mibs_and_oids->{$mib} &&
-        exists $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$table}) {
+    } else {
       $self->debug(sprintf "get_snmp_table_objects calls get_table %s",
           $GLPlugin::SNMP::mibs_and_oids->{$mib}->{$table});
       my $result = $self->get_table(
@@ -1512,7 +1556,7 @@ sub get_entries {
   if (! $self->opts->snmpwalk) {
     $result = $self->get_entries_get_bulk(%params);
     if (! $result) {
-      if (scalar (@{$params{'-columns'}}) < 50 && $params{'-startindex'} eq $params{'-endindex'}) {
+      if (scalar (@{$params{'-columns'}}) < 50 && $params{'-endindex'} && $params{'-startindex'} eq $params{'-endindex'}) {
         $result = $self->get_entries_get_simple(%params);
       } else {
         $result = $self->get_entries_get_next(%params);
@@ -1784,8 +1828,14 @@ sub make_symbolic {
             } elsif ($GLPlugin::SNMP::mibs_and_oids->{$mib}->{$symoid.'Definition'} =~ /^(.*?)::(.*)/) {
               my $mib = $1;
               my $definition = $2;
-              if  (exists $GLPlugin::SNMP::definitions->{$mib} && exists $GLPlugin::SNMP::definitions->{$mib}->{$definition}
-                  && exists $GLPlugin::SNMP::definitions->{$mib}->{$definition}->{$result->{$fulloid}}) {
+              if  (exists $GLPlugin::SNMP::definitions->{$mib} &&
+                  exists $GLPlugin::SNMP::definitions->{$mib}->{$definition} &&
+                  ref($GLPlugin::SNMP::definitions->{$mib}->{$definition}) eq 'CODE') {
+                $mo->{$symoid} = $GLPlugin::SNMP::definitions->{$mib}->{$definition}->($result->{$fulloid});
+              } elsif  (exists $GLPlugin::SNMP::definitions->{$mib} &&
+                  exists $GLPlugin::SNMP::definitions->{$mib}->{$definition} &&
+                  ref($GLPlugin::SNMP::definitions->{$mib}->{$definition}) eq 'HASH' &&
+                  exists $GLPlugin::SNMP::definitions->{$mib}->{$definition}->{$result->{$fulloid}}) {
                 $mo->{$symoid} = $GLPlugin::SNMP::definitions->{$mib}->{$definition}->{$result->{$fulloid}};
               } else {
                 $mo->{$symoid} = 'unknown_'.$result->{$fulloid};
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginUPNP.pm b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginUPNP.pm
similarity index 70%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginUPNP.pm
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginUPNP.pm
index aa23cc1..e414384 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/GLPluginUPNP.pm
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/GLPluginUPNP.pm
@@ -49,6 +49,7 @@ sub check_upnp_and_model {
   } else {
     $self->add_critical('could not find SOAP::Lite module');
   }
+  $self->{services} = {};
   if (! $self->check_messages()) {
     eval {
       my $igddesc = sprintf "http://%s:%s/igddesc.xml",
@@ -59,6 +60,27 @@ sub check_upnp_and_model {
       my $xpc = XML::LibXML::XPathContext->new( $root );
       $xpc->registerNs('n', 'urn:schemas-upnp-org:device-1-0');
       $self->{productname} = $xpc->findvalue('(//n:device)[position()=1]/n:modelName' );
+      my @services = ();
+      my @servicedescs = $xpc->find('(//n:service)')->get_nodelist;
+      foreach my $service (@servicedescs) {
+        my $servicetype = undef;
+        my $serviceid = undef;
+        my $controlurl = undef;
+        foreach my $node ($service->nonBlankChildNodes("./*")) {
+          $serviceid = $node->textContent if ($node->nodeName eq "serviceId");
+          $servicetype = $node->textContent if ($node->nodeName eq "serviceType");
+          $controlurl = $node->textContent if ($node->nodeName eq "controlURL");
+        }
+        if ($serviceid && $controlurl) {
+          push(@services, {
+              serviceType => $servicetype,
+              serviceId => $serviceid,
+              controlURL => sprintf('http://%s:%s%s',
+                  $self->opts->hostname, $self->opts->port, $controlurl),
+          });
+        }
+      }
+      $self->set_variable('services', \@services);
     };
     if ($@) {
       $self->add_critical($@);
@@ -66,10 +88,10 @@ sub check_upnp_and_model {
   }
   if (! $self->check_messages()) {
     eval {
+      my $service = (grep { $_->{serviceId} =~ /WANIPConn1/ } @{$self->get_variable('services')})[0];
       my $som = SOAP::Lite
-          -> proxy(sprintf 'http://%s:%s/upnp/control/WANIPConn1',
-              $self->opts->hostname, $self->opts->port)
-          -> uri('urn:schemas-upnp-org:service:WANIPConnection:1')
+          -> proxy($service->{controlURL})
+          -> uri($service->{serviceType})
           -> GetStatusInfo();
       $self->{uptime} = $som->valueof("//GetStatusInfoResponse/NewUptime");
       $self->{uptime} /= 1.0;
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.am
similarity index 94%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.am
index 9880cb9..4a6ac95 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.am
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.am
@@ -21,6 +21,8 @@ EXTRA_MODULES=\
   Classes/UPNP/AVM.pm \
   Classes/UPNP.pm \
   Classes/Server/Linux.pm \
+  Classes/Server/Windows.pm \
+  Classes/Cisco/CISCOIPSECFLOWMONITOR/Component/VpnSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm \
@@ -41,6 +43,7 @@ EXTRA_MODULES=\
   Classes/Cisco/NXOS/Component/CpuSubsystem.pm \
   Classes/Cisco/NXOS/Component/MemSubsystem.pm \
   Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm \
+  Classes/Cisco/NXOS/Component/FexSubsystem.pm \
   Classes/Cisco/NXOS.pm \
   Classes/Cisco/WLC/Component/MemSubsystem.pm \
   Classes/Cisco/WLC/Component/CpuSubsystem.pm \
@@ -104,6 +107,8 @@ EXTRA_MODULES=\
   Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm \
   Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm \
   Classes/HOSTRESOURCESMIB.pm \
+  Classes/ENTITYSENSORMIB.pm \
+  Classes/ENTITYSENSORMIB/Component/EnvironmentalSubsystem.pm \
   Classes/BGP/Component/PeerSubsystem.pm \
   Classes/BGP.pm \
   Classes/FCMGMT/Component/EnvironmentalSubsystem.pm \
@@ -164,6 +169,11 @@ EXTRA_MODULES=\
   Classes/Foundry/Component/FanSubsystem.pm \
   Classes/Foundry/Component/TemperatureSubsystem.pm \
   Classes/Foundry.pm \
+  Classes/PaloAlto/Component/MemSubsystem.pm \
+  Classes/PaloAlto/Component/CpuSubsystem.pm \
+  Classes/PaloAlto/Component/EnvironmentalSubsystem.pm \
+  Classes/PaloAlto/Component/HaSubsystem.pm \
+  Classes/PaloAlto.pm \
   Classes/Bluecoat.pm \
   Classes/Lantronix.pm \
   Classes/Lantronix/SLS.pm \
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.in
similarity index 97%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.in
index 3dfb839..792a30e 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/Makefile.in
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/Makefile.in
@@ -250,6 +250,8 @@ EXTRA_MODULES = \
   Classes/UPNP/AVM.pm \
   Classes/UPNP.pm \
   Classes/Server/Linux.pm \
+  Classes/Server/Windows.pm \
+  Classes/Cisco/CISCOIPSECFLOWMONITOR/Component/VpnSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/EnvironmentalSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/FanSubsystem.pm \
   Classes/Cisco/CISCOENTITYFRUCONTROLMIB/Component/PowersupplySubsystem.pm \
@@ -270,6 +272,7 @@ EXTRA_MODULES = \
   Classes/Cisco/NXOS/Component/CpuSubsystem.pm \
   Classes/Cisco/NXOS/Component/MemSubsystem.pm \
   Classes/Cisco/NXOS/Component/EnvironmentalSubsystem.pm \
+  Classes/Cisco/NXOS/Component/FexSubsystem.pm \
   Classes/Cisco/NXOS.pm \
   Classes/Cisco/WLC/Component/MemSubsystem.pm \
   Classes/Cisco/WLC/Component/CpuSubsystem.pm \
@@ -333,6 +336,8 @@ EXTRA_MODULES = \
   Classes/HOSTRESOURCESMIB/Component/CpuSubsystem.pm \
   Classes/HOSTRESOURCESMIB/Component/MemSubsystem.pm \
   Classes/HOSTRESOURCESMIB.pm \
+  Classes/ENTITYSENSORMIB.pm \
+  Classes/ENTITYSENSORMIB/Component/EnvironmentalSubsystem.pm \
   Classes/BGP/Component/PeerSubsystem.pm \
   Classes/BGP.pm \
   Classes/FCMGMT/Component/EnvironmentalSubsystem.pm \
@@ -393,6 +398,11 @@ EXTRA_MODULES = \
   Classes/Foundry/Component/FanSubsystem.pm \
   Classes/Foundry/Component/TemperatureSubsystem.pm \
   Classes/Foundry.pm \
+  Classes/PaloAlto/Component/MemSubsystem.pm \
+  Classes/PaloAlto/Component/CpuSubsystem.pm \
+  Classes/PaloAlto/Component/EnvironmentalSubsystem.pm \
+  Classes/PaloAlto/Component/HaSubsystem.pm \
+  Classes/PaloAlto.pm \
   Classes/Bluecoat.pm \
   Classes/Lantronix.pm \
   Classes/Lantronix/SLS.pm \
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/check_nwc_health.pl
similarity index 98%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/check_nwc_health.pl
index 4afa1f7..4bfaf3f 100644
--- a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/check_nwc_health.pl
+++ b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/check_nwc_health.pl
@@ -1,7 +1,6 @@
 # /usr/bin/perl -w
 
 use strict;
-use File::Basename;
 
 my $plugin = Classes::Device->new(
     shortname => '',
@@ -99,6 +98,12 @@ $plugin->add_mode(
     alias => undef,
     help => 'Check the percentage of up interfaces in a link aggregation',
 );
+$plugin->add_mode(
+    internal => 'device::vpn::status',
+    spec => 'vpn-status',
+    alias => undef,
+    help => 'Check the status of vpns (up/down)',
+);
 $plugin->add_mode(
     internal => 'device::shinken::interface',
     spec => 'create-shinken-service',
diff --git a/check_nwc_health/check_nwc_health-3.1/plugins-scripts/subst.in b/check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/subst.in
similarity index 100%
rename from check_nwc_health/check_nwc_health-3.1/plugins-scripts/subst.in
rename to check_nwc_health/check_nwc_health-3.4.2.2/plugins-scripts/subst.in
diff --git a/check_nwc_health/control b/check_nwc_health/control
index 6c8450c..954c2d6 100644
--- a/check_nwc_health/control
+++ b/check_nwc_health/control
@@ -4,4 +4,4 @@ Uploaders: Jan Wagner <waja@cyconet.org>
 Description: This plugin checks the hardware health and interface metrics
  of network components like switches and routers.
 Build-Depends: autotools-dev
-Version: 3.1
+Version: 3.4.2.2
diff --git a/check_nwc_health/src b/check_nwc_health/src
index e02da36..474f866 120000
--- a/check_nwc_health/src
+++ b/check_nwc_health/src
@@ -1 +1 @@
-check_nwc_health-3.1/
\ No newline at end of file
+check_nwc_health-3.4.2.2
\ No newline at end of file