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

syntaxer run

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3117 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-02 22:02:30 +00:00
parent 944130f0bb
commit 613e8b1e29
31 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
html/includes/graphs/application/memcached_uptime.inc.php
View File

@@ -7,7 +7,6 @@ include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
$rrd_options .= " DEF:uptime=".$rrd_filename.":uptime:AVERAGE";
$rrd_options .= " CDEF:cuptime=uptime,86400,/";
$rrd_options .= " 'COMMENT:Days Current Minimum Maximum Average\\n'";

1
html/includes/graphs/device/bits.inc.php
View File

@@ -68,6 +68,7 @@ $colour_area_in = "91B13C";
$colour_area_out = "8080BD";
include("includes/graphs/generic_multi_seperated.inc.php");
#include("includes/graphs/generic_multi_bits_separated.inc.php");
#include("includes/graphs/generic_multi_data_separated.inc.php");

4
html/includes/graphs/generic_multi_line.inc.php
View File

@@ -53,10 +53,10 @@ foreach ($rrd_list as $rrd)
{
$rrd_options .= " CDEF:".$id."i=".$id.",-1,*";
$rrd_optionsb .= " LINE1.25:".$id."i#".$colour.":'$descr'";
if(!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."i#" . $rrd['areacolour']; }
if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."i#" . $rrd['areacolour']; }
} else {
$rrd_optionsb .= " LINE1.25:".$id."#".$colour.":'$descr'";
if(!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."#" . $rrd['areacolour']; }
if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."#" . $rrd['areacolour']; }
}
$rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";

2
html/includes/graphs/munin/auth.inc.php
View File

@@ -8,7 +8,7 @@ if (is_numeric($id))
{
$device = device_by_id_cache($mplug['device_id']);
$title = generate_device_link($device);
# if(!empty($mplug['mplug_instance']))
# if (!empty($mplug['mplug_instance']))
# {
# $plugfile = $config['rrd_dir']."/".$device['hostname']."/munin/".$mplug['mplug_type']."_".$mplug['mplug_instance'];
# $title .= " :: Plugin :: " . $mplug['mplug_type'] . " :: " . $mplug['mplug_title'];

7
html/includes/graphs/munin/graph.inc.php
View File

@@ -23,7 +23,6 @@ if($width > "500")
$rrd_options .= " COMMENT:'".substr(str_pad($mplug['mplug_vlabel'], $descr_len),0,$descr_len)." Current Average Maximum\l'";
}
$c_i = 0;
$dbq = dbFetchRows("SELECT * FROM `munin_plugins_ds` WHERE `mplug_id` = ?", array($mplug['mplug_id']));
foreach ($dbq as $ds)
@@ -33,15 +32,15 @@ foreach ($dbq as $ds)
$cmd_def .= " DEF:".$ds['ds_name']."=".$ds_filename.":val:AVERAGE";
if(!empty($ds['ds_cdef']))
if (!empty($ds['ds_cdef']))
{
$cmd_cdef .= "";
$ds_name = $ds['ds_name']."_cdef";
}
if($ds['ds_graph'] == "yes")
if ($ds['ds_graph'] == "yes")
{
if(empty($ds['colour']))
if (empty($ds['colour']))
{
if (!$config['graph_colours']['mixed'][$c_i]) { $c_i = 0; }
$colour=$config['graph_colours']['mixed'][$c_i]; $c_i++;