From 138fd2923a23011b5f51ec268f498b73a629fd3f Mon Sep 17 00:00:00 2001
From: FTBZ <florent.bruchez@mac.com>
Date: Thu, 13 Jul 2017 19:23:55 +0200
Subject: [PATCH] fix: Fixed Rittal LCP sensor divisors (#7014)

* Better values for some graphs

* Change definition order

* Update rittal-lcp.yaml
---
 includes/definitions/rittal-lcp.yaml             | 12 +++++++-----
 includes/discovery/sensors/entity-sensor.inc.php | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/includes/definitions/rittal-lcp.yaml b/includes/definitions/rittal-lcp.yaml
index d84ad52909..b3d6279559 100644
--- a/includes/definitions/rittal-lcp.yaml
+++ b/includes/definitions/rittal-lcp.yaml
@@ -2,16 +2,18 @@ os: rittal-lcp
 text: 'Rittal LCP'
 type: environment
 icon: rittal
+over:
+    - { graph: device_temperature, text: 'Temperatures' }
+    - { graph: device_power, text: 'Cooling capacity' }
 mib_dir:
     - rittal
-over:
-    - { graph: device_processor, text: 'Processor Usage' }
-    - { graph: device_ucd_memory, text: 'Memory Usage' }
-    - { graph: device_storage, text: 'Storage Usage' }
+discovery_modules:
+    storage: 0
+    mempools: 0
+    processors: 0
 discovery:
     -
         sysObjectId:
             - .1.3.6.1.4.1.2606.7
     - sysDescr:
         - 'Rittal LCP'
-        
\ No newline at end of file
diff --git a/includes/discovery/sensors/entity-sensor.inc.php b/includes/discovery/sensors/entity-sensor.inc.php
index 11a38f3f6d..7458a56eca 100644
--- a/includes/discovery/sensors/entity-sensor.inc.php
+++ b/includes/discovery/sensors/entity-sensor.inc.php
@@ -109,6 +109,21 @@ if (is_array($oids)) {
                 } $descr = preg_replace('/[T|t]emperature[|s]/', '', $descr);
             }
 
+            if ($device['os'] == 'rittal-lcp') {
+                if ($type == 'voltage') {
+                    $divisor = 1000;
+                }
+                if ($descr == 'Temperature.Value') {
+                    $divisor = 1000;
+                }
+                if ($descr == 'System.Temperature.Value') {
+                    $divisor = 1000;
+                }
+                if ($type == 'humidity' && $current == '0') {
+                    $valid_sensor = false;
+                }
+            }
+
             // echo($descr . "|" . $index . "|" .$current . "|" . $multiplier . "|" . $divisor ."|" . $entry['entPhySensorScale'] . "|" . $entry['entPhySensorPrecision'] . "\n");
             if ($current == '-127' || ($device['os'] == 'asa' && str_contains($device['hardware'], 'sc'))) {
                 $valid_sensor = false;