Add additional F5 sensor support #4642

boudreau · 2016-09-27T17:46:56Z

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Have you signed the Contributors agreement
Have you followed our code guidelines?

LibreNMS-CI · 2016-09-27T17:50:07Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

murrant

Please check the comments I made in all places.

I just made this PR, should be an ok example for keeping things tidy.
#4640

murrant · 2016-09-27T17:48:58Z

includes/discovery/sensors/states/f5.inc.php

+            }
+        }
+
+      foreach (array_keys($temp) as $index) {


You can do foreach($temp as $index => $data) here.

murrant · 2016-09-27T17:49:26Z

includes/discovery/sensors/states/f5.inc.php

+
+      foreach (array_keys($temp) as $index) {
+          $descr           = "sysChassisPowerSupplyStatus.".$temp[$index]['sysChassisPowerSupplyIndex'];
+          $current         = $temp[$index]['sysChassisPowerSupplyStatus'];


and $current = $data['sysChassisPowerSupplyStatus']; here

murrant · 2016-09-27T17:51:08Z

includes/discovery/sensors/states/f5.inc.php

+          $current         = $temp[$index]['sysChassisPowerSupplyStatus'];
+          $sensorType      = 'f5';
+          $oid             = '1.3.6.1.4.1.3375.2.1.3.2.2.2.1.2.'.$index;
+          $oid_status	 = snmp_get($device, $oid, '-Oqv');


Remove this line, it is unused and causes many extra snmp_get() calls

laf · 2016-09-27T19:41:58Z

Also lots of formatting issues, please see our docs about running pre-commit checks.

LibreNMS-CI · 2016-09-28T15:03:45Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

LibreNMS-CI · 2016-09-28T16:03:45Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

laf · 2016-09-28T21:48:21Z

includes/defaults.inc.php

@@ -703,7 +703,9 @@
 $config['poller_modules']['cisco-mac-accounting']        = 1;
 $config['poller_modules']['cipsec-tunnels']              = 1;
 $config['poller_modules']['cisco-ace-loadbalancer']      = 1;
+$config['poller_modules']['F5-loadbalancer']             = 1;


Not sure you've added these in. They aren't poller modules.

laf · 2016-09-28T21:48:28Z

includes/defaults.inc.php

 $config['poller_modules']['cisco-ace-serverfarms']       = 1;
+$config['poller_modules']['F5-serverfarms']              = 1;


Same goes for this.

laf · 2016-09-28T21:50:02Z

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

+            $split_oid        = explode('.', $oid);
+            $index            = $split_oid[(count($split_oid) - 1)];
+            $descr            = 'Fan Speed '.$index;
+            $oid              = '1.3.6.1.4.1.3375.2.1.3.2.1.2.1.3.'.$index;


This should start with a . - .1.3.6

laf · 2016-09-28T21:50:12Z

includes/discovery/sensors/states/f5.inc.php

+            $descr           = "sysChassisPowerSupplyStatus.".$temp[$index]['sysChassisPowerSupplyIndex'];
+            $current         = $data['sysChassisPowerSupplyStatus'];
+            $sensorType      = 'f5';
+            $oid             = '1.3.6.1.4.1.3375.2.1.3.2.2.2.1.2.'.$index;


This should start with a . - .1.3.6

laf · 2016-09-28T21:50:20Z

includes/discovery/sensors/states/f5.inc.php

+            $descr           = "sysCmFailoverStatusId.".$temp1[$index]['sysCmFailoverStatusId'];
+            $current         = $temp1[$index]['sysCmFailoverStatusId'];
+            $sensorType      = 'f5';
+            $oid             = '1.3.6.1.4.1.3375.2.1.14.3.1.'.$index;


This should start with a . - .1.3.6

laf · 2016-09-28T21:50:28Z

includes/discovery/sensors/states/f5.inc.php

+            $descr           = "sysCmFailoverStatusColor.".$index;
+            $current         = $temp1[$index]['sysCmFailoverStatusColor'];
+            $sensorType      = 'f5';
+            $oid             = '1.3.6.1.4.1.3375.2.1.14.3.3.'.$index;


This should start with a . - .1.3.6

laf · 2016-09-28T21:50:35Z

includes/discovery/sensors/states/f5.inc.php

+            $descr           = "Fan Speed Status ".$index;
+            $current         = $temp3[$index]['sysChassisFanStatus'];
+            $sensorType      = 'f5';
+            $oid             = '1.3.6.1.4.1.3375.2.1.3.2.1.2.1.2.'.$index;


This should start with a . - .1.3.6

LibreNMS-CI · 2016-09-29T13:34:09Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

boudreau · 2016-09-29T13:36:28Z

Hi,

Sorry, got mixed up with another project, no changes should be applied on the includes/defaults.inc.phphttps://github.com//pull/4642#pullrequestreview-2036461: file.

I added the missing ‘.’ on the OIDs.

Thanks

Yves

LibreNMS-CI · 2016-09-29T13:36:32Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

LibreNMS-CI · 2016-09-29T13:38:33Z

Auto-Deploy finished, Test PR at http://4642.ci.librenms.org or https://4642.ci.librenms.org

Rosiak · 2016-10-01T08:39:25Z

Sorry to bother again, but would it be possible to clean up the state sensor code?
You should be able to use includes/discovery/sensors/states/cisco.inc.php as an example.

laf · 2016-10-03T15:50:55Z

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

+            $index            = $split_oid[(count($split_oid) - 1)];
+            $descr            = 'Fan Speed '.$index;
+            $oid              = '.1.3.6.1.4.1.3375.2.1.3.2.1.2.1.3.'.$index;
+            $fanspeed         = (snmp_get($device, $oid, '-Oqv') / $divisor);


Haven't we got fanspeed from the sysChassisFanSpeed walk?

Not sure, I'm following?
I did the same code structure as in dell.inc.php in includes/discovery/sensors/fanspeeds.
It also looks the same in the lmsensors.inc.php. They snmp_walk and then it snmp_get ?

laf · 2016-10-03T15:56:16Z

includes/discovery/sensors/states/f5.inc.php

+            $current         = $temp1[$index]['sysCmFailoverStatusColor'];
+            $sensorType      = 'f5';
+            $oid             = '.1.3.6.1.4.1.3375.2.1.14.3.3.'.$index;
+            $oid_status    = snmp_get($device, $oid, '-Oqev');


Don't we have that from the snmpwalk of sysCmFailoverStatusColor

laf · 2016-10-03T15:57:36Z

includes/discovery/sensors/states/f5.inc.php

+            $descr           = "sysCmFailoverStatusId.".$temp1[$index]['sysCmFailoverStatusId'];
+            $current         = $temp1[$index]['sysCmFailoverStatusId'];
+            $sensorType      = 'f5';
+            $oid             = '.1.3.6.1.4.1.3375.2.1.14.3.1.'.$index;


Again don't we have this value from the walk already?

laf · 2016-10-03T15:59:00Z

includes/discovery/sensors/states/f5.inc.php

+            $sensorType      = 'f5';
+            $oid             = '.1.3.6.1.4.1.3375.2.1.3.2.1.2.1.2.'.$index;
+            $oid_status    = snmp_get($device, $oid, '-Oqv');
+            discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, '1', '1', null, null, null, null, $current, 'snmp', $index);


Don't we have this value already from the snmpwalk?

laf · 2016-10-03T16:00:37Z

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

-    $entphydata = dbFetchRows("SELECT `entPhysicalIndex`, `entPhysicalClass`, `entPhysicalName` FROM `entPhysical` WHERE `device_id` = ? AND `entPhysicalClass` REGEXP 'module|sensor' ORDER BY `entPhysicalIndex`", array(
-        $device['device_id']
-    ));
+    $entphydata = dbFetchRows(


The formatting of this seems unnecessary.

laf · 2016-10-03T16:00:43Z

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

@@ -36,10 +38,12 @@
    foreach ($comware_oids as $index => $entry) {
        if (is_numeric($entry['hh3cTransceiverTemperature']) && $entry['hh3cTransceiverTemperature'] != 2147483647) {
            $oid                       = '.1.3.6.1.4.1.25506.2.70.1.1.1.15.' . $index;
-            $dbquery                   = dbFetchRows("SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ? AND `ifAdminStatus` = 'up'", array(
-                $index,
+            $dbquery                   = dbFetchRows(


The formatting of this seems unnecessary.

laf · 2016-10-03T16:01:30Z

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

+            $current         = $f5[$index]['sysChassisTempTemperature'];
+            $sensorType      = 'f5';
+            $oid             = '.1.3.6.1.4.1.3375.2.1.3.2.3.2.1.2.'.$index;
+            $low_limit       =  null;


This seems unnecessary to set all these variables when they are only ever null, just pass null to the function.

laf · 2016-10-03T16:02:15Z

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

+<?php
+
+if ($device['os'] == 'f5') {
+    $f5 = null;


should be $f5 = array()``or better yet$f5_chassis = array();`

laf · 2016-10-03T16:02:34Z

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

+    }
+
+    // Get the CPU Temperature values
+    $f5cpu = null;


Should be $f5_cpu = array();

laf · 2016-10-03T16:03:33Z

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

+    // Get the CPU Temperature values
+    $f5cpu = null;
+    //    $f5cpu = snmpwalk_cache_oid($device, 'sysCpuSensorTemperature', array(), 'F5-BIGIP-SYSTEM-MIB');
+    $f5cpu = snmpwalk_cache_multi_oid($device, 'sysCpuSensorTemperature', array(), 'F5-BIGIP-SYSTEM-MIB');


Seems more appropriate to walk sysCpuSensorEntry so you don't need the other two snmp_get()'s

laf · 2016-10-03T16:04:14Z

I've put some comments in this. Please also remove the .txt extension from all MIBs.

laf · 2016-10-11T06:44:26Z

bump @boudreau

…sue-4599 make up to date

scrutinizer-notifier · 2016-10-13T20:33:22Z

The inspection completed: 10 new issues

boudreau added 5 commits September 26, 2016 09:34

added recent F5 mibs ver 11.6

5352553

F5 temp discovery module done

0fad272

changed desc of sensors in DB

c8d29a9

added fanspeed and Power states

975adf9

Added other sensors states

79388cf

murrant reviewed Sep 27, 2016

View reviewed changes

laf changed the title ~~Issue 4599~~ Add additional F5 sensor support Sep 27, 2016

laf added Conflict Blocker 🚫 and removed Conflict labels Sep 27, 2016

Update f5.inc.php

2651669

boudreau added 2 commits September 28, 2016 11:53

modified for CS Style and recommendation

61394b4

Update defaults.inc.php

9d87695

laf requested changes Sep 28, 2016

View reviewed changes

boudreau added 3 commits September 29, 2016 09:31

Update f5.inc.php

4d80d8f

Update f5.inc.php

86b74ca

missing '.' at start of the OIDs

a409ae2

laf removed the Blocker 🚫 label Oct 3, 2016

laf requested changes Oct 3, 2016

View reviewed changes

laf added the Blocker 🚫 label Oct 3, 2016

boudreau and others added 13 commits October 11, 2016 11:22

Rename F5-EM-MIB.txt to F5-EM-MIB

74380e3

Rename F5-BIGIP-APM-MIB.txt to F5-BIGIP-APM-MIB

7ccb911

Rename F5-BIGIP-WAM-MIB.txt to F5-BIGIP-WAM-MIB

b42059d

Rename F5-BIGIP-LOCAL-MIB.txt to F5-BIGIP-LOCAL-MIB

7dbfcf5

Rename F5-BIGIP-COMMON-MIB.txt to F5-BIGIP-COMMON-MIB

9c3ff6a

Rename F5-BIGIP-GLOBAL-MIB.txt to F5-BIGIP-GLOBAL-MIB

d1711bf

Rename F5-BIGIP-SYSTEM-MIB.txt to F5-BIGIP-SYSTEM-MIB

e53faea

changes requested

144b222

Changes requested

7d254cd

Merge branch 'master' of https://github.com/librenms/librenms into is…

94d76b0

…sue-4599 make up to date

syntax error

7741907

modified state f5

3630505

Formatting updates

e380fca

laf added Device 🖥️ New or added device support and removed Blocker 🚫 labels Oct 13, 2016

laf approved these changes Oct 13, 2016

View reviewed changes

laf merged commit 5669dce into librenms:master Oct 13, 2016

boudreau deleted the issue-4599 branch October 19, 2016 11:46

lock bot locked as resolved and limited conversation to collaborators Jan 21, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add additional F5 sensor support #4642

Add additional F5 sensor support #4642

boudreau commented Sep 27, 2016 •

edited

LibreNMS-CI commented Sep 27, 2016

murrant left a comment

murrant Sep 27, 2016

murrant Sep 27, 2016

murrant Sep 27, 2016

laf commented Sep 27, 2016

LibreNMS-CI commented Sep 28, 2016

LibreNMS-CI commented Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

laf Sep 28, 2016

LibreNMS-CI commented Sep 29, 2016

boudreau commented Sep 29, 2016 •

edited

LibreNMS-CI commented Sep 29, 2016

LibreNMS-CI commented Sep 29, 2016

Rosiak commented Oct 1, 2016

laf Oct 3, 2016

boudreau Oct 11, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf Oct 3, 2016

laf commented Oct 3, 2016

laf commented Oct 11, 2016

scrutinizer-notifier commented Oct 13, 2016

		$config['poller_modules']['cisco-ace-serverfarms'] = 1;
		$config['poller_modules']['F5-serverfarms'] = 1;

Add additional F5 sensor support #4642

Add additional F5 sensor support #4642

Conversation

boudreau commented Sep 27, 2016 • edited

Please note

LibreNMS-CI commented Sep 27, 2016

murrant left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laf commented Sep 27, 2016

LibreNMS-CI commented Sep 28, 2016

LibreNMS-CI commented Sep 28, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LibreNMS-CI commented Sep 29, 2016

boudreau commented Sep 29, 2016 • edited

LibreNMS-CI commented Sep 29, 2016

LibreNMS-CI commented Sep 29, 2016

Rosiak commented Oct 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laf commented Oct 3, 2016

laf commented Oct 11, 2016

scrutinizer-notifier commented Oct 13, 2016

boudreau commented Sep 27, 2016 •

edited

boudreau commented Sep 29, 2016 •

edited