From 51cb9ef3d10924fb7c97339e7d81f60533f31c45 Mon Sep 17 00:00:00 2001
From: Xavier Beaudouin <xbeaudouin@gmail.com>
Date: Thu, 3 Mar 2016 15:52:44 +0100
Subject: [PATCH] Initial Gandi Packet Journey support

---
 html/images/os/gandi.png                         | Bin 0 -> 1730 bytes
 includes/definitions.inc.php                     |  12 ++++++++++++
 includes/discovery/os/linux.inc.php              |  14 ++++++++++++++
 .../sensors/fanspeeds/lmsensors.inc.php          |   2 +-
 .../sensors/temperatures/lm-sensors.inc.php      |   2 +-
 .../discovery/sensors/voltages/linux.inc.php     |   2 +-
 6 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 html/images/os/gandi.png

diff --git a/html/images/os/gandi.png b/html/images/os/gandi.png
new file mode 100644
index 0000000000000000000000000000000000000000..25f0db3b62c37a7b003a7377237d1427a90827bc
GIT binary patch
literal 1730
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
Y7b`j!FL-^#vH$=807*qoM6N<$g3z})8vp<R

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index f6a760d6d..2e4cdb8aa 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -228,6 +228,18 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'pktj';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['group']            = 'unix';
+$config['os'][$os]['text']             = 'Gandi Packet Journey';
+$config['os'][$os]['icon']             = 'gandi';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Other Unix-based OSes here please.
 $os = 'freebsd';
 $config['os'][$os]['type']  = 'server';
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 4d49d25e0..7a48938be 100644
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -50,6 +50,20 @@ if (!$os) {
                 $os = 'airos-af';
             }
         }
+        else if (trim(snmp_get($device, 'GANDI-MIB::rxCounter.0', '-Osqnv', 'GANDI-MIB')) != '') {
+            $os = 'pktj';
+            $pktj_mibs = array (
+               "rxCounter"       => "GANDI-MIB",  // RX Packets
+               "txCounter"       => "GANDI-MIB",  // TX Packets
+               "dropCounter"     => "GANDI-MIB",  // Dropped counters
+               "acldropCounter"  => "GANDI-MIB",  // ACL Dropped counter
+               "ratedropCounter" => "GANDI-MIB",  // Rate Dropped counter
+               "KNIrxCounter"    => "GANDI-MIB",  // KNI RX counter
+               "KNItxCounter"    => "GANDI-MIB",  // KNI TX counter
+               "KNIdropCounter"  => "GANDI-MIB",  // KNI DROP counter
+            );
+            register_mibs($device, $pktj_mibs, "include/discovery/os/linux.inc.php");
+        }
         else {
             // Check for Synology DSM
             $hrSystemInitialLoadParameters = trim(snmp_get($device, 'HOST-RESOURCES-MIB::hrSystemInitialLoadParameters.0', '-Osqnv'));
diff --git a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
index 8e288e73d..5396eeccb 100644
--- a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
+++ b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // LMSensors Fanspeeds
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmFanSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB');
     d_echo($oids."\n");
 
diff --git a/includes/discovery/sensors/temperatures/lm-sensors.inc.php b/includes/discovery/sensors/temperatures/lm-sensors.inc.php
index 1482b356c..0072b2342 100644
--- a/includes/discovery/sensors/temperatures/lm-sensors.inc.php
+++ b/includes/discovery/sensors/temperatures/lm-sensors.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmTempSensorsDevice', '-Osqn', 'LM-SENSORS-MIB');
     d_echo($oids."\n");
 
diff --git a/includes/discovery/sensors/voltages/linux.inc.php b/includes/discovery/sensors/voltages/linux.inc.php
index 061594ede..6a2b1bdfd 100644
--- a/includes/discovery/sensors/voltages/linux.inc.php
+++ b/includes/discovery/sensors/voltages/linux.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // LMSensors Voltages
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmVoltSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB');
     d_echo($oids."\n");