mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Updated graphs to use safer RRD check (#6781)

Browse Source 
Graphs that were using `file_exists()` to check for the presence of RRD
files now use `rrdtool_check_rrd_exists()` instead. This is a fix for
distributed poller configurations that are running `rrdcached` on a
different host.
This commit is contained in:
Aaron Goulet
2017-06-05 14:49:04 -07:00
committed by Neil Lathwood
parent 127c4b84bd
commit 8c4efc83e1
117 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/device/bigip_ltm_allpm_bytesin.inc.php
View File

@@ -52,7 +52,7 @@ if ($components[$vars['id']]['type'] == 'f5-ltm-pool') {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
d_echo("\n Adding PM: " . $label . "\t+ added to the graph"); d_echo("\n Adding PM: " . $label . "\t+ added to the graph");
// Grab a colour from the array. // Grab a colour from the array.

2
html/includes/graphs/device/bigip_ltm_allpm_bytesout.inc.php
View File

@@ -52,7 +52,7 @@ if ($components[$vars['id']]['type'] == 'f5-ltm-pool') {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
d_echo("\n Adding PM: " . $label . "\t+ added to the graph"); d_echo("\n Adding PM: " . $label . "\t+ added to the graph");
// Grab a colour from the array. // Grab a colour from the array.

2
html/includes/graphs/device/bigip_ltm_allpm_conns.inc.php
View File

@@ -52,7 +52,7 @@ if ($components[$vars['id']]['type'] == 'f5-ltm-pool') {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
d_echo("\n Adding PM: " . $label . "\t+ added to the graph"); d_echo("\n Adding PM: " . $label . "\t+ added to the graph");
// Grab a colour from the array. // Grab a colour from the array.

2
html/includes/graphs/device/bigip_ltm_allpm_pktsin.inc.php
View File

@@ -52,7 +52,7 @@ if ($components[$vars['id']]['type'] == 'f5-ltm-pool') {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
d_echo("\n Adding PM: " . $label . "\t+ added to the graph"); d_echo("\n Adding PM: " . $label . "\t+ added to the graph");
// Grab a colour from the array. // Grab a colour from the array.

2
html/includes/graphs/device/bigip_ltm_allpm_pktsout.inc.php
View File

@@ -52,7 +52,7 @@ if ($components[$vars['id']]['type'] == 'f5-ltm-pool') {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
d_echo("\n Adding PM: " . $label . "\t+ added to the graph"); d_echo("\n Adding PM: " . $label . "\t+ added to the graph");
// Grab a colour from the array. // Grab a colour from the array.

2
html/includes/graphs/device/bigip_ltm_allvs_bytesin.inc.php
View File

@@ -31,7 +31,7 @@ foreach ($components as $compid => $comp) {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a colour from the array. // Grab a colour from the array.
if (isset($colours[$colcount])) { if (isset($colours[$colcount])) {
$colour = $colours[$colcount]; $colour = $colours[$colcount];

2
html/includes/graphs/device/bigip_ltm_allvs_bytesout.inc.php
View File

@@ -31,7 +31,7 @@ foreach ($components as $compid => $comp) {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a colour from the array. // Grab a colour from the array.
if (isset($colours[$colcount])) { if (isset($colours[$colcount])) {
$colour = $colours[$colcount]; $colour = $colours[$colcount];

2
html/includes/graphs/device/bigip_ltm_allvs_conns.inc.php
View File

@@ -31,7 +31,7 @@ foreach ($components as $compid => $comp) {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a colour from the array. // Grab a colour from the array.
if (isset($colours[$colcount])) { if (isset($colours[$colcount])) {
$colour = $colours[$colcount]; $colour = $colours[$colcount];

2
html/includes/graphs/device/bigip_ltm_allvs_pktsin.inc.php
View File

@@ -31,7 +31,7 @@ foreach ($components as $compid => $comp) {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a colour from the array. // Grab a colour from the array.
if (isset($colours[$colcount])) { if (isset($colours[$colcount])) {
$colour = $colours[$colcount]; $colour = $colours[$colcount];

2
html/includes/graphs/device/bigip_ltm_allvs_pktsout.inc.php
View File

@@ -31,7 +31,7 @@ foreach ($components as $compid => $comp) {
$label = $comp['label']; $label = $comp['label'];
$hash = $comp['hash']; $hash = $comp['hash'];
$rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array($comp['type'], $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a colour from the array. // Grab a colour from the array.
if (isset($colours[$colcount])) { if (isset($colours[$colcount])) {
$colour = $colours[$colcount]; $colour = $colours[$colcount];

2
html/includes/graphs/device/bigip_ltm_vs_bytes.inc.php
View File

@@ -29,7 +29,7 @@ if (isset($components[$vars['id']])) {
$rrd_options .= " COMMENT:'Bits Now Ave Max\\n'"; $rrd_options .= " COMMENT:'Bits Now Ave Max\\n'";
$rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " DEF:INBYTES=" . $rrd_filename . ":bytesin:AVERAGE "; $rrd_options .= " DEF:INBYTES=" . $rrd_filename . ":bytesin:AVERAGE ";
$rrd_options .= " CDEF:INBITS=INBYTES,8,* "; $rrd_options .= " CDEF:INBITS=INBYTES,8,* ";
$rrd_options .= " LINE1.25:INBITS#330033:'Bits In '"; $rrd_options .= " LINE1.25:INBITS#330033:'Bits In '";

2
html/includes/graphs/device/bigip_ltm_vs_conns.inc.php
View File

@@ -25,7 +25,7 @@ if (isset($components[$vars['id']])) {
$hash = $components[$vars['id']]['hash']; $hash = $components[$vars['id']]['hash'];
$rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$ds = 'totconns'; $ds = 'totconns';

2
html/includes/graphs/device/bigip_ltm_vs_pkts.inc.php
View File

@@ -25,7 +25,7 @@ if (isset($components[$vars['id']])) {
$hash = $components[$vars['id']]['hash']; $hash = $components[$vars['id']]['hash'];
$rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash)); $rrd_filename = rrd_name($device['hostname'], array('f5-ltm-vs', $label, $hash));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$ds_in = 'pktsin'; $ds_in = 'pktsin';
$ds_out = 'pktsout'; $ds_out = 'pktsout';

2
html/includes/graphs/device/cambium-epmp-frameUtilization.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-frameUtilization'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-frameUtilization');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'% Now Ave Max \\n'"; $rrd_options .= " COMMENT:'% Now Ave Max \\n'";
$rrd_options .= ' DEF:dlwlanframeutilization='.$rrdfilename.':dlwlanfrut:AVERAGE '; $rrd_options .= ' DEF:dlwlanframeutilization='.$rrdfilename.':dlwlanfrut:AVERAGE ';
$rrd_options .= ' DEF:ulwlanframeutilization='.$rrdfilename.':ulwlanfrut:AVERAGE '; $rrd_options .= ' DEF:ulwlanframeutilization='.$rrdfilename.':ulwlanfrut:AVERAGE ';

2
html/includes/graphs/device/cambium_250_dataRate.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-250-dataRate'); $rrdfilename = rrd_name($device['hostname'], 'cambium-250-dataRate');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Mbps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Mbps Now Ave Max \\n'";
$rrd_options .= ' DEF:receiveDataRate='.$rrdfilename.':receiveDataRate:AVERAGE '; $rrd_options .= ' DEF:receiveDataRate='.$rrdfilename.':receiveDataRate:AVERAGE ';
$rrd_options .= ' DEF:transmitDataRate='.$rrdfilename.':transmitDataRate:AVERAGE '; $rrd_options .= ' DEF:transmitDataRate='.$rrdfilename.':transmitDataRate:AVERAGE ';

2
html/includes/graphs/device/cambium_250_modulationMode.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-250-modulationMode'); $rrdfilename = rrd_name($device['hostname'], 'cambium-250-modulationMode');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Mode Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Mode Now Ave Max \\n'";
$rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE '; $rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE ';
$rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE '; $rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE ';

2
html/includes/graphs/device/cambium_250_receivePower.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-250-receivePower'); $rrdfilename = rrd_name($device['hostname'], 'cambium-250-receivePower');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:receivePower='.$rrdfilename.':receivePower:AVERAGE '; $rrd_options .= ' DEF:receivePower='.$rrdfilename.':receivePower:AVERAGE ';
$rrd_options .= ' DEF:noiseFloor='.$rrdfilename.':noiseFloor:AVERAGE '; $rrd_options .= ' DEF:noiseFloor='.$rrdfilename.':noiseFloor:AVERAGE ';

2
html/includes/graphs/device/cambium_250_ssr.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-250-ssr'); $rrdfilename = rrd_name($device['hostname'], 'cambium-250-ssr');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE '; $rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE ';
$rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' "; $rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' ";

2
html/includes/graphs/device/cambium_250_transmitPower.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-250-transmitPower'); $rrdfilename = rrd_name($device['hostname'], 'cambium-250-transmitPower');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE '; $rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE ';
$rrd_options .= " LINE2:transmitPower#FF0000:'Transmit Power ' "; $rrd_options .= " LINE2:transmitPower#FF0000:'Transmit Power ' ";

2
html/includes/graphs/device/cambium_650_dataRate.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-dataRate'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-dataRate');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Mbps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Mbps Now Ave Max \\n'";
$rrd_options .= ' DEF:receiveDataRate='.$rrdfilename.':receiveDataRate:AVERAGE '; $rrd_options .= ' DEF:receiveDataRate='.$rrdfilename.':receiveDataRate:AVERAGE ';
$rrd_options .= ' DEF:transmitDataRate='.$rrdfilename.':transmitDataRate:AVERAGE '; $rrd_options .= ' DEF:transmitDataRate='.$rrdfilename.':transmitDataRate:AVERAGE ';

2
html/includes/graphs/device/cambium_650_gps.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-gps'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-gps');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'\\n'"; $rrd_options .= " COMMENT:'\\n'";
$rrd_options .= ' DEF:gps='.$rrdfilename.':gps:AVERAGE '; $rrd_options .= ' DEF:gps='.$rrdfilename.':gps:AVERAGE ';
$rrd_options .= " LINE2:gps#9B30FF:'GPS Status' "; $rrd_options .= " LINE2:gps#9B30FF:'GPS Status' ";

2
html/includes/graphs/device/cambium_650_modulationMode.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-modulationMode'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-modulationMode');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Mode Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Mode Now Ave Max \\n'";
$rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE '; $rrd_options .= ' DEF:rxModulation='.$rrdfilename.':rxModulation:AVERAGE ';
$rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE '; $rrd_options .= ' DEF:txModulation='.$rrdfilename.':txModulation:AVERAGE ';

2
html/includes/graphs/device/cambium_650_rawReceivePower.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-rawReceivePower'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-rawReceivePower');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:rawReceivePower='.$rrdfilename.':rawReceivePower:AVERAGE '; $rrd_options .= ' DEF:rawReceivePower='.$rrdfilename.':rawReceivePower:AVERAGE ';
$rrd_options .= " LINE2:rawReceivePower#00FF00:'Receive Power ' "; $rrd_options .= " LINE2:rawReceivePower#00FF00:'Receive Power ' ";

2
html/includes/graphs/device/cambium_650_ssr.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-ssr'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-ssr');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE '; $rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE ';
$rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' "; $rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' ";

2
html/includes/graphs/device/cambium_650_transmitPower.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-650-transmitPower'); $rrdfilename = rrd_name($device['hostname'], 'cambium-650-transmitPower');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE '; $rrd_options .= ' DEF:transmitPower='.$rrdfilename.':transmitPower:AVERAGE ';
$rrd_options .= " -l 0 "; $rrd_options .= " -l 0 ";

2
html/includes/graphs/device/cambium_epmp_RFStatus.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-RFStatus'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-RFStatus');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:cambiumSTADLRSSI='.$rrdfilename.':cambiumSTADLRSSI:AVERAGE '; $rrd_options .= ' DEF:cambiumSTADLRSSI='.$rrdfilename.':cambiumSTADLRSSI:AVERAGE ';
$rrd_options .= ' DEF:cambiumSTADLSNR='.$rrdfilename.':cambiumSTADLSNR:AVERAGE '; $rrd_options .= ' DEF:cambiumSTADLSNR='.$rrdfilename.':cambiumSTADLSNR:AVERAGE ';

2
html/includes/graphs/device/cambium_epmp_access.inc.php
View File

@@ -10,7 +10,7 @@
*/ */
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-access'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-access');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Value Now \\n'"; $rrd_options .= " COMMENT:'Value Now \\n'";
$rrd_options .= ' DEF:entryAttempt='.$rrdfilename.':entryAttempt:AVERAGE '; $rrd_options .= ' DEF:entryAttempt='.$rrdfilename.':entryAttempt:AVERAGE ';
$rrd_options .= ' DEF:entryAccess='.$rrdfilename.':entryAccess:AVERAGE '; $rrd_options .= ' DEF:entryAccess='.$rrdfilename.':entryAccess:AVERAGE ';

2
html/includes/graphs/device/cambium_epmp_freq.inc.php
View File

@@ -10,7 +10,7 @@
*/ */
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-freq'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-freq');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Mhz \\n'"; $rrd_options .= " COMMENT:'Mhz \\n'";
$rrd_options .= ' DEF:freq='.$rrdfilename.':freq:AVERAGE '; $rrd_options .= ' DEF:freq='.$rrdfilename.':freq:AVERAGE ';
$rrd_options .= " LINE2:freq#008080:'Frequency ' "; $rrd_options .= " LINE2:freq#008080:'Frequency ' ";

2
html/includes/graphs/device/cambium_epmp_gps.inc.php
View File

@@ -10,7 +10,7 @@
*/ */
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-gps'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-gps');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:numTracked='.$rrdfilename.':numTracked:AVERAGE '; $rrd_options .= ' DEF:numTracked='.$rrdfilename.':numTracked:AVERAGE ';
$rrd_options .= ' DEF:numVisible='.$rrdfilename.':numVisible:AVERAGE '; $rrd_options .= ' DEF:numVisible='.$rrdfilename.':numVisible:AVERAGE ';

2
html/includes/graphs/device/cambium_epmp_gpsSync.inc.php
View File

@@ -10,7 +10,7 @@
*/ */
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-gpsSync'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-gpsSync');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'1 - GPS Sync Up 2 - GPS Sync Down 3 - CMM Sync \\n'"; $rrd_options .= " COMMENT:'1 - GPS Sync Up 2 - GPS Sync Down 3 - CMM Sync \\n'";
$rrd_options .= ' DEF:gpsSync='.$rrdfilename.':gpsSync:AVERAGE '; $rrd_options .= ' DEF:gpsSync='.$rrdfilename.':gpsSync:AVERAGE ';
$rrd_options .= " -l 1 "; $rrd_options .= " -l 1 ";

2
html/includes/graphs/device/cambium_epmp_modulation.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-modulation'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-modulation');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Value Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Value Now Ave Max \\n'";
$rrd_options .= ' DEF:uplinkMCSMode='.$rrdfilename.':uplinkMCSMode:AVERAGE '; $rrd_options .= ' DEF:uplinkMCSMode='.$rrdfilename.':uplinkMCSMode:AVERAGE ';
$rrd_options .= ' DEF:downlinkMCSMode='.$rrdfilename.':downlinkMCSMode:AVERAGE '; $rrd_options .= ' DEF:downlinkMCSMode='.$rrdfilename.':downlinkMCSMode:AVERAGE ';

2
html/includes/graphs/device/cambium_epmp_registeredSM.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-registeredSM'); $rrdfilename = rrd_name($device['hostname'], 'cambium-epmp-registeredSM');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Value Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Value Now Ave Max \\n'";
$rrd_options .= ' DEF:regSM='.$rrdfilename.':regSM:AVERAGE '; $rrd_options .= ' DEF:regSM='.$rrdfilename.':regSM:AVERAGE ';
$rrd_options .= " LINE2:regSM#73b0c2:'Registered SM ' "; $rrd_options .= " LINE2:regSM#73b0c2:'Registered SM ' ";

2
html/includes/graphs/device/canopy-generic-frameUtilization.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-frameUtilization'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-frameUtilization');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'% Now Ave Max \\n'"; $rrd_options .= " COMMENT:'% Now Ave Max \\n'";
$rrd_options .= ' DEF:downlinkutilization='.$rrdfilename.':downlinkutilization:AVERAGE '; $rrd_options .= ' DEF:downlinkutilization='.$rrdfilename.':downlinkutilization:AVERAGE ';
$rrd_options .= ' DEF:uplinkutilization='.$rrdfilename.':uplinkutilization:AVERAGE '; $rrd_options .= ' DEF:uplinkutilization='.$rrdfilename.':uplinkutilization:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_450_linkRadioDbm.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-linkRadioDbm'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-linkRadioDbm');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_450_masterSSR.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-masterSSR'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-masterSSR');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE '; $rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE ';
$rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' "; $rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' ";

2
html/includes/graphs/device/canopy_generic_450_powerlevel.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-powerlevel'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-powerlevel');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:last='.$rrdfilename.':last:AVERAGE '; $rrd_options .= ' DEF:last='.$rrdfilename.':last:AVERAGE ';
$rrd_options .= " LINE2:last#003EFF:'Last ' "; $rrd_options .= " LINE2:last#003EFF:'Last ' ";

2
html/includes/graphs/device/canopy_generic_450_ptpSNR.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-ptpSNR'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-ptpSNR');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_450_slaveHV.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveHV'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveHV');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_450_slaveSNR.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveSNR'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveSNR');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_450_slaveSSR.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveSSR'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-450-slaveSSR');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE '; $rrd_options .= ' DEF:ssr='.$rrdfilename.':ssr:AVERAGE ';
$rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' "; $rrd_options .= " LINE2:ssr#9B30FF:'Signal Strength Ratio ' ";

2
html/includes/graphs/device/canopy_generic_crcErrors.inc.php
View File

@@ -12,7 +12,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-crcErrors'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-crcErrors');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:crcErrors='.$rrdfilename.':crcErrors:AVERAGE '; $rrd_options .= ' DEF:crcErrors='.$rrdfilename.':crcErrors:AVERAGE ';
$rrd_options .= " LINE2:crcErrors#FF0000:'CRC Errors ' "; $rrd_options .= " LINE2:crcErrors#FF0000:'CRC Errors ' ";

2
html/includes/graphs/device/canopy_generic_errorCount.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-errorCount'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-errorCount');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:fecInErrorsCount='.$rrdfilename.':fecInErrorsCount:AVERAGE '; $rrd_options .= ' DEF:fecInErrorsCount='.$rrdfilename.':fecInErrorsCount:AVERAGE ';
$rrd_options .= ' DEF:fecOutErrorsCount='.$rrdfilename.':fecOutErrorsCount:AVERAGE '; $rrd_options .= ' DEF:fecOutErrorsCount='.$rrdfilename.':fecOutErrorsCount:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_freq.inc.php
View File

@@ -10,7 +10,7 @@
*/ */
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-freq'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-freq');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Ghz Now \\n'"; $rrd_options .= " COMMENT:'Ghz Now \\n'";
$rrd_options .= ' DEF:freq='.$rrdfilename.':freq:AVERAGE '; $rrd_options .= ' DEF:freq='.$rrdfilename.':freq:AVERAGE ';
$rrd_options .= " LINE2:freq#FF0000:'Frequency ' "; $rrd_options .= " LINE2:freq#FF0000:'Frequency ' ";

2
html/includes/graphs/device/canopy_generic_gpsStats.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-gpsStats'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-gpsStats');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Amount Now Ave Max \\n'"; $rrd_options .= " COMMENT:'Amount Now Ave Max \\n'";
$rrd_options .= ' DEF:visible='.$rrdfilename.':visible:AVERAGE '; $rrd_options .= ' DEF:visible='.$rrdfilename.':visible:AVERAGE ';
$rrd_options .= ' DEF:tracked='.$rrdfilename.':tracked:AVERAGE '; $rrd_options .= ' DEF:tracked='.$rrdfilename.':tracked:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_jitter.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-jitter'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-jitter');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Ave Max \\n'"; $rrd_options .= " COMMENT:' Now Ave Max \\n'";
$rrd_options .= ' DEF:jitter='.$rrdfilename.':jitter:AVERAGE '; $rrd_options .= ' DEF:jitter='.$rrdfilename.':jitter:AVERAGE ';
$rrd_options .= " AREA:jitter#3333cc:'Jitter ' "; $rrd_options .= " AREA:jitter#3333cc:'Jitter ' ";

2
html/includes/graphs/device/canopy_generic_radioDbm.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-radioDbm'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-radioDbm');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:dbm='.$rrdfilename.':dbm:AVERAGE '; $rrd_options .= ' DEF:dbm='.$rrdfilename.':dbm:AVERAGE ';
$rrd_options .= ' DEF:min='.$rrdfilename.':min:AVERAGE '; $rrd_options .= ' DEF:min='.$rrdfilename.':min:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_regCount.inc.php
View File

@@ -13,7 +13,7 @@ $scale_min = 0;
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-regCount'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-regCount');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:regCount='.$rrdfilename.':regCount:AVERAGE '; $rrd_options .= ' DEF:regCount='.$rrdfilename.':regCount:AVERAGE ';
$rrd_options .= ' DEF:failed='.$rrdfilename.':failed:AVERAGE '; $rrd_options .= ' DEF:failed='.$rrdfilename.':failed:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_rssi.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-rssi'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-rssi');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:rssi='.$rrdfilename.':rssi:AVERAGE '; $rrd_options .= ' DEF:rssi='.$rrdfilename.':rssi:AVERAGE ';
$rrd_options .= " AREA:rssi#FF0000:'RSSI ' "; $rrd_options .= " AREA:rssi#FF0000:'RSSI ' ";

2
html/includes/graphs/device/canopy_generic_signalHV.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-signalHV'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-signalHV');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_snrHV.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-snrHV'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-snrHV');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE '; $rrd_options .= ' DEF:vertical='.$rrdfilename.':vertical:AVERAGE ';
$rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE '; $rrd_options .= ' DEF:horizontal='.$rrdfilename.':horizontal:AVERAGE ';

2
html/includes/graphs/device/canopy_generic_whispGPSStats.inc.php
View File

@@ -13,7 +13,7 @@ $scale_min = 0;
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'canopy-generic-whispGPSStats'); $rrdfilename = rrd_name($device['hostname'], 'canopy-generic-whispGPSStats');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Value 1 = Synched 2 = Lost Sync 3 = Generating \\n'"; $rrd_options .= " COMMENT:'Value 1 = Synched 2 = Lost Sync 3 = Generating \\n'";
$rrd_options .= ' DEF:whispGPSStats='.$rrdfilename.':whispGPSStats:AVERAGE '; $rrd_options .= ' DEF:whispGPSStats='.$rrdfilename.':whispGPSStats:AVERAGE ';
$rrd_options .= " -l 1 "; $rrd_options .= " -l 1 ";

2
html/includes/graphs/device/cisco-iosdsp.inc.php
View File

@@ -15,7 +15,7 @@ include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E "; $rrd_options .= " -l 0 -E ";
$rrd_filename = rrd_name($device['hostname'], 'cisco-iosdsp'); $rrd_filename = rrd_name($device['hostname'], 'cisco-iosdsp');
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'"; $rrd_options .= " COMMENT:' Cur Min Max\\n'";
$rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE "; $rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE ";
$rrd_options .= " AREA:Total#c099ff "; $rrd_options .= " AREA:Total#c099ff ";

2
html/includes/graphs/device/cisco-iosmtp.inc.php
View File

@@ -15,7 +15,7 @@ include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E "; $rrd_options .= " -l 0 -E ";
$rrd_filename = rrd_name($device['hostname'], 'cisco-iosmtp'); $rrd_filename = rrd_name($device['hostname'], 'cisco-iosmtp');
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'"; $rrd_options .= " COMMENT:' Cur Min Max\\n'";
$rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE "; $rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE ";
$rrd_options .= " AREA:Total#c099ff "; $rrd_options .= " AREA:Total#c099ff ";

2
html/includes/graphs/device/cisco-iospri.inc.php
View File

@@ -15,7 +15,7 @@ include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E "; $rrd_options .= " -l 0 -E ";
$rrd_filename = rrd_name($device['hostname'], 'cisco-iospri'); $rrd_filename = rrd_name($device['hostname'], 'cisco-iospri');
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'"; $rrd_options .= " COMMENT:' Cur Min Max\\n'";
$rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE "; $rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE ";
$rrd_options .= " AREA:Total#c099ff "; $rrd_options .= " AREA:Total#c099ff ";

2
html/includes/graphs/device/cisco-iosxcode.inc.php
View File

@@ -15,7 +15,7 @@ include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E "; $rrd_options .= " -l 0 -E ";
$rrd_filename = rrd_name($device['hostname'], 'cisco-iosxcode'); $rrd_filename = rrd_name($device['hostname'], 'cisco-iosxcode');
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'"; $rrd_options .= " COMMENT:' Cur Min Max\\n'";
$rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE "; $rrd_options .= " DEF:Total=" . $rrd_filename . ":total:AVERAGE ";
$rrd_options .= " AREA:Total#c099ff "; $rrd_options .= " AREA:Total#c099ff ";

2
html/includes/graphs/device/cisco-otv-mac.inc.php
View File

@@ -28,7 +28,7 @@ foreach ($components as $id => $array) {
if ($array['otvtype'] == 'endpoint') { if ($array['otvtype'] == 'endpoint') {
$rrd_filename = rrd_name($device['hostname'], array('cisco', 'otv', $array['endpoint'], 'mac')); $rrd_filename = rrd_name($device['hostname'], array('cisco', 'otv', $array['endpoint'], 'mac'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's // Stack the area on the second and subsequent DS's
$stack = ""; $stack = "";
if ($count != 0) { if ($count != 0) {

2
html/includes/graphs/device/cisco-otv-vlan.inc.php
View File

@@ -28,7 +28,7 @@ foreach ($components as $id => $array) {
if ($array['otvtype'] == 'overlay') { if ($array['otvtype'] == 'overlay') {
$rrd_filename = rrd_name($device['hostname'], array('cisco', 'otv', $array['label'], 'vlan')); $rrd_filename = rrd_name($device['hostname'], array('cisco', 'otv', $array['label'], 'vlan'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's // Stack the area on the second and subsequent DS's
$stack = ""; $stack = "";
if ($count != 0) { if ($count != 0) {

2
html/includes/graphs/device/cisco_wwan_mnc.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cisco-wwan-mnc'); $rrdfilename = rrd_name($device['hostname'], 'cisco-wwan-mnc');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= ' DEF:mnc='.$rrdfilename.':mnc:LAST '; $rrd_options .= ' DEF:mnc='.$rrdfilename.':mnc:LAST ';
$rrd_options .= ' --lower-limit 0 '; $rrd_options .= ' --lower-limit 0 ';
$rrd_options .= " --vertical-label='MNC'"; $rrd_options .= " --vertical-label='MNC'";

2
html/includes/graphs/device/cisco_wwan_rssi.inc.php
View File

@@ -11,7 +11,7 @@
require 'includes/graphs/common.inc.php'; require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'cisco-wwan-rssi'); $rrdfilename = rrd_name($device['hostname'], 'cisco-wwan-rssi');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Ave Max \\n'"; $rrd_options .= " COMMENT:'dBm Now Ave Max \\n'";
$rrd_options .= ' DEF:rssi='.$rrdfilename.':rssi:AVERAGE '; $rrd_options .= ' DEF:rssi='.$rrdfilename.':rssi:AVERAGE ';
$rrd_options .= ' --alt-autoscale'; $rrd_options .= ' --alt-autoscale';

2
html/includes/graphs/device/ntp_delay.inc.php
View File

@@ -28,7 +28,7 @@ $count = 0;
foreach ($components as $id => $array) { foreach ($components as $id => $array) {
$rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer'])); $rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer']));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a color from the array. // Grab a color from the array.
if (isset($config['graph_colours']['mixed'][$count])) { if (isset($config['graph_colours']['mixed'][$count])) {
$color = $config['graph_colours']['mixed'][$count]; $color = $config['graph_colours']['mixed'][$count];

2
html/includes/graphs/device/ntp_dispersion.inc.php
View File

@@ -28,7 +28,7 @@ $count = 0;
foreach ($components as $id => $array) { foreach ($components as $id => $array) {
$rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer'])); $rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer']));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a color from the array. // Grab a color from the array.
if (isset($config['graph_colours']['mixed'][$count])) { if (isset($config['graph_colours']['mixed'][$count])) {
$color = $config['graph_colours']['mixed'][$count]; $color = $config['graph_colours']['mixed'][$count];

2
html/includes/graphs/device/ntp_offset.inc.php
View File

@@ -28,7 +28,7 @@ $count = 0;
foreach ($components as $id => $array) { foreach ($components as $id => $array) {
$rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer'])); $rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer']));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a color from the array. // Grab a color from the array.
if (isset($config['graph_colours']['mixed'][$count])) { if (isset($config['graph_colours']['mixed'][$count])) {
$color = $config['graph_colours']['mixed'][$count]; $color = $config['graph_colours']['mixed'][$count];

2
html/includes/graphs/device/ntp_stratum.inc.php
View File

@@ -28,7 +28,7 @@ $count = 0;
foreach ($components as $id => $array) { foreach ($components as $id => $array) {
$rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer'])); $rrd_filename = rrd_name($device['hostname'], array('ntp', $array['peer']));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
// Grab a color from the array. // Grab a color from the array.
if (isset($config['graph_colours']['mixed'][$count])) { if (isset($config['graph_colours']['mixed'][$count])) {
$color = $config['graph_colours']['mixed'][$count]; $color = $config['graph_colours']['mixed'][$count];

2
html/includes/graphs/device/service.inc.php
View File

@@ -68,7 +68,7 @@ if ($services[$vars['service']]['service_ds'] != "") {
$ds = $vars['ds']; $ds = $vars['ds'];
$label = $graphinfo[$vars['ds']]; $label = $graphinfo[$vars['ds']];
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
if (isset($check_graph)) { if (isset($check_graph)) {
// We have a graph definition, use it. // We have a graph definition, use it.
$rrd_additions .= $check_graph[$ds]; $rrd_additions .= $check_graph[$ds];

2
html/includes/graphs/device/siklu_rfAverageCinr.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless'); $rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'db Now Min Max\\n'"; $rrd_options .= " COMMENT:'db Now Min Max\\n'";
$rrd_options .= ' DEF:rfAverageCinr='.$rrdfilename.':rfAverageCinr:AVERAGE '; $rrd_options .= ' DEF:rfAverageCinr='.$rrdfilename.':rfAverageCinr:AVERAGE ';
$rrd_options .= " LINE1:rfAverageCinr#CC0000:'CINR ' "; $rrd_options .= " LINE1:rfAverageCinr#CC0000:'CINR ' ";

2
html/includes/graphs/device/siklu_rfAverageRssi.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless'); $rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'"; $rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:rfAverageRssi='.$rrdfilename.':rfAverageRssi:AVERAGE '; $rrd_options .= ' DEF:rfAverageRssi='.$rrdfilename.':rfAverageRssi:AVERAGE ';
$rrd_options .= " LINE1:rfAverageRssi#CC0000:'RSSI ' "; $rrd_options .= " LINE1:rfAverageRssi#CC0000:'RSSI ' ";

2
html/includes/graphs/device/siklu_rfOperationalFrequency.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless'); $rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Hz Now Min Max\\n'"; $rrd_options .= " COMMENT:'Hz Now Min Max\\n'";
$rrd_options .= ' DEF:rfOperFreq='.$rrdfilename.':rfOperFreq:AVERAGE '; $rrd_options .= ' DEF:rfOperFreq='.$rrdfilename.':rfOperFreq:AVERAGE ';
$rrd_options .= " LINE1:rfOperFreq#CC0000:'GHz ' "; $rrd_options .= " LINE1:rfOperFreq#CC0000:'GHz ' ";

2
html/includes/graphs/device/siklu_rfinterfaceOctets.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-interface'); $rrdfilename = rrd_name($device['hostname'], 'siklu-interface');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'bps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'bps Now Ave Max \\n'";
$rrd_options .= ' DEF:rfInOctets='.$rrdfilename.':rfInOctets:AVERAGE '; $rrd_options .= ' DEF:rfInOctets='.$rrdfilename.':rfInOctets:AVERAGE ';
$rrd_options .= ' DEF:rfOutOctets='.$rrdfilename.':rfOutOctets:AVERAGE '; $rrd_options .= ' DEF:rfOutOctets='.$rrdfilename.':rfOutOctets:AVERAGE ';

2
html/includes/graphs/device/siklu_rfinterfaceOtherOctets.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-interface'); $rrdfilename = rrd_name($device['hostname'], 'siklu-interface');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'bps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'bps Now Ave Max \\n'";
$rrd_options .= ' DEF:rfInGoodOctets='.$rrdfilename.':rfInGoodOctets:AVERAGE '; $rrd_options .= ' DEF:rfInGoodOctets='.$rrdfilename.':rfInGoodOctets:AVERAGE ';
$rrd_options .= ' DEF:rfInErroredOctets='.$rrdfilename.':rfInErroredOctets:AVERAGE '; $rrd_options .= ' DEF:rfInErroredOctets='.$rrdfilename.':rfInErroredOctets:AVERAGE ';

2
html/includes/graphs/device/siklu_rfinterfaceOtherPkts.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-interface'); $rrdfilename = rrd_name($device['hostname'], 'siklu-interface');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'pps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'pps Now Ave Max \\n'";
$rrd_options .= ' DEF:rfInGoodPkts='.$rrdfilename.':rfInGoodPkts:AVERAGE '; $rrd_options .= ' DEF:rfInGoodPkts='.$rrdfilename.':rfInGoodPkts:AVERAGE ';
$rrd_options .= ' DEF:rfInErroredPkts='.$rrdfilename.':rfInErroredPkts:AVERAGE '; $rrd_options .= ' DEF:rfInErroredPkts='.$rrdfilename.':rfInErroredPkts:AVERAGE ';

2
html/includes/graphs/device/siklu_rfinterfacePkts.inc.php
View File

@@ -4,7 +4,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-interface'); $rrdfilename = rrd_name($device['hostname'], 'siklu-interface');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'pps Now Ave Max \\n'"; $rrd_options .= " COMMENT:'pps Now Ave Max \\n'";
$rrd_options .= ' DEF:rfInPkts='.$rrdfilename.':rfInPkts:AVERAGE '; $rrd_options .= ' DEF:rfInPkts='.$rrdfilename.':rfInPkts:AVERAGE ';
$rrd_options .= ' DEF:rfOutPkts='.$rrdfilename.':rfOutPkts:AVERAGE '; $rrd_options .= ' DEF:rfOutPkts='.$rrdfilename.':rfOutPkts:AVERAGE ';

2
html/includes/graphs/device/sla_icmpjitter_iajitter.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":JitterIAJOut:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":JitterIAJOut:AVERAGE ";

2
html/includes/graphs/device/sla_icmpjitter_jitter.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":JitterAvgSD:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":JitterAvgSD:AVERAGE ";

2
html/includes/graphs/device/sla_icmpjitter_latency.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":LatencyOWAvgSD:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":LatencyOWAvgSD:AVERAGE ";

2
html/includes/graphs/device/sla_icmpjitter_lost.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:PL=" . $rrd_filename . ":PacketLoss:AVERAGE "; $rrd_options .= " DEF:PL=" . $rrd_filename . ":PacketLoss:AVERAGE ";

2
html/includes/graphs/device/sla_icmpjitter_oos.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'icmpjitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":PacketOosSD:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":PacketOosSD:AVERAGE ";

2
html/includes/graphs/device/sla_jitter-icpif.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:ICPIF=" . $rrd_filename . ":ICPIF:AVERAGE "; $rrd_options .= " DEF:ICPIF=" . $rrd_filename . ":ICPIF:AVERAGE ";

2
html/includes/graphs/device/sla_jitter-latency.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":OWAvgSD:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":OWAvgSD:AVERAGE ";

2
html/includes/graphs/device/sla_jitter-loss.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":PacketLossSD:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":PacketLossSD:AVERAGE ";

2
html/includes/graphs/device/sla_jitter-lost.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:POS=" . $rrd_filename . ":PacketOutOfSequence:AVERAGE "; $rrd_options .= " DEF:POS=" . $rrd_filename . ":PacketOutOfSequence:AVERAGE ";

2
html/includes/graphs/device/sla_jitter-mos.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:MOS=" . $rrd_filename . ":MOS:AVERAGE "; $rrd_options .= " DEF:MOS=" . $rrd_filename . ":MOS:AVERAGE ";

2
html/includes/graphs/device/sla_jitter.inc.php
View File

@@ -17,7 +17,7 @@ require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E '; $rrd_options .= ' -l 0 -E ';
$rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter')); $rrd_filename = rrd_name($device['hostname'], array('sla', $sla['sla_nr'], 'jitter'));
if (file_exists($rrd_filename)) { if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max Avg\\n'"; $rrd_options .= " COMMENT:' Cur Min Max Avg\\n'";
$rrd_options .= " DEF:SD=" . $rrd_filename . ":AvgSDJ:AVERAGE "; $rrd_options .= " DEF:SD=" . $rrd_filename . ":AvgSDJ:AVERAGE ";

2
html/includes/graphs/device/sub10_sub10RadioLclAFER.inc.php
View File

@@ -7,7 +7,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'"; $rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclAFER='.$rrdfilename.':sub10RadioLclAFER:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclAFER='.$rrdfilename.':sub10RadioLclAFER:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclAFER#CC0000:'Percent ' "; $rrd_options .= " LINE1:sub10RadioLclAFER#CC0000:'Percent ' ";

2
html/includes/graphs/device/sub10_sub10RadioLclDataRate.inc.php
View File

@@ -7,7 +7,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Min Max\\n'"; $rrd_options .= " COMMENT:'dBm Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclDataRa='.$rrdfilename.':sub10RadioLclDataRa:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclDataRa='.$rrdfilename.':sub10RadioLclDataRa:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclDataRa#CC0000:'Tx Power ' "; $rrd_options .= " LINE1:sub10RadioLclDataRa#CC0000:'Tx Power ' ";

2
html/includes/graphs/device/sub10_sub10RadioLclLnkLoss.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dB Now Min Max\\n'"; $rrd_options .= " COMMENT:'dB Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclLnkLos='.$rrdfilename.':sub10RadioLclLnkLos:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclLnkLos='.$rrdfilename.':sub10RadioLclLnkLos:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclLnkLos#CC0000:'Link Loss ' "; $rrd_options .= " LINE1:sub10RadioLclLnkLos#CC0000:'Link Loss ' ";

2
html/includes/graphs/device/sub10_sub10RadioLclRxPower.inc.php
View File

@@ -7,7 +7,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Min Max\\n'"; $rrd_options .= " COMMENT:'dBm Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclRxPowe='.$rrdfilename.':sub10RadioLclRxPowe:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclRxPowe='.$rrdfilename.':sub10RadioLclRxPowe:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclRxPowe#CC0000:'Rx Power ' "; $rrd_options .= " LINE1:sub10RadioLclRxPowe#CC0000:'Rx Power ' ";

2
html/includes/graphs/device/sub10_sub10RadioLclTxPower.inc.php
View File

@@ -7,7 +7,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dBm Now Min Max\\n'"; $rrd_options .= " COMMENT:'dBm Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclTxPowe='.$rrdfilename.':sub10RadioLclTxPowe:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclTxPowe='.$rrdfilename.':sub10RadioLclTxPowe:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclTxPowe#CC0000:'Tx Power ' "; $rrd_options .= " LINE1:sub10RadioLclTxPowe#CC0000:'Tx Power ' ";

2
html/includes/graphs/device/sub10_sub10RadioLclVectErr.inc.php
View File

@@ -7,7 +7,7 @@ require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'sub10systems'); $rrdfilename = rrd_name($device['hostname'], 'sub10systems');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dB Now Min Max\\n'"; $rrd_options .= " COMMENT:'dB Now Min Max\\n'";
$rrd_options .= ' DEF:sub10RadioLclVectEr='.$rrdfilename.':sub10RadioLclVectEr:AVERAGE '; $rrd_options .= ' DEF:sub10RadioLclVectEr='.$rrdfilename.':sub10RadioLclVectEr:AVERAGE ';
$rrd_options .= " LINE1:sub10RadioLclVectEr#CC0000:'Vector Error ' "; $rrd_options .= " LINE1:sub10RadioLclVectEr#CC0000:'Vector Error ' ";

2
html/includes/graphs/device/ubnt_airfiber_Capacity.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'mbps Now Min Max\\n'"; $rrd_options .= " COMMENT:'mbps Now Min Max\\n'";
$rrd_options .= ' DEF:rxCapacity='.$rrdfilename.':rxCapacity:AVERAGE '; $rrd_options .= ' DEF:rxCapacity='.$rrdfilename.':rxCapacity:AVERAGE ';
$rrd_options .= ' DEF:txCapacity='.$rrdfilename.':txCapacity:AVERAGE '; $rrd_options .= ' DEF:txCapacity='.$rrdfilename.':txCapacity:AVERAGE ';

2
html/includes/graphs/device/ubnt_airfiber_LinkDist.inc.php
View File

@@ -6,7 +6,7 @@ $rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Metres Now Min Max\\n'"; $rrd_options .= " COMMENT:'Metres Now Min Max\\n'";
$rrd_options .= ' DEF:radioLinkDistM='.$rrdfilename.':radioLinkDistM:AVERAGE '; $rrd_options .= ' DEF:radioLinkDistM='.$rrdfilename.':radioLinkDistM:AVERAGE ';
$rrd_options .= " LINE1:radioLinkDistM#CC0000:'Distance ' "; $rrd_options .= " LINE1:radioLinkDistM#CC0000:'Distance ' ";

2
html/includes/graphs/device/ubnt_airfiber_RFTotOctetsRx.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Octets Now Min Max\\n'"; $rrd_options .= " COMMENT:'Octets Now Min Max\\n'";
$rrd_options .= ' DEF:rxoctetsAll='.$rrdfilename.':rxoctetsAll:AVERAGE '; $rrd_options .= ' DEF:rxoctetsAll='.$rrdfilename.':rxoctetsAll:AVERAGE ';
$rrd_options .= " LINE1:rxoctetsAll#00CC00:'Rx Octets ' "; $rrd_options .= " LINE1:rxoctetsAll#00CC00:'Rx Octets ' ";

2
html/includes/graphs/device/ubnt_airfiber_RFTotOctetsTx.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Octets Now Min Max\\n'"; $rrd_options .= " COMMENT:'Octets Now Min Max\\n'";
$rrd_options .= ' DEF:txoctetsAll='.$rrdfilename.':txoctetsAll:AVERAGE '; $rrd_options .= ' DEF:txoctetsAll='.$rrdfilename.':txoctetsAll:AVERAGE ';
$rrd_options .= " LINE1:txoctetsAll#CC0000:'Tx Octets ' "; $rrd_options .= " LINE1:txoctetsAll#CC0000:'Tx Octets ' ";

2
html/includes/graphs/device/ubnt_airfiber_RFTotPktsRx.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Packets Now Min Max\\n'"; $rrd_options .= " COMMENT:'Packets Now Min Max\\n'";
$rrd_options .= ' DEF:rxpktsAll='.$rrdfilename.':rxpktsAll:AVERAGE '; $rrd_options .= ' DEF:rxpktsAll='.$rrdfilename.':rxpktsAll:AVERAGE ';
$rrd_options .= " LINE1:rxpktsAll#CC0000:'Rx Packets ' "; $rrd_options .= " LINE1:rxpktsAll#CC0000:'Rx Packets ' ";

2
html/includes/graphs/device/ubnt_airfiber_RFTotPktsTx.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Packets Now Min Max\\n'"; $rrd_options .= " COMMENT:'Packets Now Min Max\\n'";
$rrd_options .= ' DEF:txpktsAll='.$rrdfilename.':txpktsAll:AVERAGE '; $rrd_options .= ' DEF:txpktsAll='.$rrdfilename.':txpktsAll:AVERAGE ';
$rrd_options .= " LINE1:txpktsAll#CC0000:'Tx Packets ' "; $rrd_options .= " LINE1:txpktsAll#CC0000:'Tx Packets ' ";

2
html/includes/graphs/device/ubnt_airfiber_RadioFreqs.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'"; $rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:rxFrequency='.$rrdfilename.':rxFrequency:AVERAGE '; $rrd_options .= ' DEF:rxFrequency='.$rrdfilename.':rxFrequency:AVERAGE ';
$rrd_options .= ' DEF:txFrequency='.$rrdfilename.':txFrequency:AVERAGE '; $rrd_options .= ' DEF:txFrequency='.$rrdfilename.':txFrequency:AVERAGE ';

2
html/includes/graphs/device/ubnt_airfiber_RadioTemp.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Celcius Now Min Max\\n'"; $rrd_options .= " COMMENT:'Celcius Now Min Max\\n'";
$rrd_options .= ' DEF:radio0TempC='.$rrdfilename.':radio0TempC:AVERAGE '; $rrd_options .= ' DEF:radio0TempC='.$rrdfilename.':radio0TempC:AVERAGE ';
$rrd_options .= ' DEF:radio1TempC='.$rrdfilename.':radio1TempC:AVERAGE '; $rrd_options .= ' DEF:radio1TempC='.$rrdfilename.':radio1TempC:AVERAGE ';

2
html/includes/graphs/device/ubnt_airfiber_TxPower.inc.php
View File

@@ -6,7 +6,7 @@ $rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airfiber-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'"; $rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:txPower='.$rrdfilename.':txPower:AVERAGE '; $rrd_options .= ' DEF:txPower='.$rrdfilename.':txPower:AVERAGE ';
$rrd_options .= " LINE1:txPower#CC0000:'Tx Power ' "; $rrd_options .= " LINE1:txPower#CC0000:'Tx Power ' ";

2
html/includes/graphs/device/ubnt_airmax_AirMaxCapacity.inc.php
View File

@@ -8,7 +8,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'"; $rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:AirMaxCapacity='.$rrdfilename.':AirMaxCapacity:AVERAGE '; $rrd_options .= ' DEF:AirMaxCapacity='.$rrdfilename.':AirMaxCapacity:AVERAGE ';
$rrd_options .= " LINE1:AirMaxCapacity#CC0000:'Percent ' "; $rrd_options .= " LINE1:AirMaxCapacity#CC0000:'Percent ' ";

2
html/includes/graphs/device/ubnt_airmax_AirMaxQuality.inc.php
View File

@@ -8,7 +8,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'"; $rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:AirMaxQuality='.$rrdfilename.':AirMaxQuality:AVERAGE '; $rrd_options .= ' DEF:AirMaxQuality='.$rrdfilename.':AirMaxQuality:AVERAGE ';
$rrd_options .= " LINE1:AirMaxQuality#CC0000:'Percent ' "; $rrd_options .= " LINE1:AirMaxQuality#CC0000:'Percent ' ";

2
html/includes/graphs/device/ubnt_airmax_RadioDistance.inc.php
View File

@@ -5,7 +5,7 @@ require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E "; // $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib'); $rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (file_exists($rrdfilename)) { if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Metres Now Min Max\\n'"; $rrd_options .= " COMMENT:'Metres Now Min Max\\n'";
$rrd_options .= ' DEF:RadioDistance='.$rrdfilename.':RadioDistance:AVERAGE '; $rrd_options .= ' DEF:RadioDistance='.$rrdfilename.':RadioDistance:AVERAGE ';
$rrd_options .= " LINE1:RadioDistance#CC0000:'Distance ' "; $rrd_options .= " LINE1:RadioDistance#CC0000:'Distance ' ";

Some files were not shown because too many files have changed in this diff Show More