Merge pull request #9 from savoirfairelinux/master

Change on geist RSMINI and Alcatel oxe
xkilian · Jan 6, 2016 · 57d637b · 57d637b
2 parents bc0336f + 7635216
commit 57d637b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
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_