Merge https://github.com/xkilian/genDevConfig

xkilian · Jan 11, 2016 · d7c7ea0 · d7c7ea0
2 parents e92b3c3 + 57d637b
commit d7c7ea0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git 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

diff --git 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
@@ -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
+
 
diff --git 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_

diff --git 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