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

Apply fixes from StyleCI (#12120)

Browse Source
This commit is contained in:
Jellyfrog
2020-09-21 15:40:17 +02:00
committed by GitHub
parent 77c531527c
commit 82f43cb98d
1733 changed files with 18337 additions and 18540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/html/graphs/sensor/airflow.inc.php
View File

@@ -22,7 +22,6 @@
* @copyright 2016 Neil Lathwood
* @author Neil Lathwood <neil@lathwood.co.uk>
*/
$scale_min = '0';
$scale_max = '10';
@@ -30,15 +29,15 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Min Max Last\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 21) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%4.1lf';
$rrd_options .= ' GPRINT:sensor:MAX:%4.1lf';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/auth.inc.php
View File

@@ -1,15 +1,15 @@
<?php
if (is_numeric($vars['id'])) {
$sensor = dbFetchRow('SELECT * FROM sensors WHERE sensor_id = ?', array($vars['id']));
$sensor = dbFetchRow('SELECT * FROM sensors WHERE sensor_id = ?', [$vars['id']]);
if (is_numeric($sensor['device_id']) && ($auth || device_permitted($sensor['device_id']))) {
$device = device_by_id_cache($sensor['device_id']);
$rrd_filename = get_sensor_rrd($device, $sensor);
$title = generate_device_link($device);
$title .= ' :: Sensor :: '.htmlentities($sensor['sensor_descr']);
$auth = true;
$title = generate_device_link($device);
$title .= ' :: Sensor :: ' . htmlentities($sensor['sensor_descr']);
$auth = true;
}
}

8
includes/html/graphs/sensor/ber.inc.php
View File

@@ -1,6 +1,6 @@
<?php
#$scale_min = '0';
//$scale_min = '0';
require 'includes/html/graphs/common.inc.php';
@@ -12,15 +12,15 @@ $rrd_options .= " -o";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor_min$current_id:MIN:%2.2le";
$rrd_options .= ' GPRINT:sensor:LAST:%2.2le';
$rrd_options .= ' GPRINT:sensor_max:MAX:%2.2le\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/charge.inc.php
View File

@@ -11,7 +11,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
if (isset($sensor['sensor_limit'])) {
$rrd_options .= ' CDEF:sensorwarm=sensor_max,'.$sensor['sensor_limit'].',GT,sensor,UNKN,IF';
$rrd_options .= ' CDEF:sensorwarm=sensor_max,' . $sensor['sensor_limit'] . ',GT,sensor,UNKN,IF';
$rrd_options .= ' LINE1:sensorwarm#660000';
}
@@ -22,14 +22,14 @@ $rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensor#bbd392";
// $rrd_options .= " AREA:sensorwarm#FFCCCC";
// $rrd_options .= " AREA:sensorcold#CCCCFF";
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= " LINE1:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 28) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/chromatic_dispersion.inc.php
View File

@@ -1,6 +1,6 @@
<?php
#$scale_min = '0';
//$scale_min = '0';
require 'includes/html/graphs/common.inc.php';
@@ -10,15 +10,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 14);
$rrd_options .= " -Y";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.0lfps/nm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.0lfps/nm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.0lfps/nm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/cooling.inc.php
View File

@@ -7,14 +7,14 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Last Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 20)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 20) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfW';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfW\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/count.inc.php
View File

@@ -4,15 +4,15 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Min Max Last\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 30)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 30) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%8.0lf';
$rrd_options .= ' GPRINT:sensor:MAX:%8.0lf';
$rrd_options .= ' GPRINT:sensor:LAST:%8.0lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/current.inc.php
View File

@@ -9,15 +9,15 @@ $rrd_options .= " COMMENT:' Min Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 21);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lf%sA";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lf%sA';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%sA\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/dbm.inc.php
View File

@@ -9,15 +9,15 @@ $rrd_options .= " COMMENT:' Min Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 18);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdBm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdBm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/delay.inc.php
View File

@@ -1,6 +1,6 @@
<?php
#$scale_min = '0';
//$scale_min = '0';
require 'includes/html/graphs/common.inc.php';
@@ -10,15 +10,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 14);
$rrd_options .= " -Y";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lf%ss";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lf%ss';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%ss\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/eer.inc.php
View File

@@ -9,15 +9,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 23);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor_min$current_id:MIN:%4.0lf";
$rrd_options .= ' GPRINT:sensor:LAST:%4.0lf';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.0lf\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/fanspeed.inc.php
View File

@@ -7,14 +7,14 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Last Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 20)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 20) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfrpm';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfrpm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/frequency.inc.php
View File

@@ -9,14 +9,14 @@ $rrd_options .= " COMMENT:' Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 28);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%sHz';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%sHz\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/humidity.inc.php
View File

@@ -11,7 +11,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' CDEF:sensorwarm=sensor_max,'.$sensor['sensor_limit'].',GT,sensor,UNKN,IF';
$rrd_options .= ' CDEF:sensorwarm=sensor_max,' . $sensor['sensor_limit'] . ',GT,sensor,UNKN,IF';
}
$rrd_options .= ' CDEF:sensorcold=sensor_min,20,LT,sensor,UNKN,IF';
$rrd_options .= ' AREA:sensor_max#c5c5c5';
@@ -20,7 +20,7 @@ $rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensor#bbd392";
// $rrd_options .= " AREA:sensorwarm#FFCCCC";
// $rrd_options .= " AREA:sensorcold#CCCCFF";
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= " LINE1:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 28) . "'";
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' LINE1:sensorwarm#660000';
}
@@ -28,9 +28,9 @@ $rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/load.inc.php
View File

@@ -12,14 +12,14 @@ $rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= ' CDEF:sensorcold=sensor_min,20,LT,sensor,UNKN,IF';
$rrd_options .= ' AREA:sensor_min#ffffffff';
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= " LINE1:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 28) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/loss.inc.php
View File

@@ -9,15 +9,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 15);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor_min$current_id:MIN:%4.1lf";
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lf\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/power.inc.php
View File

@@ -15,18 +15,18 @@ $rrd_options .= ' AREA:sensor_max#c5c5c5';
$rrd_options .= ' AREA:sensor_min#ffffffff';
if ($sensor['poller_type'] == "ipmi") {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr']), 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr']), 21) . "'";
} else {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 21) . "'";
}
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfW';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfW\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/power_consumed.inc.php
View File

@@ -4,14 +4,14 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Min Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 34)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 34) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%8.0lfkWh';
$rrd_options .= ' GPRINT:sensor:MAX:%8.0lfkWh\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/power_factor.inc.php
View File

@@ -9,17 +9,17 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Min Max Last\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 30)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 30) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%1.4lf';
$rrd_options .= ' GPRINT:sensor:MAX:%1.4lf';
$rrd_options .= ' GPRINT:sensor:LAST:%1.4lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
$rrd_options .= ' HRULE:0#999999';
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/pressure.inc.php
View File

@@ -7,14 +7,14 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Last Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 20)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 20) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfkPa';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfkPa\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

8
includes/html/graphs/sensor/quality_factor.inc.php
View File

@@ -1,6 +1,6 @@
<?php
#$scale_min = '0';
//$scale_min = '0';
require 'includes/html/graphs/common.inc.php';
@@ -10,15 +10,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 14);
$rrd_options .= " -Y";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdB";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdB';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

7
includes/html/graphs/sensor/runtime.inc.php
View File

@@ -1,15 +1,16 @@
<?php
$scale_min = '0';
require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 32);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfMin';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfMin\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

7
includes/html/graphs/sensor/signal.inc.php
View File

@@ -1,4 +1,5 @@
<?php
$scale_min = '-100';
$scale_max = '0';
require 'includes/html/graphs/common.inc.php';
@@ -8,15 +9,15 @@ $rrd_options .= " COMMENT:' Min Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 18);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdBm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdBm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/snr.inc.php
View File

@@ -9,15 +9,15 @@ $rrd_options .= " COMMENT:' Min Last Max\\n'";
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 18);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdB";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdB';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/state.inc.php
View File

@@ -7,15 +7,15 @@ require 'includes/html/graphs/common.inc.php';
$rrd_options .= " COMMENT:' Min Max Last\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 21) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%4.1lf';
$rrd_options .= ' GPRINT:sensor:MAX:%4.1lf';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

11
includes/html/graphs/sensor/temperature.inc.php
View File

@@ -1,4 +1,5 @@
<?php
$scale_min = '0';
$scale_max = '60';
@@ -10,7 +11,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' CDEF:sensorwarm=sensor_max,'.$sensor['sensor_limit'].',GT,sensor,UNKN,IF';
$rrd_options .= ' CDEF:sensorwarm=sensor_max,' . $sensor['sensor_limit'] . ',GT,sensor,UNKN,IF';
}
$rrd_options .= ' CDEF:sensorcold=sensor_min,20,LT,sensor,UNKN,IF';
$rrd_options .= ' CDEF:sensor_diff=sensor_max,sensor_min,-';
@@ -18,9 +19,9 @@ $rrd_options .= ' AREA:sensor_min';
$rrd_options .= ' AREA:sensor_diff#c5c5c5::STACK';
if ($sensor['poller_type'] == "ipmi") {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr']), 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr']), 21) . "'";
} else {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 21) . "'";
}
$rrd_options .= ' GPRINT:sensor_min:MIN:%4.1lfC';
@@ -28,9 +29,9 @@ $rrd_options .= ' GPRINT:sensor:LAST:%4.1lfC';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lfC\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/voltage.inc.php
View File

@@ -11,14 +11,14 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 22)."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . rrdtool_escape($sensor['sensor_descr'], 22) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfV';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfV\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}

6
includes/html/graphs/sensor/waterflow.inc.php
View File

@@ -9,15 +9,15 @@ $sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 15);
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= " GPRINT:sensor_min$current_id:MIN:%4.1lf";
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lf\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';
}
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
$rrd_options .= ' HRULE:' . $sensor['sensor_limit_low'] . '#999999::dashes';
}