Application Graph fixes (librenms#17831)

* Application Graph fixes

* Apply fixes from StyleCI

* Updated more application graph files

* Apply fixes from StyleCI

* Eradicate $filename (mostly)

* Fix up find replace errors

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Neil Lathwood <gh+n@laf.io>

Author: 3 people

includes/html/graphs/application/apache_bits.inc.php

@@ -4,11 +4,7 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
-
-if (Rrd::checkRrdExists($apache_rrd)) {
-    $rrd_filename = $apache_rrd;
-}
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
 
 $ds = 'kbyte';
 

includes/html/graphs/application/apache_cpu.inc.php

@@ -4,11 +4,7 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
-
-if (Rrd::checkRrdExists($apache_rrd)) {
-    $rrd_filename = $apache_rrd;
-}
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
 
 $ds = 'cpu';
 

includes/html/graphs/application/apache_hits.inc.php

@@ -4,11 +4,7 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
-
-if (Rrd::checkRrdExists($apache_rrd)) {
-    $rrd_filename = $apache_rrd;
-}
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'apache', $app->app_id]);
 
 $ds = 'access';
 

includes/html/graphs/application/apache_scoreboard.inc.php

@@ -50,16 +50,12 @@
 ];
 
 $i = 0;
-if (Rrd::checkRrdExists($rrd_filename)) {
-    foreach ($array as $ds => $var) {
-        $rrd_list[$i]['filename'] = $rrd_filename;
-        $rrd_list[$i]['descr'] = $var['descr'];
-        $rrd_list[$i]['ds'] = $ds;
-        $rrd_list[$i]['colour'] = $var['colour'];
-        $i++;
-    }
-} else {
-    echo "file missing: $file";
+foreach ($array as $ds => $var) {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $var['descr'];
+    $rrd_list[$i]['ds'] = $ds;
+    $rrd_list[$i]['colour'] = $var['colour'];
+    $i++;
 }
 
 $colours = 'mixed';

includes/html/graphs/application/asterisk_iax2.inc.php

@@ -17,14 +17,11 @@
 $colours = 'mixed';
 $rrd_list = [];
 
-if (Rrd::checkRrdExists($rrd_filename)) {
-    foreach ($astiax2_access_array as $ds => $descr) {
-        $rrd_list[$i]['filename'] = $rrd_filename;
-        $rrd_list[$i]['descr'] = $descr;
-        $rrd_list[$i]['ds'] = $ds;
-        $i++;
-    }
-} else {
-    echo "file missing: $rrd_filename";
+foreach ($astiax2_access_array as $ds => $descr) {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $descr;
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
 }
+
 require 'includes/html/graphs/generic_multi_line.inc.php';

includes/html/graphs/application/asterisk_sip.inc.php

@@ -19,14 +19,11 @@
 $colours = 'mixed';
 $rrd_list = [];
 
-if (Rrd::checkRrdExists($rrd_filename)) {
-    foreach ($astsip_access_array as $ds => $descr) {
-        $rrd_list[$i]['filename'] = $rrd_filename;
-        $rrd_list[$i]['descr'] = $descr;
-        $rrd_list[$i]['ds'] = $ds;
-        $i++;
-    }
-} else {
-    echo "file missing: $rrd_filename";
+foreach ($astsip_access_array as $ds => $descr) {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $descr;
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
 }
+
 require 'includes/html/graphs/generic_multi_line.inc.php';

includes/html/graphs/application/auth.inc.php

@@ -2,7 +2,7 @@
 
 use App\Models\Application;
 
-if (is_numeric($vars['id'])) {
+if (isset($vars['id']) && is_numeric($vars['id'])) {
     // check user has access, unless allow_unauth_graphs is enabled
     $app = Application::when(! $auth, function ($query) {
         return $query->hasAccess(Auth::user());

includes/html/graphs/application/backupninja_backupninja.inc.php

@@ -24,16 +24,12 @@
 ];
 
 $i = 0;
-if (Rrd::checkRrdExists($rrd_filename)) {
-    foreach ($array as $ds => $var) {
-        $rrd_list[$i]['filename'] = $rrd_filename;
-        $rrd_list[$i]['descr'] = $var['descr'];
-        $rrd_list[$i]['ds'] = $ds;
-        // $rrd_list[$i]['colour'] = $var['colour'];
-        $i++;
-    }
-} else {
-    echo "file missing: $file";
+foreach ($array as $ds => $var) {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $var['descr'];
+    $rrd_list[$i]['ds'] = $ds;
+    // $rrd_list[$i]['colour'] = $var['colour'];
+    $i++;
 }
 
 $colours = 'mixed';

includes/html/graphs/application/bind_adb_in.inc.php

@@ -10,20 +10,17 @@
 
 $rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app->app_id, 'adb']);
 
-$rrd_list = [];
-if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
+$rrd_list = [
+    [
         'filename' => $rrd_filename,
         'descr' => 'Addresses',
         'ds' => 'aiht',
-    ];
-    $rrd_list[] = [
+    ],
+    [
         'filename' => $rrd_filename,
         'descr' => 'Names',
         'ds' => 'niht',
-    ];
-} else {
-    d_echo('RRD "' . $rrd_filename . '" not found');
-}
+    ],
+];
 
 require 'includes/html/graphs/generic_multi_line.inc.php';

includes/html/graphs/application/bind_adb_size.inc.php

@@ -10,20 +10,17 @@
 
 $rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app->app_id, 'adb']);
 
-$rrd_list = [];
-if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
+$rrd_list = [
+    [
         'filename' => $rrd_filename,
         'descr' => 'Address',
         'ds' => 'ahts',
-    ];
-    $rrd_list[] = [
+    ],
+    [
         'filename' => $rrd_filename,
         'descr' => 'Name',
         'ds' => 'nhts',
-    ];
-} else {
-    d_echo('RRD "' . $rrd_filename . '" not found');
-}
+    ],
+];
 
 require 'includes/html/graphs/generic_multi_line.inc.php';