From a6391ed3e8ff0155c9cf78e3efb0c878e08b875e Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 31 Mar 2017 04:01:40 +0100
Subject: [PATCH] fix: Update applications poller to use numeric oid instead of
 nsExtendOutputFull (#6277)

* fix: Update applications poller to use numeric oid instead of nsExtendOutputFull

* Accidental m
---
 includes/polling/applications/apache.inc.php          | 2 +-
 includes/polling/applications/fail2ban.inc.php        | 5 ++---
 includes/polling/applications/fbsd-nfs-client.inc.php | 5 ++---
 includes/polling/applications/fbsd-nfs-server.inc.php | 5 ++---
 includes/polling/applications/mailscanner.inc.php     | 2 +-
 includes/polling/applications/mysql.inc.php           | 4 ++--
 includes/polling/applications/nginx.inc.php           | 2 +-
 includes/polling/applications/nvidia.inc.php          | 5 ++---
 includes/polling/applications/php-fpm.inc.php         | 5 ++---
 includes/polling/applications/postfix.inc.php         | 9 ++++-----
 includes/polling/applications/postgres.inc.php        | 5 ++---
 includes/polling/applications/powerdns.inc.php        | 5 ++---
 includes/polling/applications/shoutcast.inc.php       | 2 +-
 includes/polling/applications/smart.inc.php           | 5 ++---
 includes/polling/applications/unbound.inc.php         | 2 +-
 15 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/includes/polling/applications/apache.inc.php b/includes/polling/applications/apache.inc.php
index 7ef76e4f6b..9e96735a7f 100644
--- a/includes/polling/applications/apache.inc.php
+++ b/includes/polling/applications/apache.inc.php
@@ -9,7 +9,7 @@ if (!empty($agent_data['app'][$name])) {
     $apache = $agent_data['app'][$name];
 } else {
     $options = '-O qv';
-    $oid     = 'nsExtendOutputFull.6.97.112.97.99.104.101';
+    $oid     = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.6.97.112.97.99.104.101';
     $apache  = snmp_get($device, $oid, $options);
     update_application($app, $apache);
 }
diff --git a/includes/polling/applications/fail2ban.inc.php b/includes/polling/applications/fail2ban.inc.php
index 765e8d30f9..56692089dc 100644
--- a/includes/polling/applications/fail2ban.inc.php
+++ b/includes/polling/applications/fail2ban.inc.php
@@ -8,9 +8,8 @@ $name = 'fail2ban';
 $app_id = $app['app_id'];
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.8.102.97.105.108.50.98.97.110';
-$new_component = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.102.97.105.108.50.98.97.110';
+$f2b = snmp_walk($device, $oid, $options);
 update_application($app, $new_component);
 
 $bannedStuff = explode("\n", $new_component);
diff --git a/includes/polling/applications/fbsd-nfs-client.inc.php b/includes/polling/applications/fbsd-nfs-client.inc.php
index 8a26340764..7d1cbeb4aa 100644
--- a/includes/polling/applications/fbsd-nfs-client.inc.php
+++ b/includes/polling/applications/fbsd-nfs-client.inc.php
@@ -5,9 +5,8 @@ $app_id = $app['app_id'];
 use LibreNMS\RRD\RrdDefinition;
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutLine.13.102.98.115.100.110.102.115.99.108.105.101.110.116';
-$nfsclient = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.4.1.2.13.102.98.115.100.110.102.115.99.108.105.101.110.116';
+$nfsclient = snmp_walk($device, $oid, $options);
 update_application($app, $nfsclient);
 
 list($getattr, $setattr, $lookup, $readlink, $read, $write, $create, $remove, $rename, $link, $symlink, $mkdir, $rmdir,
diff --git a/includes/polling/applications/fbsd-nfs-server.inc.php b/includes/polling/applications/fbsd-nfs-server.inc.php
index 1f3e98fd79..05b2ac0ddf 100644
--- a/includes/polling/applications/fbsd-nfs-server.inc.php
+++ b/includes/polling/applications/fbsd-nfs-server.inc.php
@@ -5,9 +5,8 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'fbsd-nfs-server';
 $app_id = $app['app_id'];
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutLine.13.102.98.115.100.110.102.115.115.101.114.118.101.114';
-$nfsserver = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.4.1.2.13.102.98.115.100.110.102.115.115.101.114.118.101.114';
+$nfsserver = snmp_walk($device, $oid, $options);
 update_application($app, $nfsserver);
 
 list($getattr, $setattr, $lookup, $readlink, $read, $write, $create, $remove, $rename, $link, $symlink,
diff --git a/includes/polling/applications/mailscanner.inc.php b/includes/polling/applications/mailscanner.inc.php
index 7a620307e8..60bea6b398 100644
--- a/includes/polling/applications/mailscanner.inc.php
+++ b/includes/polling/applications/mailscanner.inc.php
@@ -5,7 +5,7 @@
 use LibreNMS\RRD\RrdDefinition;
 
 $options      = '-O qv';
-$oid          = 'nsExtendOutputFull.11.109.97.105.108.115.99.97.110.110.101.114';
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.11.109.97.105.108.115.99.97.110.110.101.114';
 
 $mailscanner = snmp_get($device, $oid, $options);
 update_application($app, $mailscanner);
diff --git a/includes/polling/applications/mysql.inc.php b/includes/polling/applications/mysql.inc.php
index 1ba6c097f1..f2ca729ff9 100644
--- a/includes/polling/applications/mysql.inc.php
+++ b/includes/polling/applications/mysql.inc.php
@@ -9,8 +9,8 @@ if (!empty($agent_data['app'][$name])) {
     $mysql = $agent_data['app'][$name];
 } else {
     // Polls MySQL  statistics from script via SNMP
-    $mysql_cmd  = $config['snmpget'].' -m NET-SNMP-EXTEND-MIB -O qv '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port'];
-    $mysql_cmd .= ' nsExtendOutputFull.5.109.121.115.113.108';
+    $mysql_cmd  = $config['snmpget'].' -O qv '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port'];
+    $mysql_cmd .= '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.109.121.115.113.108';
     $mysql      = shell_exec($mysql_cmd);
 }
 
diff --git a/includes/polling/applications/nginx.inc.php b/includes/polling/applications/nginx.inc.php
index aae305d044..b55bbb3c00 100644
--- a/includes/polling/applications/nginx.inc.php
+++ b/includes/polling/applications/nginx.inc.php
@@ -8,7 +8,7 @@ if (!empty($agent_data['app'][$name])) {
     $nginx = $agent_data['app'][$name];
 } else {
     // Polls nginx statistics from script via SNMP
-    $nginx = snmp_get($device, 'nsExtendOutputFull.5.110.103.105.110.120', '-Ovq', 'NET-SNMP-EXTEND-MIB');
+    $nginx = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.110.103.105.110.120', '-Ovq');
 }
 update_application($app, $nginx);
 
diff --git a/includes/polling/applications/nvidia.inc.php b/includes/polling/applications/nvidia.inc.php
index b8fd2763e6..2a077e71c1 100644
--- a/includes/polling/applications/nvidia.inc.php
+++ b/includes/polling/applications/nvidia.inc.php
@@ -6,9 +6,8 @@ $name = 'nvidia';
 $app_id = $app['app_id'];
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.6.110.118.105.100.105.97';
-$gpus = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.6.110.118.105.100.105.97';
+$gpus = snmp_walk($device, $oid, $options);
 update_application($app, $gpus);
 
 $gpuArray = explode("\n", $gpus);
diff --git a/includes/polling/applications/php-fpm.inc.php b/includes/polling/applications/php-fpm.inc.php
index c52bce2283..480cbaca77 100644
--- a/includes/polling/applications/php-fpm.inc.php
+++ b/includes/polling/applications/php-fpm.inc.php
@@ -6,9 +6,8 @@ $name = 'php-fpm';
 $app_id = $app['app_id'];
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.8.112.104.112.102.112.109.115.112';
-$phpfpm = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.112.104.112.102.112.109.115.112';
+$phpfpm = snmp_walk($device, $oid, $options);
 update_application($app, $phpfpm);
 
 list($pool,$start_time,$start_since,$accepted_conn,$listen_queue,$max_listen_queue,$listen_queue_len,$idle_processes,
diff --git a/includes/polling/applications/postfix.inc.php b/includes/polling/applications/postfix.inc.php
index 1187a8066e..f13f4ab491 100644
--- a/includes/polling/applications/postfix.inc.php
+++ b/includes/polling/applications/postfix.inc.php
@@ -5,11 +5,10 @@ $app_id = $app['app_id'];
 use LibreNMS\RRD\RrdDefinition;
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$queueOID     = 'nsExtendOutputFull.5.109.97.105.108.113';
-$detailOID    = 'nsExtendOutputFull.15.112.111.115.116.102.105.120.100.101.116.97.105.108.101.100';
-$mailq = snmp_walk($device, $queueOID, $options, $mib);
-$detail= snmp_walk($device, $detailOID, $options, $mib);
+$queueOID     = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.109.97.105.108.113';
+$detailOID    = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.15.112.111.115.116.102.105.120.100.101.116.97.105.108.101.100';
+$mailq = snmp_walk($device, $queueOID, $options);
+$detail= snmp_walk($device, $detailOID, $options);
 update_application($app, $mailq);
 
 list($incomingq, $activeq, $deferredq, $holdq) = explode("\n", $mailq);
diff --git a/includes/polling/applications/postgres.inc.php b/includes/polling/applications/postgres.inc.php
index dd656d5dfb..bb886f40a8 100644
--- a/includes/polling/applications/postgres.inc.php
+++ b/includes/polling/applications/postgres.inc.php
@@ -5,9 +5,8 @@ $app_id = $app['app_id'];
 use LibreNMS\RRD\RrdDefinition;
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.8.112.111.115.116.103.114.101.115';
-$postgres = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.112.111.115.116.103.114.101.115';
+$postgres = snmp_walk($device, $oid, $options);
 update_application($app, $postgres);
 
 list($backends, $commits, $rollbacks, $read, $hit, $idxscan, $idxtupread, $idxtupfetch, $idxblksread,
diff --git a/includes/polling/applications/powerdns.inc.php b/includes/polling/applications/powerdns.inc.php
index 911ae1acb6..9127a68c36 100644
--- a/includes/polling/applications/powerdns.inc.php
+++ b/includes/polling/applications/powerdns.inc.php
@@ -5,15 +5,14 @@
 use LibreNMS\RRD\RrdDefinition;
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.8.112.111.119.101.114.100.110.115';
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.112.111.119.101.114.100.110.115';
 
 $name = 'powerdns';
 $app_id = $app['app_id'];
 if ($agent_data['app'][$name]) {
     $powerdns = $agent_data['app'][$name];
 } else {
-    $powerdns = snmp_get($device, $oid, $options, $mib);
+    $powerdns = snmp_get($device, $oid, $options);
 }
 update_application($app, $powerdns);
 
diff --git a/includes/polling/applications/shoutcast.inc.php b/includes/polling/applications/shoutcast.inc.php
index 25e84c0092..4c75bfdfe7 100644
--- a/includes/polling/applications/shoutcast.inc.php
+++ b/includes/polling/applications/shoutcast.inc.php
@@ -8,7 +8,7 @@ $name = 'shoutcast';
 $app_id = $app['app_id'];
 
 $options = '-O qv';
-$oid     = 'nsExtendOutputFull.9.115.104.111.117.116.99.97.115.116';
+$oid     = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.9.115.104.111.117.116.99.97.115.116';
 $shoutcast = snmp_get($device, $oid, $options);
 update_application($app, $shoutcast);
 
diff --git a/includes/polling/applications/smart.inc.php b/includes/polling/applications/smart.inc.php
index 6dddb07352..e2f928b3cf 100644
--- a/includes/polling/applications/smart.inc.php
+++ b/includes/polling/applications/smart.inc.php
@@ -8,9 +8,8 @@ $name = 'smart';
 $app_id = $app['app_id'];
 
 $options      = '-O qv';
-$mib          = 'NET-SNMP-EXTEND-MIB';
-$oid          = 'nsExtendOutputFull.5.115.109.97.114.116';
-$output = snmp_walk($device, $oid, $options, $mib);
+$oid          = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.115.109.97.114.116';
+$output = snmp_walk($device, $oid, $options);
 update_application($app, $output);
 
 $lines = explode("\n", $output);
diff --git a/includes/polling/applications/unbound.inc.php b/includes/polling/applications/unbound.inc.php
index d31ad74ad3..715e4e992d 100644
--- a/includes/polling/applications/unbound.inc.php
+++ b/includes/polling/applications/unbound.inc.php
@@ -9,7 +9,7 @@ if (!empty($agent_data['app'][$name])) {
     update_application($app, $rawdata);
 } else {
     $options = '-O qv';
-    $oid     = 'nsExtendOutputFull.7.117.110.98.111.117.110.100';
+    $oid     = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.7.117.110.98.111.117.110.100';
     $rawdata  = snmp_get($device, $oid, $options);
 }
 #Format Data