From 25bf55a172cc43c411953ec221993dcdfbe0984c Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 22 May 2015 08:52:16 -0300
Subject: [PATCH 1/4] Added FiiberHome Cpu Discovery/Poller Added Support

---
 .../discovery/processors/fiberhome.inc.php    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 includes/discovery/processors/fiberhome.inc.php

diff --git a/includes/discovery/processors/fiberhome.inc.php b/includes/discovery/processors/fiberhome.inc.php
new file mode 100644
index 000000000..7d24a473f
--- /dev/null
+++ b/includes/discovery/processors/fiberhome.inc.php
@@ -0,0 +1,21 @@
+<?php
+/**
+* Management Card(s) CPU usage
+*
+*/
+if ($device['os'] == "fiberhome") {
+    /**
+     * Check if Card is installed
+     */
+    $card1Status = snmp_get($device, "mgrCardWorkStatus.9", "-Ovq", "GEPON-OLT-COMMON-MIB");
+    $card2Status = snmp_get($device, "mgrCardWorkStatus.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
+    if($card1Status == '1'){
+        $usage = snmp_get($device, "mgrCardCpuUtil.9", "-Ovq", "GEPON-OLT-COMMON-MIB");
+        discover_processor($valid['processor'], $device, "GEPON-OLT-COMMON-MIB::mgrCardCpuUtil.9", "0", "fiberhome", "Hswa 9 Processor", "100", $usage/100, NULL, NULL);
+    };
+    if($card2Status == '1'){
+        $usage = snmp_get($device, "mgrCardCpuUtil.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
+        discover_processor($valid['processor'], $device, "GEPON-OLT-COMMON-MIB::mgrCardCpuUtil.10", "1", "fiberhome", "Hswa 10 Processor", "100", $usage/100, NULL, NULL);
+    };
+}
+?>

From 218636896ae36508634eaa15413da76569e604a1 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 22 May 2015 11:15:42 -0300
Subject: [PATCH 2/4] Added Fiberhome Mempools Discovery/Pooler

---
 includes/discovery/mempools/fiberhome.inc.php | 21 +++++++++++++++++++
 includes/polling/mempools/fiberhome.inc.php   | 17 +++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 includes/discovery/mempools/fiberhome.inc.php
 create mode 100644 includes/polling/mempools/fiberhome.inc.php

diff --git a/includes/discovery/mempools/fiberhome.inc.php b/includes/discovery/mempools/fiberhome.inc.php
new file mode 100644
index 000000000..f31109f54
--- /dev/null
+++ b/includes/discovery/mempools/fiberhome.inc.php
@@ -0,0 +1,21 @@
+<?php
+/**
+* Management Card(s) Memory usage
+*
+*/
+if ($device['os'] == "fiberhome") {
+    /**
+    * Check if Card is installed
+    */
+    $card1Status = snmp_get($device, "mgrCardWorkStatus.9", "-Ovq", "GEPON-OLT-COMMON-MIB");
+    $card2Status = snmp_get($device, "mgrCardWorkStatus.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
+    if($card1Status == '1'){
+        $usage = snmp_get($device, "mgrCardMemUtil.9", "-Ovq", "GEPON-OLT-COMMON-MIB");
+        discover_mempool($valid_mempool, $device, 9 , "fiberhome", "Hswa 9 Memory", "100", NULL, NULL);
+    };
+    if($card2Status == '1'){
+        $usage = snmp_get($device, "mgrCardMemUtil.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
+        discover_mempool($valid_mempool, $device, 10 , "fiberhome", "Hswa 10 Memory", "100", NULL, NULL);
+    };
+}
+?>
diff --git a/includes/polling/mempools/fiberhome.inc.php b/includes/polling/mempools/fiberhome.inc.php
new file mode 100644
index 000000000..95f5dc7a1
--- /dev/null
+++ b/includes/polling/mempools/fiberhome.inc.php
@@ -0,0 +1,17 @@
+<?php
+/**
+* Memory percent
+*/
+$cardIndex = "mgrCardMemUtil.".$mempool['mempool_index'];
+$usage = snmp_get($device, $cardIndex, "-Ovq", "GEPON-OLT-COMMON-MIB");
+$perc = round($usage/100);
+/**
+* Manual memory 256Mb on each board
+*/
+$memory_available = 256*pow(1024,2);
+$mempool['total'] = $memory_available;
+if (is_numeric($perc)){
+    $mempool['used'] = $memory_available / 100 * $perc;
+    $mempool['free'] = $memory_available - $mempool['used'];
+}
+?>

From 1d245053b1d36968a916ecc42be1b59721dc0a7f Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 22 May 2015 15:46:11 -0300
Subject: [PATCH 3/4] Removed ?> tag on non template file (Best Pratices)

---
 includes/discovery/mempools/fiberhome.inc.php   | 1 -
 includes/discovery/processors/fiberhome.inc.php | 1 -
 includes/polling/mempools/fiberhome.inc.php     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/includes/discovery/mempools/fiberhome.inc.php b/includes/discovery/mempools/fiberhome.inc.php
index f31109f54..f7148b091 100644
--- a/includes/discovery/mempools/fiberhome.inc.php
+++ b/includes/discovery/mempools/fiberhome.inc.php
@@ -18,4 +18,3 @@ if ($device['os'] == "fiberhome") {
         discover_mempool($valid_mempool, $device, 10 , "fiberhome", "Hswa 10 Memory", "100", NULL, NULL);
     };
 }
-?>
diff --git a/includes/discovery/processors/fiberhome.inc.php b/includes/discovery/processors/fiberhome.inc.php
index 7d24a473f..ec9b554ea 100644
--- a/includes/discovery/processors/fiberhome.inc.php
+++ b/includes/discovery/processors/fiberhome.inc.php
@@ -18,4 +18,3 @@ if ($device['os'] == "fiberhome") {
         discover_processor($valid['processor'], $device, "GEPON-OLT-COMMON-MIB::mgrCardCpuUtil.10", "1", "fiberhome", "Hswa 10 Processor", "100", $usage/100, NULL, NULL);
     };
 }
-?>
diff --git a/includes/polling/mempools/fiberhome.inc.php b/includes/polling/mempools/fiberhome.inc.php
index 95f5dc7a1..0aea47356 100644
--- a/includes/polling/mempools/fiberhome.inc.php
+++ b/includes/polling/mempools/fiberhome.inc.php
@@ -14,4 +14,3 @@ if (is_numeric($perc)){
     $mempool['used'] = $memory_available / 100 * $perc;
     $mempool['free'] = $memory_available - $mempool['used'];
 }
-?>

From 75aab599eec298072a15b88a223c8a955c5c5fa6 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Mon, 25 May 2015 11:37:43 -0300
Subject: [PATCH 4/4] Changed Mib to Numeric OID on cpu discovery

---
 includes/discovery/processors/fiberhome.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/discovery/processors/fiberhome.inc.php b/includes/discovery/processors/fiberhome.inc.php
index ec9b554ea..b87ba0b89 100644
--- a/includes/discovery/processors/fiberhome.inc.php
+++ b/includes/discovery/processors/fiberhome.inc.php
@@ -11,10 +11,10 @@ if ($device['os'] == "fiberhome") {
     $card2Status = snmp_get($device, "mgrCardWorkStatus.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
     if($card1Status == '1'){
         $usage = snmp_get($device, "mgrCardCpuUtil.9", "-Ovq", "GEPON-OLT-COMMON-MIB");
-        discover_processor($valid['processor'], $device, "GEPON-OLT-COMMON-MIB::mgrCardCpuUtil.9", "0", "fiberhome", "Hswa 9 Processor", "100", $usage/100, NULL, NULL);
+        discover_processor($valid['processor'], $device, "1.3.6.1.4.1.5875.800.3.9.8.1.1.5.9", "0", "fiberhome", "Hswa 9 Processor", "100", $usage/100, NULL, NULL);
     };
     if($card2Status == '1'){
         $usage = snmp_get($device, "mgrCardCpuUtil.10", "-Ovq", "GEPON-OLT-COMMON-MIB");
-        discover_processor($valid['processor'], $device, "GEPON-OLT-COMMON-MIB::mgrCardCpuUtil.10", "1", "fiberhome", "Hswa 10 Processor", "100", $usage/100, NULL, NULL);
+        discover_processor($valid['processor'], $device, "1.3.6.1.4.1.5875.800.3.9.8.1.1.5.10", "1", "fiberhome", "Hswa 10 Processor", "100", $usage/100, NULL, NULL);
     };
 }