From c8b677779d1b17a0d57aa7bc10dc3fac23482964 Mon Sep 17 00:00:00 2001
From: TomEvin <tomevin1@gmail.com>
Date: Mon, 9 Oct 2017 21:24:20 +0200
Subject: [PATCH] newdevice: Added HPE ILO4 storage, memory and additional
 sensors

* HPE ILO4 enhance

Added Storage, Memory pools, new status (Array Controller, Logical Drive)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete hpe.ilo.inc.php
---
 includes/definitions/discovery/hpe-ilo.yaml | 26 +++++++++++++++++-
 includes/definitions/hpe-ilo.yaml           | 23 ++++++++--------
 includes/discovery/mempools/hpe-ilo.inc.php | 28 ++++++++++++++++++++
 includes/discovery/storage/hpe-ilo.inc.php  | 20 ++++++++++++++
 includes/polling/mempools/hpe-ilo.inc.php   | 29 +++++++++++++++++++++
 includes/polling/storage/hpe-ilo.inc.php    | 14 ++++++++++
 6 files changed, 128 insertions(+), 12 deletions(-)
 create mode 100644 includes/discovery/mempools/hpe-ilo.inc.php
 create mode 100644 includes/discovery/storage/hpe-ilo.inc.php
 create mode 100644 includes/polling/mempools/hpe-ilo.inc.php
 create mode 100644 includes/polling/storage/hpe-ilo.inc.php

diff --git a/includes/definitions/discovery/hpe-ilo.yaml b/includes/definitions/discovery/hpe-ilo.yaml
index 4c937fcda0..39c0bbeab2 100644
--- a/includes/definitions/discovery/hpe-ilo.yaml
+++ b/includes/definitions/discovery/hpe-ilo.yaml
@@ -1,4 +1,4 @@
-mib: CPQHLTH-MIB:CPQIDA-MIB:CPQSTDEQ-MIB
+mib: CPQHLTH-MIB:CPQIDA-MIB:CPQSTDEQ-MIB:CPQHOST-MIB
 modules:
     sensors:
         power:
@@ -89,3 +89,27 @@ modules:
                         - { descr: ok, graph: 1, value: 2, generic: 0 }
                         - { descr: degraded, graph: 1, value: 3, generic: 1 }
                         - { descr: degradedModuleIndexUnknown, graph: 1, value: 4, generic: 1 }
+                -
+                    oid: cpqDaCntlrTable
+                    value: cpqDaCntlrCondition
+                    num_oid:  .1.3.6.1.4.1.232.3.2.2.1.1.6.
+                    descr: 'Array Controller Slot#{{ $cpqDaCntlrSlot }}'
+                    index: 'cpqDaCntlrCondition.{{ $index }}'
+                    state_name: cpqDaCntlrCondition
+                    states:
+                        - { descr: other, graph: 1, value: 1, generic: 3 }
+                        - { descr: ok, graph: 1, value: 2, generic: 0 }
+                        - { descr: degraded, graph: 1, value: 3, generic: 1 }
+                        - { descr: failed, graph: 1, value: 4, generic: 1 }
+                -
+                    oid: cpqDaLogDrvTable
+                    value: cpqDaLogDrvCondition
+                    num_oid:  .1.3.6.1.4.1.232.3.2.3.1.1.11.
+                    descr: 'Logical Drive #{{ $cpqDaLogDrvIndex }}'
+                    index: 'cpqDaLogDrvCondition.{{ $index }}'
+                    state_name: cpqDaLogDrvCondition
+                    states:
+                        - { descr: other, graph: 1, value: 1, generic: 3 }
+                        - { descr: ok, graph: 1, value: 2, generic: 0 }
+                        - { descr: degraded, graph: 1, value: 3, generic: 1 }
+                        - { descr: failed, graph: 1, value: 4, generic: 1 }
diff --git a/includes/definitions/hpe-ilo.yaml b/includes/definitions/hpe-ilo.yaml
index fe0d32f1a6..8b4d0a0a93 100644
--- a/includes/definitions/hpe-ilo.yaml
+++ b/includes/definitions/hpe-ilo.yaml
@@ -1,11 +1,12 @@
-os: hpe-ilo
-text: 'HPE Integrated Lights Out'
-type: appliance
-icon: hpe
-over:
-    - { graph: device_bits, text: Traffic }
-discovery:
-    - sysObjectId:
-        - .1.3.6.1.4.1.232.9.4.10
-mib_dir:
-    - hp
\ No newline at end of file
+os: hpe-ilo
+text: 'HPE Integrated Lights Out'
+type: appliance
+icon: hpe
+over:
+    - { graph: device_bits, text: Traffic }
+    - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.232.9.4.10
+mib_dir:
+    - hp
diff --git a/includes/discovery/mempools/hpe-ilo.inc.php b/includes/discovery/mempools/hpe-ilo.inc.php
new file mode 100644
index 0000000000..46d0f91cd1
--- /dev/null
+++ b/includes/discovery/mempools/hpe-ilo.inc.php
@@ -0,0 +1,28 @@
+<?php
+
+if ($device['os'] == 'hpe-ilo') {
+    echo 'HPE ILO4 ';
+
+    $memory_pool = snmp_get_multi_oid($device, 'cpqHoPhysicalMemoryFree.0 cpqHoPhysicalMemorySize.0 cpqHoPagingMemoryFree.0 cpqHoPagingMemorySize.0', '-OQUs', 'CPQHO
+ST-MIB');
+
+    $mem_free = $memory_pool['cpqHoPhysicalMemoryFree.0'];
+    $mem_capacity = $memory_pool['cpqHoPhysicalMemorySize.0'];
+    $page_free = $memory_pool['cpqHoPagingMemoryFree.0'];
+    $page_capacity = $memory_pool['cpqHoPagingMemorySize.0'];
+
+
+    if ((is_numeric($mem_free)) && (is_numeric($mem_capacity))) {
+        discover_mempool($valid_mempool, $device, 0, 'hpe-ilo', 'Physical Memory', '1', null, null);
+    }
+    if ((is_numeric($page_free)) && (is_numeric($page_capacity))) {
+        discover_mempool($valid_mempool, $device, 1, 'hpe-ilo', 'Paging Memory', '1', null, null);
+    }
+}
+
+unset(
+    $mem_free,
+    $mem_capacity,
+    $page_free,
+    $page_capacity
+);
diff --git a/includes/discovery/storage/hpe-ilo.inc.php b/includes/discovery/storage/hpe-ilo.inc.php
new file mode 100644
index 0000000000..41ff3127c0
--- /dev/null
+++ b/includes/discovery/storage/hpe-ilo.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+$ilo_storage = snmpwalk_group($device, 'cpqHoFileSysEntry', 'CPQHOST-MIB');
+$units = 1024*1024;
+
+if (is_array($ilo_storage)) {
+    echo 'HPE ILO4 ';
+    foreach ($ilo_storage as $index => $storage) {
+        $type = $storage['cpqHoFileSysDesc'];
+        preg_match_all("/\\[:(.*?)\\]/", $type, $matches);
+        $fstype = $matches[1][0];
+        $descr = $storage['cpqHoFileSysDesc'];
+        $size = $storage['cpqHoFileSysSpaceTotal'];
+        $used = $storage['cpqHoFileSysSpaceUsed'];
+        if (is_int($index)) {
+            discover_storage($valid_storage, $device, $index, $fstype, 'hpe-ilo', $descr, $size, $units, $used);
+        }
+        unset($deny, $fstype, $descr, $size, $used, $units, $storage_rrd, $old_storage_rrd, $hrstorage_array);
+    }
+}
diff --git a/includes/polling/mempools/hpe-ilo.inc.php b/includes/polling/mempools/hpe-ilo.inc.php
new file mode 100644
index 0000000000..eb9213bbaa
--- /dev/null
+++ b/includes/polling/mempools/hpe-ilo.inc.php
@@ -0,0 +1,29 @@
+<?php
+
+$data = snmp_get_multi_oid($device, 'cpqHoPhysicalMemorySize.0 cpqHoPhysicalMemoryFree.0 cpqHoPagingMemorySize.0 cpqHoPagingMemoryFree.0', '-OUQs', 'CPQHOST-MIB');
+$units = 1024*1024;
+
+if ($mempool['mempool_index'] == 0) {
+    $mem_capacity = $data['cpqHoPhysicalMemorySize.0'];
+    $mem_free = $data['cpqHoPhysicalMemoryFree.0'];
+
+    $mempool['total'] = $mem_capacity*$units;
+    $mempool['free']  = $mem_free*$units;
+    $mempool['used']  = $mempool['total'] - $mempool['free'];
+}
+
+if ($mempool['mempool_index'] == 1) {
+    $page_capacity = $data['cpqHoPagingMemorySize.0'];
+    $page_free = $data['cpqHoPagingMemoryFree.0'];
+
+    $mempool['total'] = $page_capacity*$units;
+    $mempool['free']  = $page_free*$units;
+    $mempool['used']  = $mempool['total'] - $mempool['free'];
+}
+
+unset(
+    $mem_free,
+    $mem_capacity,
+    $page_free,
+    $page_capacity
+);
diff --git a/includes/polling/storage/hpe-ilo.inc.php b/includes/polling/storage/hpe-ilo.inc.php
new file mode 100644
index 0000000000..15d81bb76d
--- /dev/null
+++ b/includes/polling/storage/hpe-ilo.inc.php
@@ -0,0 +1,14 @@
+%
+<?php
+
+if (!is_array($storage_cache['hpe-ilo'])) {
+    $storage_cache['hpe-ilo'] = snmpwalk_group($device, 'cpqHoFileSysEntry', 'CPQHOST-MIB');
+    echo("HPE ILO4 ");
+}
+
+$entry = $storage_cache['hpe-ilo'][$storage[storage_index]];
+
+$storage['units'] = 1024*1024;
+$storage['size'] = ($entry['cpqHoFileSysSpaceTotal'] * $storage['units']);
+$storage['used'] = ($entry['cpqHoFileSysSpaceUsed'] * $storage['units']);
+$storage['free'] = ($storage['size'] - $storage['used']);