From 46fb20725a1ebb73081d2a7f95b7df5d8becfdaa Mon Sep 17 00:00:00 2001 From: xkilian Date: Tue, 8 Dec 2015 16:57:38 -0500 Subject: [PATCH 1/4] Update CHANGES --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 8657e2d..448dba6 100755 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ Date format: Gregorian Little Endian, starting with Day [DD/MM/YYYY] # Version 3_0_8 unreleased +# - New plugin for Alcatel OXE Call server nodes # - New plugin for Alcatel Vxworks based L2 switches # - New plugin for Alcatel Linux based L2/L3 switches # - New plugin for Tripplite powerbar NET module From 5822af823a8c50bf4bbcf994d923748735224ee2 Mon Sep 17 00:00:00 2001 From: Flavien Peyre Date: Wed, 30 Dec 2015 14:49:17 -0500 Subject: [PATCH 2/4] add doc for oxe plugin --- sample-config/genConfig/Defaults_plugin_alcatel_oxe.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sample-config/genConfig/Defaults_plugin_alcatel_oxe.ini b/sample-config/genConfig/Defaults_plugin_alcatel_oxe.ini index 81ddf2e..76e24ec 100644 --- a/sample-config/genConfig/Defaults_plugin_alcatel_oxe.ini +++ b/sample-config/genConfig/Defaults_plugin_alcatel_oxe.ini @@ -107,8 +107,9 @@ [TRIGGER] # Set service to UNKNOWN(3) by default - default_status = 3 - + default_status = 3 + + # pbxState can take 6 int value: 0 = unknown, 1 = critical, 2 = major, 3 = minor, 4 = warning, 5 = OK [[Alcatel-Oxe-Pbx-State]] warning = pbxState, 4, eq, pbxState, 3, eq, or_ critical = pbxState, 1, eq, pbxState, 2, eq, or_ From 7635216f45d39a475f8da7aaac9473010c1e999e Mon Sep 17 00:00:00 2001 From: Flavien Peyre Date: Mon, 4 Jan 2016 08:30:16 -0500 Subject: [PATCH 3/4] Add triggergroup for geist rsmini --- plugins/genConfig/GeistRSMini.pm | 2 +- sample-config/genConfig/Defaults_geist_rsmini.ini | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/genConfig/GeistRSMini.pm b/plugins/genConfig/GeistRSMini.pm index d652b2f..65f89da 100644 --- a/plugins/genConfig/GeistRSMini.pm +++ b/plugins/genConfig/GeistRSMini.pm @@ -192,7 +192,7 @@ sub custom_targets { 'display_name' => "Temperature sensor " . $id, '_inst' => $id, '_dstemplate' => "geist-sensor-temperature", - '_triggergroup' => "RSMini_Temp", + '_triggergroup' => "RSMini_Temp_Complex", 'use' => $opts->{dtemplate}, ); diff --git a/sample-config/genConfig/Defaults_geist_rsmini.ini b/sample-config/genConfig/Defaults_geist_rsmini.ini index 21ec9fb..47680f6 100644 --- a/sample-config/genConfig/Defaults_geist_rsmini.ini +++ b/sample-config/genConfig/Defaults_geist_rsmini.ini @@ -192,9 +192,15 @@ # Set service to UNKNOWN(3) by default default_status = 3 - [[Geist-Rsmini-Sensors-Temp]] + [[Geist-Rsmini-Sensors-Temp-Up-30]] warning = tempSensorTempC, 30, gt + [[Geist-Rsmini-Sensors-Temp-Down-10]] + warning = tempSensorTempC, 10, lt + [TRIGGERGROUP] - RSMini_Temp = Geist-Rsmini-Sensors-Temp + RSMini_Temp_Basic = Geist-Rsmini-Sensors-Temp-Up-30 + + RSMini_Temp_Complex = Geist-Rsmini-Sensors-Temp-Up-30, Geist-Rsmini-Sensors-Temp-Down-10 + From bc0336fbc6b1ea0a4b7b483242c0aaed27fe8c20 Mon Sep 17 00:00:00 2001 From: xkilian Date: Wed, 6 Jan 2016 16:24:52 -0500 Subject: [PATCH 4/4] Fix: Incorrect names for interface-nu multicast triggers --- sample-config/genConfig/Defaults_triggers.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sample-config/genConfig/Defaults_triggers.ini b/sample-config/genConfig/Defaults_triggers.ini index 794555f..5acdd00 100644 --- a/sample-config/genConfig/Defaults_triggers.ini +++ b/sample-config/genConfig/Defaults_triggers.ini @@ -51,11 +51,11 @@ critical = ifHCOutMulticastPkts.last(),5000,gt,ifOperStatus.last(),1,eq,and_ [[interface-nu_in]] - warning = ifInMulticastPkts.last(),2000,gt,ifAdminStatus.last(),1,eq,ifOperStatus.last(),1,eq,and_,and_ - critical = ifInMulticastPkts.last(),5000,gt,ifOperStatus.last(),1,eq,and_ + warning = ifInNUcastPackets.last(),2000,gt,ifAdminStatus.last(),1,eq,ifOperStatus.last(),1,eq,and_,and_ + critical = ifInNUcastPackets.last(),5000,gt,ifOperStatus.last(),1,eq,and_ [[interface-nu_out]] - warning = ifOutMulticastPkts.last(),2000,gt,ifAdminStatus.last(),1,eq,ifOperStatus.last(),1,eq,and_,and_ - critical = ifOutMulticastPkts.last(),5000,gt,ifOperStatus.last(),1,eq,and_ + warning = ifOutNUcastPackets.last(),2000,gt,ifAdminStatus.last(),1,eq,ifOperStatus.last(),1,eq,and_,and_ + critical = ifOutNUcastPackets.last(),5000,gt,ifOperStatus.last(),1,eq,and_ [[file]] warning = FileSize.last(),1,gt