Merge pull request #3064 from murrant/netonix_updates

Netonix Update

includes/discovery/mempools/netonix.inc.php

@@ -0,0 +1,22 @@
+<?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
+
+if ($device['os'] == 'netonix') {
+    echo 'NETONIX : ';
+
+    $free = str_replace('"', "", snmp_get($device, 'UCD-SNMP-MIB::memTotalFree.0', '-OvQU'));
+
+    if (is_numeric($free)) {
+        discover_mempool($valid_mempool, $device, 0, 'netonix', 'Memory', '1024');
+    }
+}

includes/discovery/os/netonix.inc.php

@@ -1,4 +1,16 @@
 <?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
+
 if (!$os) {
     if (strstr($sysObjectId, '.1.3.6.1.4.1.46242')) {
         $os = 'netonix';

includes/discovery/processors/netonix.inc.php

@@ -0,0 +1,12 @@
+<?php
+if ($device['os'] == 'netonix') {
+    echo 'NETONIX : ';
+
+//    $system = snmp_get($device, 'ssCpuSystem.0', '-OvQ', 'UCD-SNMP-MIB');
+//    $user   = snmp_get($device, 'ssCpuUser.0', '-OvQ', 'UCD-SNMP-MIB');
+    $idle   = snmp_get($device, 'ssCpuIdle.0', '-OvQ', 'UCD-SNMP-MIB');
+
+    if (is_numeric($idle)) {
+        discover_processor($valid['processor'], $device, 0, 0, 'ucd-old', 'CPU', '1', (100 - $idle));
+    }
+}

includes/discovery/sensors/fanspeeds/netonix.inc.php

@@ -1,4 +1,15 @@
 <?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
 
 // Netonix Fan Speeds
 if ($device['os'] == 'netonix') {
@@ -7,7 +18,7 @@ if ($device['os'] == 'netonix') {
     if (is_array($oids)) {
         foreach ($oids as $index => $entry) {
             if (is_numeric($entry['fanSpeed']) && is_numeric($index)) {
-                $descr   = $index;
+                $descr   = "Fan ".$index;
                 $oid     = '.1.3.6.1.4.1.46242.2.1.2.'.$index;
                 $current = $entry['fanSpeed'];
                 discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', '0', '0', null, null, $current);

includes/discovery/sensors/temperatures/netonix.inc.php

@@ -1,4 +1,15 @@
 <?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
 
 // Netonix Temperatures
 if ($device['os'] == 'netonix') {

includes/discovery/sensors/voltages/netonix.inc.php

@@ -1,4 +1,15 @@
 <?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
 
 // Netonix Voltages
 if ($device['os'] == 'netonix') {

includes/polling/mempools/netonix.inc.php

@@ -0,0 +1,22 @@
+<?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
+
+if ($device['os'] == 'netonix') {
+    $total = snmp_get($device, "UCD-SNMP-MIB::memTotalReal.0", "-OvQU") * 1024;
+    $free = snmp_get($device, "UCD-SNMP-MIB::memAvailReal.0", "-OvQU") * 1024;
+
+    $mempool['total'] = $total;
+    $mempool['free']  = $free;
+    $mempool['used']  = $total - $free;
+
+}

includes/polling/os/netonix.inc.php

@@ -1,3 +1,16 @@
 <?php
+  /*
+   * LibreNMS module for Netonix
+   *
+   * Copyright (c) 2016 Tony Murray <murraytony@gmail.com>
+   *
+   * This program is free software: you can redistribute it and/or modify it
+   * under the terms of the GNU General Public License as published by the
+   * Free Software Foundation, either version 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
+
 $version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', $config['mibdir'].':'.$config['mibdir'].'/netonix');
+$version = str_replace('.n.........', '', $version); // version display bug in 1.3.9
 $hardware = $poll_device['sysDescr'];