Remove legacy function calls (#12651)

* massive inlines

* fix style and wtf

* remove rrdtool.inc.php include

* fix CommonFunctions namespace issues

* looking for missing class space, fix undefined class issues

* style fixes

includes/html/graphs/XXX_device_memory_windows.inc.php

@@ -4,7 +4,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $device = device_by_id_cache($id);
 
-$rrd_filename = rrd_name($device['hostname'], 'mem');
+$rrd_filename = Rrd::name($device['hostname'], 'mem');
 
 $rrd_options .= ' -b 1024';
 

includes/html/graphs/accesspoints/channel.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'Channel';

includes/html/graphs/accesspoints/interference.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'Interference';

includes/html/graphs/accesspoints/numasoclients.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'Num Clients';

includes/html/graphs/accesspoints/nummonbssid.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'MonBSSIDs';

includes/html/graphs/accesspoints/nummonclients.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'Mon Clients';

includes/html/graphs/accesspoints/radioutil.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'radioutil';

includes/html/graphs/accesspoints/txpow.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$rrd_filename = rrd_name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
+$rrd_filename = Rrd::name($device['hostname'], ['arubaap', $ap['name'] . $ap['radio_number']]);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = 'txpow';

includes/html/graphs/altiga_ssl_sessions.inc.php

@@ -6,7 +6,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $device = device_by_id_cache($id);
 
-$rrd_filename = rrd_name($device['hostname'], 'altiga-ssl');
+$rrd_filename = Rrd::name($device['hostname'], 'altiga-ssl');
 
 $rrd_options .= " DEF:TotalSessions=$rrd_filename:TotalSessions:AVERAGE";
 $rrd_options .= " DEF:ActiveSessions=$rrd_filename:ActiveSessions:AVERAGE";

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = rrd_name($device['hostname'], ['app', 'apache', $app['app_id']]);
+$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($apache_rrd)) {
+if (Rrd::checkRrdExists($apache_rrd)) {
     $rrd_filename = $apache_rrd;
 }
 

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = rrd_name($device['hostname'], ['app', 'apache', $app['app_id']]);
+$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($apache_rrd)) {
+if (Rrd::checkRrdExists($apache_rrd)) {
     $rrd_filename = $apache_rrd;
 }
 

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$apache_rrd = rrd_name($device['hostname'], ['app', 'apache', $app['app_id']]);
+$apache_rrd = Rrd::name($device['hostname'], ['app', 'apache', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($apache_rrd)) {
+if (Rrd::checkRrdExists($apache_rrd)) {
     $rrd_filename = $apache_rrd;
 }
 

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

@@ -4,7 +4,7 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'apache', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'apache', $app['app_id']]);
 
 $array = [
     'sb_reading'   => [
@@ -50,7 +50,7 @@ $array = [
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -9,6 +9,6 @@ $colour_line = '2EAC6D';
 $colour_area_max = 'FFEE99';
 $graph_max = 10000;
 $unit_text = 'Calls';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
 
 require 'includes/html/graphs/generic_simplex.inc.php';

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

@@ -9,6 +9,6 @@ $colour_line = '2EAC6D';
 $colour_area_max = 'FFEE99';
 $graph_max = 20000;
 $unit_text = 'Channels';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
 
 require 'includes/html/graphs/generic_simplex.inc.php';

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'IAX2 Peers';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'asterisk', 'iax2', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'asterisk', 'iax2', $app['app_id']]);
 
 $astiax2_access_array = [
     'iax2peers' => 'Total Peers',
@@ -17,7 +17,7 @@ $astiax2_access_array = [
 $colours = 'mixed';
 $rrd_list = [];
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($astiax2_access_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -6,7 +6,7 @@ $scale_min = 0;
 $nototal = 1;
 $descr_len = 21;
 $unit_text = 'SIP Peers';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'asterisk', 'stats', $app['app_id']]);
 
 $astsip_access_array = [
     'sippeers'        => 'Total Peers',
@@ -19,7 +19,7 @@ $astsip_access_array = [
 $colours = 'mixed';
 $rrd_list = [];
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($astsip_access_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -2,7 +2,7 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'backupninja', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'backupninja', $app['app_id']]);
 
 $array = [
     'last_actions' => [
@@ -24,7 +24,7 @@ $array = [
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'adb']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'adb']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Addresses',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'adb']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'adb']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Address',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Mem Exhaustion',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Total',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Hits',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'cache']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Total',

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

@@ -33,7 +33,7 @@ $unit_text = 'query/sec';
 $colours = 'psychedelic';
 $rrd_list = [];
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id']]);
 $array = [
     'any',
     'a',
@@ -46,7 +46,7 @@ $array = [
     'srv',
     'spf',
 ];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
@@ -58,7 +58,7 @@ if (rrdtool_check_rrd_exists($rrd_filename)) {
     echo "file missing: $file";
 }
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'incoming']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'incoming']);
 $array = [
     'afsdb',
     'apl',
@@ -93,7 +93,7 @@ $array = [
     'ixfr',
     'opt',
 ];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[] = [
             'filename' => $rrd_filename,

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

@@ -9,7 +9,7 @@ $unit_text = 'query/sec';
 $colours = 'psychedelic';
 $rrd_list = [];
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'outgoing']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'outgoing']);
 $array = [
     'any',
     'a',
@@ -54,7 +54,7 @@ $array = [
     'ixfr',
     'opt',
 ];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[] = [
             'filename' => $rrd_filename,

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

@@ -32,7 +32,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Query/sec';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id']]);
 $array = [
     'any',
     'a',
@@ -50,7 +50,7 @@ $rrd_list = [];
 
 Config::set('graph_colours.merged', array_merge(Config::get('graph_colours.greens'), Config::get('graph_colours.blues')));
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = strtoupper($ds);

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'NXDOMAIN',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'IPv4 NS Ftchd',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'IPv4 Sent',

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

@@ -9,7 +9,7 @@ $unit_text = 'RR sets';
 $colours = 'psychedelic';
 $rrd_list = [];
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'rrnegative']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'rrnegative']);
 $array = [
     'any',
     'a',
@@ -55,7 +55,7 @@ $array = [
     'ixfr',
     'opt',
 ];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[] = [
             'filename' => $rrd_filename,

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

@@ -9,7 +9,7 @@ $unit_text = 'RR sets';
 $colours = 'psychedelic';
 $rrd_list = [];
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'rrpositive']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'rrpositive']);
 $array = [
     'any',
     'a',
@@ -55,7 +55,7 @@ $array = [
     'ixfr',
     'opt',
 ];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds) {
         $rrd_list[] = [
             'filename' => $rrd_filename,

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'resolver']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => '<10',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Auth Qry Rej',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'IPv4 Req',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'server']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'Successful',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'TCP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4 send',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -9,10 +9,10 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'bind', $app['app_id'], 'sockets']);
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list[] = [
         'filename' => $rrd_filename,
         'descr'    => 'UDP/IPv4',

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

@@ -8,7 +8,7 @@ $out_text = 'Commit';
 
 $ceph_osd_rrd = ceph_rrd('osd');
 
-if (rrdtool_check_rrd_exists($ceph_osd_rrd)) {
+if (Rrd::checkRrdExists($ceph_osd_rrd)) {
     $rrd_filename = $ceph_osd_rrd;
 }
 

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

@@ -4,7 +4,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $ceph_pool_rrd = ceph_rrd('df');
 
-if (rrdtool_check_rrd_exists($ceph_pool_rrd)) {
+if (Rrd::checkRrdExists($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
 }
 

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

@@ -9,7 +9,7 @@ $format = 'bytes';
 
 $ceph_pool_rrd = ceph_rrd('pool');
 
-if (rrdtool_check_rrd_exists($ceph_pool_rrd)) {
+if (Rrd::checkRrdExists($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
 }
 

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

@@ -6,7 +6,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $ceph_pool_rrd = ceph_rrd('pool');
 
-if (rrdtool_check_rrd_exists($ceph_pool_rrd)) {
+if (Rrd::checkRrdExists($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
 }
 

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

@@ -6,7 +6,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $ceph_pool_rrd = ceph_rrd('df');
 
-if (rrdtool_check_rrd_exists($ceph_pool_rrd)) {
+if (Rrd::checkRrdExists($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
 }
 

includes/html/graphs/application/certificate-common.inc.php

@@ -18,9 +18,9 @@ if (isset($vars['cert_name'])) {
 $int = 0;
 while (isset($cert_name_list[$int])) {
     $cert_name = $cert_name_list[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $cert_name]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $cert_name]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
             'descr'    => $cert_name,

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

@@ -5,7 +5,7 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Seconds PPM';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
 $array = [
     'frequency'             => ['descr' => 'Error rate'],
     'residual_frequency'    => ['descr' => 'Ref clk offset'],
@@ -14,7 +14,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,7 +5,7 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Seconds';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
 $array = [
     'root_delay'        => ['descr' => 'Root clk delay'],
     'root_dispersion'   => ['descr' => 'Root clk disp.'],
@@ -13,7 +13,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,14 +5,14 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Seconds PPM';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
 $array = [
     'frequency'             => ['descr' => 'Estimated'],
     'frequency_skew'        => ['descr' => 'Est. error'],
 ];
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -4,7 +4,7 @@ require 'includes/html/graphs/common.inc.php';
 
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
 $array = [
     'polling_rate'          => ['descr' => 'Polling rate'],
     'last_rx'               => ['descr' => 'Last RX'],
@@ -14,7 +14,7 @@ $array = [
 ];
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,7 +5,7 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Seconds';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id'], $vars['source']]);
 $array = [
     'adjusted_offset'       => ['descr' => 'Adjusted'],
     'measured_offset'       => ['descr' => 'Measured'],
@@ -15,7 +15,7 @@ $array = [
 ];
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,13 +5,13 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Level';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
 $array = [
     'stratum'    => ['descr' => 'Stratum'],
 ];
 
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,7 +5,7 @@ require 'includes/html/graphs/common.inc.php';
 $colours = 'mixed';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Seconds';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'chronyd', $app['app_id']]);
 $array = [
     'system_time'   => ['descr' => 'Clock lag'],
     'last_offset'   => ['descr' => 'Last offset'],
@@ -14,7 +14,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

includes/html/graphs/application/dhcp-stats_networks_current.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         [$net, $subnet] = explode('_', str_replace($category . '-', '', $array));
         $rrd_list[] = [
             'filename' => $rrd_filename,

includes/html/graphs/application/dhcp-stats_networks_max.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         [$net, $subnet] = explode('_', str_replace($category . '-', '', $array));
         $rrd_list[] = [
             'filename' => $rrd_filename,

includes/html/graphs/application/dhcp-stats_networks_percent.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         [$net, $subnet] = explode('_', str_replace($category . '-', '', $array));
         $rrd_list[] = [
             'filename' => $rrd_filename,

includes/html/graphs/application/dhcp-stats_pools_current.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
             'descr'    => str_replace($category . '-', '', $array),

includes/html/graphs/application/dhcp-stats_pools_max.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
             'descr'    => str_replace($category . '-', '', $array),

includes/html/graphs/application/dhcp-stats_pools_percent.inc.php

@@ -21,9 +21,9 @@ $arrays = get_arrays_with_application($device, $app_id, $name, $category);
 $int = 0;
 while (isset($arrays[$int])) {
     $array = $arrays[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $array]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $array]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
             'descr'    => str_replace($category . '-', '', $array),

includes/html/graphs/application/dhcp-stats_stats.inc.php

@@ -14,7 +14,7 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
 $array = [
     'dhcp_total' => ['descr' => 'Total', 'colour' => '582A72'],
@@ -29,7 +29,7 @@ $array = [
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

includes/html/graphs/application/docker-common.inc.php

@@ -21,9 +21,9 @@ if (isset($vars['container'])) {
 $int = 0;
 while (isset($containers[$int])) {
     $container_name = $containers[$int];
-    $rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id, $container_name]);
+    $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id, $container_name]);
 
-    if (rrdtool_check_rrd_exists($rrd_filename)) {
+    if (Rrd::checkRrdExists($rrd_filename)) {
         $rrd_list[] = [
             'filename' => $rrd_filename,
             'descr'    => $container_name,

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$drbd_rrd = rrd_name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
+$drbd_rrd = Rrd::name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
 
-if (rrdtool_check_rrd_exists($drbd_rrd)) {
+if (Rrd::checkRrdExists($drbd_rrd)) {
     $rrd_filename = $drbd_rrd;
 }
 

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$drbd_rrd = rrd_name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
+$drbd_rrd = Rrd::name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
 
-if (rrdtool_check_rrd_exists($drbd_rrd)) {
+if (Rrd::checkRrdExists($drbd_rrd)) {
     $rrd_filename = $drbd_rrd;
 }
 

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

@@ -2,7 +2,7 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
 
 $array = [
     'lo' => 'Local I/O',
@@ -12,7 +12,7 @@ $array = [
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         if (is_array($var)) {

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

@@ -4,9 +4,9 @@ $scale_min = 0;
 
 require 'includes/html/graphs/common.inc.php';
 
-$drbd_rrd = rrd_name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
+$drbd_rrd = Rrd::name($device['hostname'], ['app', 'drbd', $app['app_instance']]);
 
-if (rrdtool_check_rrd_exists($drbd_rrd)) {
+if (Rrd::checkRrdExists($drbd_rrd)) {
     $rrd_filename = $drbd_rrd;
 }
 

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

@@ -14,14 +14,14 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 33;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
 $array = [
     'entropy' => ['descr' => 'entropy', 'colour' => '2B9220'],
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

includes/html/graphs/application/exim-stats_frozen.inc.php

@@ -32,14 +32,14 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 33;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
 $array = [
     'frozen' => ['descr' => 'Frozen emails', 'colour' => 'c13a38'],
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

includes/html/graphs/application/exim-stats_queue.inc.php

@@ -32,14 +32,14 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 33;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
 $array = [
     'queue' => ['descr' => 'Queue emails', 'colour' => 'c13a38'],
 ];
 
 $i = 0;
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -12,9 +12,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

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

@@ -12,8 +12,8 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $app['app_type'], $app['app_id'], $vars['jail']]);
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+$rrd_filename = Rrd::name($device['hostname'], ['app', $app['app_type'], $app['app_id'], $vars['jail']]);
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-client_cache.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-client_rpc.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-client_stats.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-server_cache.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-server_gathering.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

includes/html/graphs/application/fbsd-nfs-server_stats.inc.php

@@ -13,9 +13,9 @@ $printtotal = 0;
 $addarea = 1;
 $transparency = 15;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', $name, $app_id]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app_id]);
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     $rrd_list = [
         [
             'filename' => $rrd_filename,

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-access', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-access', $app['app_id']]);
 $fr_access_array = [
     'requests' => 'Requests',
     'accepts' => 'Accepts',
@@ -14,7 +14,7 @@ $fr_access_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_access_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-acct', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-acct', $app['app_id']]);
 $fr_acct_array = [
     'requests' => 'Requests',
     'responses' => 'Responses',
@@ -17,7 +17,7 @@ $fr_acct_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_acct_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-auth', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-auth', $app['app_id']]);
 $fr_auth_array = [
     'responses' => 'Responses',
     'duplicate_requests' => 'Duplicate Requests',
@@ -16,7 +16,7 @@ $fr_auth_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_auth_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-proxy_access', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-proxy_access', $app['app_id']]);
 $fr_proxy_access_array = [
     'requests' => 'Requests',
     'accepts' => 'Accepts',
@@ -14,7 +14,7 @@ $fr_proxy_access_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_proxy_access_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-proxy_acct', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-proxy_acct', $app['app_id']]);
 $fr_proxy_acct_array = [
     'requests' => 'Requests',
     'responses' => 'Responses',
@@ -17,7 +17,7 @@ $fr_proxy_acct_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_proxy_acct_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-proxy_auth', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-proxy_auth', $app['app_id']]);
 $fr_proxy_auth_array = [
     'responses' => 'Responses',
     'duplicate_requests' => 'Duplicate Requests',
@@ -16,7 +16,7 @@ $fr_proxy_auth_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_proxy_auth_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -5,7 +5,7 @@ $i = 0;
 $scale_min = 0;
 $nototal = 1;
 $unit_text = 'Per Sec.';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeradius-queue', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeradius-queue', $app['app_id']]);
 $fr_queue_array = [
     'len_internal' => 'Len Internal',
     'len_proxy' => 'Len Proxy',
@@ -17,7 +17,7 @@ $fr_queue_array = [
 ];
 $colours = 'mixed';
 $rrd_list = [];
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($fr_queue_array as $ds => $descr) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $descr;

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

@@ -9,6 +9,6 @@ $colour_line = '2EAC6D';
 $colour_area_max = 'FFEE99';
 $graph_max = 10000;
 $unit_text = 'Calls';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
 
 require 'includes/html/graphs/generic_simplex.inc.php';

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

@@ -6,7 +6,7 @@ $scale_min = 0;
 $colours = 'blue';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Inbound Calls/sec';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
 $array = [
     'in_okay'  => [
         'descr'  => 'Okay',
@@ -20,7 +20,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -6,7 +6,7 @@ $scale_min = 0;
 $colours = 'blue';
 $nototal = (($width < 224) ? 1 : 0);
 $unit_text = 'Outbound Calls/sec';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
 $array = [
     'out_okay'  => [
         'descr'  => 'Okay',
@@ -20,7 +20,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -9,6 +9,6 @@ $colour_line = '2EAC6D';
 $colour_area_max = 'FFEE99';
 $graph_max = 10000;
 $unit_text = 'Channels';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
 
 require 'includes/html/graphs/generic_simplex.inc.php';

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

@@ -9,6 +9,6 @@ $colour_line = '2EAC6D';
 $colour_area_max = 'FFEE99';
 $graph_max = 10000;
 $unit_text = 'Peak Calls';
-$rrd_filename = rrd_name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'freeswitch', 'stats', $app['app_id']]);
 
 require 'includes/html/graphs/generic_simplex.inc.php';

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

@@ -27,7 +27,7 @@ $colours = 'mixed';
 $unit_text = 'DOP';
 $nototal = 1;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
 $array = [
     'hdop' => ['descr' => 'Horizontal'],
     'vdop' => ['descr' => 'Vertical'],
@@ -35,7 +35,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -30,8 +30,8 @@ $colour_area_max = 'FFCCCC';
 $graph_max = 0;
 $unit_text = 'Mode';
 
-$gpsd = rrd_name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
-if (rrdtool_check_rrd_exists($gpsd)) {
+$gpsd = Rrd::name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
+if (Rrd::checkRrdExists($gpsd)) {
     $rrd_filename = $gpsd;
 } else {
     echo "file missing: $rrd_filename";

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

@@ -27,7 +27,7 @@ $colours = 'mixed';
 $unit_text = 'Satellites';
 $nototal = 1;
 
-$rrd_filename = rrd_name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', 'gpsd', $app['app_id']]);
 $array = [
     'satellites' => ['descr' => 'Visible', 'area' => true],
     'satellites_used' => ['descr' => 'Used', 'area' => true],
@@ -35,7 +35,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

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

@@ -5,9 +5,9 @@ $scale_max = 1;
 
 require 'includes/html/graphs/common.inc.php';
 
-$icecast_rrd = rrd_name($device['hostname'], ['app', 'icecast', $app['app_id']]);
+$icecast_rrd = Rrd::name($device['hostname'], ['app', 'icecast', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($icecast_rrd)) {
+if (Rrd::checkRrdExists($icecast_rrd)) {
     $rrd_filename = $icecast_rrd;
 }
 

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

@@ -4,9 +4,9 @@ $scale_min = 1000;
 
 require 'includes/html/graphs/common.inc.php';
 
-$icecast_rrd = rrd_name($device['hostname'], ['app', 'icecast', $app['app_id']]);
+$icecast_rrd = Rrd::name($device['hostname'], ['app', 'icecast', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($icecast_rrd)) {
+if (Rrd::checkRrdExists($icecast_rrd)) {
     $rrd_filename = $icecast_rrd;
 }
 

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

@@ -4,9 +4,9 @@ $scale_min = 1000;
 
 require 'includes/html/graphs/common.inc.php';
 
-$icecast_rrd = rrd_name($device['hostname'], ['app', 'icecast', $app['app_id']]);
+$icecast_rrd = Rrd::name($device['hostname'], ['app', 'icecast', $app['app_id']]);
 
-if (rrdtool_check_rrd_exists($icecast_rrd)) {
+if (Rrd::checkRrdExists($icecast_rrd)) {
     $rrd_filename = $icecast_rrd;
 }
 

includes/html/graphs/application/mailcow-postfix_domains.inc.php

@@ -25,7 +25,7 @@ $dostack = 0;
 $printtotal = 0;
 $addarea = 1;
 $transparency = 33;
-$rrd_filename = rrd_name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
 
 $array = [
     'senders' => ['descr' => 'Sender(s)', 'colour' => '11d3f5'],
@@ -36,7 +36,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];

includes/html/graphs/application/mailcow-postfix_emails.inc.php

@@ -25,7 +25,7 @@ $dostack = 0;
 $printtotal = 0;
 $addarea = 1;
 $transparency = 33;
-$rrd_filename = rrd_name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
+$rrd_filename = Rrd::name($device['hostname'], ['app', $app['app_type'], $app['app_id']]);
 
 $array = [
     'received' => ['descr' => 'Received', 'colour' => '75a832'],
@@ -40,7 +40,7 @@ $array = [
 
 $i = 0;
 
-if (rrdtool_check_rrd_exists($rrd_filename)) {
+if (Rrd::checkRrdExists($rrd_filename)) {
     foreach ($array as $ds => $var) {
         $rrd_list[$i]['filename'] = $rrd_filename;
         $rrd_list[$i]['descr'] = $var['descr'];