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

Fix sensors rrd name issue

Browse Source 
Use last instead of first, as last won't flush rrdcached
Only stream_select if timeout > 0
Attempt to fix mysql
This commit is contained in:
Tony Murray
2016-07-08 22:58:36 -05:00
parent c01d8b7c4e
commit 01cfb960d1
8 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/application/mysql_connections.inc.php
View File

@@ -2,8 +2,6 @@
require 'includes/graphs/common.inc.php';
require 'includes/graphs/common.inc.php';
$rrd_filename = rrd_name($device['hostname'], array('app', 'mysql', $app['app_id']));
$array = array(

44
html/includes/graphs/application/mysql_innodb_io.inc.php
View File

@@ -6,31 +6,31 @@ $mysql_rrd = rrd_name($device['hostname'], array('app', 'mysql', $app['app_id'])
if (rrdtool_check_rrd_exists($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IBIRd:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBIWr:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IBILg:AVERAGE ';
$rrd_options .= ' DEF:d='.$rrd_filename.':IBIFSc:AVERAGE ';
$rrd_options .= ' DEF:a=' . $rrd_filename . ':IBIRd:AVERAGE ';
$rrd_options .= ' DEF:b=' . $rrd_filename . ':IBIWr:AVERAGE ';
$rrd_options .= ' DEF:c=' . $rrd_filename . ':IBILg:AVERAGE ';
$rrd_options .= ' DEF:d=' . $rrd_filename . ':IBIFSc:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE1:a#22FF22:"File Reads " ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:a#22FF22:"File Reads " ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:b#0022FF:"File Writes " ';
$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:b#0022FF:"File Writes " ';
$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:c#FF0000:"Log Writes " ';
$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:c#FF0000:"Log Writes " ';
$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:d#00AAAA:"File syncs " ';
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\\n" ';
$rrd_options .= 'LINE1:d#00AAAA:"File syncs " ';
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\\n" ';
}