From 8a6f158ab8ab9f9c2a37bda4e79374a90a2f43f6 Mon Sep 17 00:00:00 2001
From: Mark Westerterp <1002588+westerterp@users.noreply.github.com>
Date: Thu, 6 Jan 2022 12:08:52 +0100
Subject: [PATCH] fix: Add consistent output of name and app_id to Poller for
 all Applications (fixes #13641) (#13648)

* Add echo of name and app_id to all Applications

* Make echo not application specifc

* Fix echo

* Do spaces make StyleCI happy?

* Not spaces, but the type of quotes makes StyleCI happy
---
 includes/polling/applications.inc.php                   | 3 ++-
 includes/polling/applications/apache.inc.php            | 3 +--
 includes/polling/applications/asterisk.inc.php          | 2 --
 includes/polling/applications/bind.inc.php              | 2 --
 includes/polling/applications/ceph.inc.php              | 3 ++-
 includes/polling/applications/chronyd.inc.php           | 2 --
 includes/polling/applications/drbd.inc.php              | 2 +-
 includes/polling/applications/exim-stats.inc.php        | 2 --
 includes/polling/applications/fail2ban.inc.php          | 2 --
 includes/polling/applications/fbsd-nfs-client.inc.php   | 2 --
 includes/polling/applications/fbsd-nfs-server.inc.php   | 2 --
 includes/polling/applications/freeradius.inc.php        | 2 --
 includes/polling/applications/freeswitch.inc.php        | 1 +
 includes/polling/applications/gpsd.inc.php              | 2 --
 includes/polling/applications/icecast.inc.php           | 2 --
 includes/polling/applications/mailcow-postfix.inc.php   | 2 --
 includes/polling/applications/mailscanner.inc.php       | 6 ++----
 includes/polling/applications/memcached.inc.php         | 1 +
 includes/polling/applications/mysql.inc.php             | 1 -
 includes/polling/applications/nfs-server.inc.php        | 5 +----
 includes/polling/applications/nfs-stats.inc.php         | 2 --
 includes/polling/applications/nfs-v3-stats.inc.php      | 2 --
 includes/polling/applications/nginx.inc.php             | 3 +--
 includes/polling/applications/ntp-client.inc.php        | 2 --
 includes/polling/applications/ntp-server.inc.php        | 2 --
 includes/polling/applications/opensips.inc.php          | 2 --
 includes/polling/applications/portactivity.inc.php      | 2 --
 includes/polling/applications/postfix.inc.php           | 4 ++--
 includes/polling/applications/postgres.inc.php          | 6 ++----
 includes/polling/applications/powerdns-dnsdist.inc.php  | 2 --
 includes/polling/applications/powerdns-recursor.inc.php | 2 --
 includes/polling/applications/powerdns.inc.php          | 1 -
 includes/polling/applications/powermon.inc.php          | 2 --
 includes/polling/applications/proxmox.inc.php           | 6 +++---
 includes/polling/applications/rrdcached.inc.php         | 2 --
 includes/polling/applications/sdfsinfo.inc.php          | 2 --
 includes/polling/applications/shoutcast.inc.php         | 2 --
 includes/polling/applications/smart.inc.php             | 2 --
 includes/polling/applications/tinydns.inc.php           | 1 +
 includes/polling/applications/unbound.inc.php           | 1 +
 includes/polling/applications/ups-apcups.inc.php        | 2 --
 includes/polling/applications/ups-nut.inc.php           | 2 --
 includes/polling/applications/voip-monitor.inc.php      | 2 --
 includes/polling/applications/zfs.inc.php               | 2 --
 44 files changed, 21 insertions(+), 82 deletions(-)

diff --git a/includes/polling/applications.inc.php b/includes/polling/applications.inc.php
index 042f5fc86d..4639179d9e 100644
--- a/includes/polling/applications.inc.php
+++ b/includes/polling/applications.inc.php
@@ -4,11 +4,12 @@ $app_rows = dbFetchRows('SELECT * FROM `applications` WHERE `device_id`  = ?', [
 
 if (count($app_rows) > 0) {
     foreach ($app_rows as $app) {
+        echo 'Application: ' . $app['app_type'] . ', app_id=' . $app['app_id'];
         $app_include = \LibreNMS\Config::get('install_dir') . '/includes/polling/applications/' . $app['app_type'] . '.inc.php';
         if (is_file($app_include)) {
             include $app_include;
         } else {
-            echo $app['app_type'] . ' include missing! ';
+            echo 'ERROR: ' . $app_include . ' include file missing!';
         }
     }
     echo "\n";
diff --git a/includes/polling/applications/apache.inc.php b/includes/polling/applications/apache.inc.php
index 33dcee693b..b7451164cf 100644
--- a/includes/polling/applications/apache.inc.php
+++ b/includes/polling/applications/apache.inc.php
@@ -5,6 +5,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'apache';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data['app'][$name])) {
     $apache = $agent_data['app'][$name];
 } else {
@@ -13,8 +14,6 @@ if (! empty($agent_data['app'][$name])) {
     $apache = snmp_get($device, $oid, $options);
 }
 
-echo ' apache';
-
 [$total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec,
     $bytesperreq, $busyworkers, $idleworkers, $score_wait, $score_start,
     $score_reading, $score_writing, $score_keepalive, $score_dns,
diff --git a/includes/polling/applications/asterisk.inc.php b/includes/polling/applications/asterisk.inc.php
index 7977e2cba6..395313ecbf 100644
--- a/includes/polling/applications/asterisk.inc.php
+++ b/includes/polling/applications/asterisk.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'asterisk';
 $app_id = $app['app_id'];
 
-echo "$name, app_id=$app_id ";
-
 if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
diff --git a/includes/polling/applications/bind.inc.php b/includes/polling/applications/bind.inc.php
index febf82dd69..1e6174dcb9 100644
--- a/includes/polling/applications/bind.inc.php
+++ b/includes/polling/applications/bind.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'bind';
 $app_id = $app['app_id'];
 
-echo " $name";
-
 if (! empty($agent_data['app'][$name])) {
     $bind = $agent_data['app'][$name];
 } else {
diff --git a/includes/polling/applications/ceph.inc.php b/includes/polling/applications/ceph.inc.php
index 2a69d99062..84e7d17cd6 100644
--- a/includes/polling/applications/ceph.inc.php
+++ b/includes/polling/applications/ceph.inc.php
@@ -3,9 +3,10 @@
 use LibreNMS\RRD\RrdDefinition;
 
 $name = 'ceph';
+$app_id = $app['app_id'];
+
 if (! empty($agent_data['app'][$name])) {
     $ceph_data = $agent_data['app'][$name];
-    $app_id = $app['app_id'];
 
     $metrics = [];
     foreach (explode('<', $ceph_data) as $section) {
diff --git a/includes/polling/applications/chronyd.inc.php b/includes/polling/applications/chronyd.inc.php
index 6df3250e0b..aab6f378e6 100644
--- a/includes/polling/applications/chronyd.inc.php
+++ b/includes/polling/applications/chronyd.inc.php
@@ -6,8 +6,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'chronyd';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $chronyd = json_app_get($device, $name, 1)['data'];
 } catch (JsonAppException $e) {
diff --git a/includes/polling/applications/drbd.inc.php b/includes/polling/applications/drbd.inc.php
index ab1a7dc2df..5f5af0df21 100644
--- a/includes/polling/applications/drbd.inc.php
+++ b/includes/polling/applications/drbd.inc.php
@@ -3,8 +3,8 @@
 use LibreNMS\RRD\RrdDefinition;
 
 $name = 'drbd';
-$app_instance = $app['app_instance'];
 $app_id = $app['app_id'];
+$app_instance = $app['app_instance'];
 $drbd_data = $agent_data['app'][$name][$app_instance];
 foreach (explode('|', $drbd_data) as $part) {
     [$stat, $val] = explode('=', $part);
diff --git a/includes/polling/applications/exim-stats.inc.php b/includes/polling/applications/exim-stats.inc.php
index 31887a2407..a65f500e22 100644
--- a/includes/polling/applications/exim-stats.inc.php
+++ b/includes/polling/applications/exim-stats.inc.php
@@ -27,8 +27,6 @@ $app_id = $app['app_id'];
 $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.10.101.120.105.109.45.115.116.97.116.115';
 $stats = snmp_get($device, $oid, '-Oqv');
 
-echo ' ' . $name;
-
 [$frozen, $queue] = explode("\n", $stats);
 
 $rrd_name = ['app', $name, $app_id];
diff --git a/includes/polling/applications/fail2ban.inc.php b/includes/polling/applications/fail2ban.inc.php
index b5b2ef0a48..34af6bba04 100644
--- a/includes/polling/applications/fail2ban.inc.php
+++ b/includes/polling/applications/fail2ban.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'fail2ban';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $f2b = json_app_get($device, $name);
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/fbsd-nfs-client.inc.php b/includes/polling/applications/fbsd-nfs-client.inc.php
index 9bdb8280bc..1e32dc679b 100644
--- a/includes/polling/applications/fbsd-nfs-client.inc.php
+++ b/includes/polling/applications/fbsd-nfs-client.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'fbsd-nfs-client';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $nfs = json_app_get($device, 'fbsdnfsclient', 0);
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/fbsd-nfs-server.inc.php b/includes/polling/applications/fbsd-nfs-server.inc.php
index ba96af96de..dca3444aa7 100644
--- a/includes/polling/applications/fbsd-nfs-server.inc.php
+++ b/includes/polling/applications/fbsd-nfs-server.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'fbsd-nfs-server';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $nfs = json_app_get($device, 'fbsdnfsserver');
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/freeradius.inc.php b/includes/polling/applications/freeradius.inc.php
index 4479afaadc..937098ead9 100644
--- a/includes/polling/applications/freeradius.inc.php
+++ b/includes/polling/applications/freeradius.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'freeradius';
 $app_id = $app['app_id'];
 
-echo " $name";
-
 if (! empty($agent_data['app'][$name])) {
     $rawdata = $agent_data['app'][$name];
 } else {
diff --git a/includes/polling/applications/freeswitch.inc.php b/includes/polling/applications/freeswitch.inc.php
index ee6e223d31..0caaafbf10 100644
--- a/includes/polling/applications/freeswitch.inc.php
+++ b/includes/polling/applications/freeswitch.inc.php
@@ -4,6 +4,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'freeswitch';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
diff --git a/includes/polling/applications/gpsd.inc.php b/includes/polling/applications/gpsd.inc.php
index f30bb9f3fd..39a880a6e2 100755
--- a/includes/polling/applications/gpsd.inc.php
+++ b/includes/polling/applications/gpsd.inc.php
@@ -59,8 +59,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'gpsd';
 $app_id = $app['app_id'];
 
-echo " $name\n";
-
 if ($app_id > 0) {
     if (! empty($agent_data['app'][$name])) {
         $gpsd = $agent_data['app'][$name];
diff --git a/includes/polling/applications/icecast.inc.php b/includes/polling/applications/icecast.inc.php
index a43a70cddb..f73478ad51 100644
--- a/includes/polling/applications/icecast.inc.php
+++ b/includes/polling/applications/icecast.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'icecast';
 $app_id = $app['app_id'];
 
-echo "$name, app_id=$app_id ";
-
 if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
diff --git a/includes/polling/applications/mailcow-postfix.inc.php b/includes/polling/applications/mailcow-postfix.inc.php
index 0c969c934c..67290fe9bc 100644
--- a/includes/polling/applications/mailcow-postfix.inc.php
+++ b/includes/polling/applications/mailcow-postfix.inc.php
@@ -25,8 +25,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'mailcow-postfix';
 $app_id = $app['app_id'];
 
-d_echo($name);
-
 try {
     $mailcow_postfix = json_app_get($device, $name);
 } catch (JsonAppException $e) {
diff --git a/includes/polling/applications/mailscanner.inc.php b/includes/polling/applications/mailscanner.inc.php
index 2bd6253629..ca809aeb75 100644
--- a/includes/polling/applications/mailscanner.inc.php
+++ b/includes/polling/applications/mailscanner.inc.php
@@ -4,17 +4,15 @@
 
 use LibreNMS\RRD\RrdDefinition;
 
+$name = 'mailscannerV2';
+$app_id = $app['app_id'];
 $options = '-Oqv';
 $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);
 
-echo ' mailscanner';
-
 [$msg_recv, $msg_rejected, $msg_relay, $msg_sent, $msg_waiting, $spam, $virus] = explode("\n", $mailscanner);
 
-$name = 'mailscannerV2';
-$app_id = $app['app_id'];
 $rrd_name = ['app', $name, $app_id];
 $rrd_def = RrdDefinition::make()
     ->addDataset('msg_recv', 'COUNTER', 0, 125000000000)
diff --git a/includes/polling/applications/memcached.inc.php b/includes/polling/applications/memcached.inc.php
index e254a5419a..d399ef2d5c 100644
--- a/includes/polling/applications/memcached.inc.php
+++ b/includes/polling/applications/memcached.inc.php
@@ -4,6 +4,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'memcached';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data['app']['memcached'])) {
     $data = $agent_data['app']['memcached'][$app['app_instance']];
 } else {
diff --git a/includes/polling/applications/mysql.inc.php b/includes/polling/applications/mysql.inc.php
index 19e1181ab0..be94714530 100644
--- a/includes/polling/applications/mysql.inc.php
+++ b/includes/polling/applications/mysql.inc.php
@@ -12,7 +12,6 @@ if (! empty($agent_data['app'][$name])) {
     $mysql = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.109.121.115.113.108', '-Ovq');
 }
 
-echo ' mysql';
 $metrics = [];
 
 // General Stats
diff --git a/includes/polling/applications/nfs-server.inc.php b/includes/polling/applications/nfs-server.inc.php
index c14289141f..ab0b93ad94 100644
--- a/includes/polling/applications/nfs-server.inc.php
+++ b/includes/polling/applications/nfs-server.inc.php
@@ -16,14 +16,11 @@
 use LibreNMS\RRD\RrdDefinition;
 
 $name = 'nfs-server';
+$app_id = $app['app_id'];
 $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.10.110.102.115.45.115.101.114.118.101.114';
 
-echo ' ' . $name;
-
 $nfsstats = snmp_get($device, $oid, '-Oqv');
 
-$app_id = $app['app_id'];
-
 // rrd names
 $rrd_name = [];
 $rrd_name['default'] = ['app', 'nfs-server-default', $app_id];
diff --git a/includes/polling/applications/nfs-stats.inc.php b/includes/polling/applications/nfs-stats.inc.php
index 5453271f7a..6ffe0724ae 100644
--- a/includes/polling/applications/nfs-stats.inc.php
+++ b/includes/polling/applications/nfs-stats.inc.php
@@ -6,8 +6,6 @@ $name = 'nfsstat';
 $app_id = $app['app_id'];
 $oid = '.1.3.6.1.4.1.8072.1.3.2.4';
 
-echo ' ' . $name;
-
 $nfsstats = snmp_walk($device, $oid, '-Oqv', 'NET-SNMP-EXTEND-MIB');
 
 $rrd_name = ['app', $name, $app_id];
diff --git a/includes/polling/applications/nfs-v3-stats.inc.php b/includes/polling/applications/nfs-v3-stats.inc.php
index 8dc1738b18..02e04827d8 100644
--- a/includes/polling/applications/nfs-v3-stats.inc.php
+++ b/includes/polling/applications/nfs-v3-stats.inc.php
@@ -6,8 +6,6 @@ $name = 'nfs-v3-stats';
 $app_id = $app['app_id'];
 $oid = '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.110.102.115.115.116.97.116';
 
-echo ' ' . $name;
-
 $nfsstats = snmp_walk($device, $oid, '-Oqv', 'NET-SNMP-EXTEND-MIB');
 
 $rrd_name = ['app', 'nfs-stats', $app_id];
diff --git a/includes/polling/applications/nginx.inc.php b/includes/polling/applications/nginx.inc.php
index bf7f1f32a9..0cb4fb80fb 100644
--- a/includes/polling/applications/nginx.inc.php
+++ b/includes/polling/applications/nginx.inc.php
@@ -4,6 +4,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'nginx';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data['app'][$name])) {
     $nginx = $agent_data['app'][$name];
 } else {
@@ -12,8 +13,6 @@ if (! empty($agent_data['app'][$name])) {
 }
 $nginx = trim($nginx, '"');
 
-echo ' nginx';
-
 [$active, $reading, $writing, $waiting, $req] = array_map('rtrim', explode("\n", $nginx));
 d_echo("active: $active reading: $reading writing: $writing waiting: $waiting Requests: $req\n");
 
diff --git a/includes/polling/applications/ntp-client.inc.php b/includes/polling/applications/ntp-client.inc.php
index 76f3a1365f..0ad6b5c10e 100644
--- a/includes/polling/applications/ntp-client.inc.php
+++ b/includes/polling/applications/ntp-client.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'ntp-client';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $ntp = json_app_get($device, $name);
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/ntp-server.inc.php b/includes/polling/applications/ntp-server.inc.php
index 17f23283ab..8279b0a17d 100644
--- a/includes/polling/applications/ntp-server.inc.php
+++ b/includes/polling/applications/ntp-server.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'ntp-server';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $ntp = json_app_get($device, $name);
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/opensips.inc.php b/includes/polling/applications/opensips.inc.php
index a0c46d908c..2604f2fd10 100644
--- a/includes/polling/applications/opensips.inc.php
+++ b/includes/polling/applications/opensips.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'opensips';
 $app_id = $app['app_id'];
 
-echo "$name, app_id=$app_id ";
-
 if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
diff --git a/includes/polling/applications/portactivity.inc.php b/includes/polling/applications/portactivity.inc.php
index a7936984d1..b4f92d8486 100644
--- a/includes/polling/applications/portactivity.inc.php
+++ b/includes/polling/applications/portactivity.inc.php
@@ -6,8 +6,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'portactivity';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $returned = json_app_get($device, 'portactivity', 1);
 } catch (JsonAppException $e) { // Only doing the generic one as this has no non-JSON return
diff --git a/includes/polling/applications/postfix.inc.php b/includes/polling/applications/postfix.inc.php
index 9483f653d3..7a7a787a3b 100644
--- a/includes/polling/applications/postfix.inc.php
+++ b/includes/polling/applications/postfix.inc.php
@@ -1,10 +1,10 @@
 <?php
 
+use LibreNMS\RRD\RrdDefinition;
+
 $name = 'postfix';
 $app_id = $app['app_id'];
 
-use LibreNMS\RRD\RrdDefinition;
-
 $options = '-Oqv';
 $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';
diff --git a/includes/polling/applications/postgres.inc.php b/includes/polling/applications/postgres.inc.php
index 7b5867e2f5..7ec78f2099 100644
--- a/includes/polling/applications/postgres.inc.php
+++ b/includes/polling/applications/postgres.inc.php
@@ -1,11 +1,9 @@
 <?php
 
-$name = 'postgres';
-$app_id = $app['app_id'];
-
 use LibreNMS\RRD\RrdDefinition;
 
-echo 'postgres';
+$name = 'postgres';
+$app_id = $app['app_id'];
 
 $options = '-Oqv';
 $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.112.111.115.116.103.114.101.115';
diff --git a/includes/polling/applications/powerdns-dnsdist.inc.php b/includes/polling/applications/powerdns-dnsdist.inc.php
index 131741f6b2..87cfee099c 100644
--- a/includes/polling/applications/powerdns-dnsdist.inc.php
+++ b/includes/polling/applications/powerdns-dnsdist.inc.php
@@ -27,8 +27,6 @@ $options = '-Oqv';
 //NET-SNMP-EXTEND-MIB::nsExtendOutputFull."powerdns-dnsdist"
 $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.16.112.111.119.101.114.100.110.115.45.100.110.115.100.105.115.116';
 
-d_echo($name);
-
 $powerdns_dnsdist = snmp_walk($device, $oid, $options);
 
 if (is_string($powerdns_dnsdist)) {
diff --git a/includes/polling/applications/powerdns-recursor.inc.php b/includes/polling/applications/powerdns-recursor.inc.php
index 361bd32d2d..601d876fc7 100644
--- a/includes/polling/applications/powerdns-recursor.inc.php
+++ b/includes/polling/applications/powerdns-recursor.inc.php
@@ -31,8 +31,6 @@ $data = '';
 $name = 'powerdns-recursor';
 $app_id = $app['app_id'];
 
-echo ' ' . $name;
-
 if ($agent_data['app'][$name]) {
     $data = $agent_data['app'][$name];
 } elseif (Config::has('apps.powerdns-recursor.api-key')) {
diff --git a/includes/polling/applications/powerdns.inc.php b/includes/polling/applications/powerdns.inc.php
index 304a026010..c05ff2af51 100644
--- a/includes/polling/applications/powerdns.inc.php
+++ b/includes/polling/applications/powerdns.inc.php
@@ -9,7 +9,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'powerdns';
 $app_id = $app['app_id'];
 $powerdns = [];
-echo " $name";
 
 // unused metrics:
 // deferred-packetcache-inserts, deferred-packetcache-lookup, dnsupdate-answers, dnsupdate-changes, dnsupdate-queries, dnsupdate-refused, incoming-notifications
diff --git a/includes/polling/applications/powermon.inc.php b/includes/polling/applications/powermon.inc.php
index 7f41de7a91..a3602c8592 100644
--- a/includes/polling/applications/powermon.inc.php
+++ b/includes/polling/applications/powermon.inc.php
@@ -22,8 +22,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'powermon';
 $app_id = $app['app_id'];
 
-echo $name;
-
 try {
     $result = json_app_get($device, $name);
 } catch (JsonAppException $e) {
diff --git a/includes/polling/applications/proxmox.inc.php b/includes/polling/applications/proxmox.inc.php
index f3ee46cb81..dc6c2d0122 100644
--- a/includes/polling/applications/proxmox.inc.php
+++ b/includes/polling/applications/proxmox.inc.php
@@ -2,6 +2,9 @@
 
 use LibreNMS\RRD\RrdDefinition;
 
+$name = 'proxmox';
+$app_id = $app['app_id'];
+
 if (! function_exists('proxmox_port_exists')) {
     /**
      * Check if a port on a Proxmox VM exists
@@ -45,9 +48,6 @@ if (! function_exists('proxmox_vm_exists')) {
     }
 }
 
-$name = 'proxmox';
-$app_id = $app['app_id'];
-
 if (\LibreNMS\Config::get('enable_proxmox') && ! empty($agent_data['app'][$name])) {
     $proxmox = $agent_data['app'][$name];
 } elseif (\LibreNMS\Config::get('enable_proxmox')) {
diff --git a/includes/polling/applications/rrdcached.inc.php b/includes/polling/applications/rrdcached.inc.php
index 23b9be49ad..7849711889 100644
--- a/includes/polling/applications/rrdcached.inc.php
+++ b/includes/polling/applications/rrdcached.inc.php
@@ -27,8 +27,6 @@
 
 use LibreNMS\RRD\RrdDefinition;
 
-echo ' rrdcached';
-
 $data = '';
 $name = 'rrdcached';
 $app_id = $app['app_id'];
diff --git a/includes/polling/applications/sdfsinfo.inc.php b/includes/polling/applications/sdfsinfo.inc.php
index 801c5f1bf0..0fac715dff 100644
--- a/includes/polling/applications/sdfsinfo.inc.php
+++ b/includes/polling/applications/sdfsinfo.inc.php
@@ -26,8 +26,6 @@ $app_id = $app['app_id'];
 $options = '-Oqv';
 $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.8.115.100.102.115.105.110.102.111';
 
-d_echo($name);
-
 $sdfsinfo = snmp_walk($device, $oid, $options);
 
 if (is_string($sdfsinfo)) {
diff --git a/includes/polling/applications/shoutcast.inc.php b/includes/polling/applications/shoutcast.inc.php
index 274f3209f1..7973aaa4f3 100644
--- a/includes/polling/applications/shoutcast.inc.php
+++ b/includes/polling/applications/shoutcast.inc.php
@@ -11,8 +11,6 @@ $options = '-Oqv';
 $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);
 
-echo ' shoutcast';
-
 $servers = explode("\n", $shoutcast);
 
 $metrics = [];
diff --git a/includes/polling/applications/smart.inc.php b/includes/polling/applications/smart.inc.php
index 115eb446d8..bbdea51ced 100644
--- a/includes/polling/applications/smart.inc.php
+++ b/includes/polling/applications/smart.inc.php
@@ -2,8 +2,6 @@
 
 use LibreNMS\RRD\RrdDefinition;
 
-echo 'SMART';
-
 $name = 'smart';
 $app_id = $app['app_id'];
 
diff --git a/includes/polling/applications/tinydns.inc.php b/includes/polling/applications/tinydns.inc.php
index 6f1fd410bc..37b36a2494 100644
--- a/includes/polling/applications/tinydns.inc.php
+++ b/includes/polling/applications/tinydns.inc.php
@@ -28,6 +28,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'tinydns';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data['app'][$name]) && $app_id > 0) {
     echo ' tinydns';
     $rrd_name = ['app', $name, $app_id];
diff --git a/includes/polling/applications/unbound.inc.php b/includes/polling/applications/unbound.inc.php
index bbf0ffe9c9..1eea273511 100644
--- a/includes/polling/applications/unbound.inc.php
+++ b/includes/polling/applications/unbound.inc.php
@@ -4,6 +4,7 @@ use LibreNMS\RRD\RrdDefinition;
 
 $name = 'unbound';
 $app_id = $app['app_id'];
+
 if (! empty($agent_data['app'][$name])) {
     $rawdata = $agent_data['app'][$name];
 } else {
diff --git a/includes/polling/applications/ups-apcups.inc.php b/includes/polling/applications/ups-apcups.inc.php
index dd381896f7..87a0a203bf 100644
--- a/includes/polling/applications/ups-apcups.inc.php
+++ b/includes/polling/applications/ups-apcups.inc.php
@@ -27,8 +27,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'ups-apcups';
 $app_id = $app['app_id'];
 
-echo ' ' . $name;
-
 try {
     $json_return = json_app_get($device, $name);
 } catch (JsonAppParsingFailedException $e) {
diff --git a/includes/polling/applications/ups-nut.inc.php b/includes/polling/applications/ups-nut.inc.php
index 549f683d92..a4fd24dd3c 100644
--- a/includes/polling/applications/ups-nut.inc.php
+++ b/includes/polling/applications/ups-nut.inc.php
@@ -40,8 +40,6 @@ if (! $ups_nut) {
 }
 //print_r(array_values(explode("\n", $ups_nut)));
 
-echo ' ' . $name;
-
 // (2020-05-13, Jon.W) Added ups status data and updated ups-nut.sh script.
 [
     $charge,
diff --git a/includes/polling/applications/voip-monitor.inc.php b/includes/polling/applications/voip-monitor.inc.php
index 425d91b7ca..ee02fd9aea 100644
--- a/includes/polling/applications/voip-monitor.inc.php
+++ b/includes/polling/applications/voip-monitor.inc.php
@@ -5,8 +5,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'voip-monitor';
 $app_id = $app['app_id'];
 
-echo "$name, app_id=$app_id ";
-
 if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
diff --git a/includes/polling/applications/zfs.inc.php b/includes/polling/applications/zfs.inc.php
index 84725d0c90..2ac1dd6ad3 100644
--- a/includes/polling/applications/zfs.inc.php
+++ b/includes/polling/applications/zfs.inc.php
@@ -7,8 +7,6 @@ use LibreNMS\RRD\RrdDefinition;
 $name = 'zfs';
 $app_id = $app['app_id'];
 
-echo $name;
-
 // Is set to false later if missing keys are found.
 $not_legacy = 1;