admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 05:26:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

added two new special data sources for cdefs: CURRENT_GRAPH_MINIMUM_VALUE and CURRENT_GRAPH_MAXIMUM_VALUE

Browse Source 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1494 860744bd-22fc-0310-8c96-e9fe5004b5ca
This commit is contained in:
Ian Berry committed 2004-01-30 04:51:27 +00:00
1 parent 55782be4bb
commit 0df679334f
2 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/config_arrays.php
+4 -2
View File
@@ -158,8 +158,10 @@ $custom_data_source_types = array(
"CURRENT_DATA_SOURCE" => "Current Graph Item Data Source",
"ALL_DATA_SOURCES_NODUPS" => "All Data Sources (Don't Include Duplicates)",
"ALL_DATA_SOURCES_DUPS" => "All Data Sources (Include Duplicates)",
"CURRENT_MINIMUM_VALUE" => "Current Item: Minimum Value",
"CURRENT_MAXIMUM_VALUE" => "Current Item: Maximum Value");
"CURRENT_DS_MINIMUM_VALUE" => "Current Data Source Item: Minimum Value",
"CURRENT_DS_MAXIMUM_VALUE" => "Current Data Source Item: Maximum Value",
"CURRENT_GRAPH_MINIMUM_VALUE" => "Graph: Lower Limit",
"CURRENT_GRAPH_MAXIMUM_VALUE" => "Graph: Upper Limit");
$menu = array(
"Create" => array(
lib/rrd.php
+4 -2
View File
@@ -850,8 +850,10 @@ function rrdtool_function_graph($local_graph_id, $rra_id, $graph_data_array) {
$cdef_string = str_replace("ALL_DATA_SOURCES_NODUPS", $cdef_total, $cdef_string);
/* data source item variables */
$cdef_string = str_replace("CURRENT_MINIMUM_VALUE", $graph_item["rrd_minimum"], $cdef_string);
$cdef_string = str_replace("CURRENT_MAXIMUM_VALUE", $graph_item["rrd_maximum"], $cdef_string);
$cdef_string = str_replace("CURRENT_DS_MINIMUM_VALUE", (empty($graph_item["rrd_minimum"]) ? "0" : $graph_item["rrd_minimum"]), $cdef_string);
$cdef_string = str_replace("CURRENT_DS_MAXIMUM_VALUE", (empty($graph_item["rrd_maximum"]) ? "0" : $graph_item["rrd_maximum"]), $cdef_string);
$cdef_string = str_replace("CURRENT_GRAPH_MINIMUM_VALUE", (empty($graph["lower_limit"]) ? "0" : $graph["lower_limit"]), $cdef_string);
$cdef_string = str_replace("CURRENT_GRAPH_MAXIMUM_VALUE", (empty($graph["upper_limit"]) ? "0" : $graph["upper_limit"]), $cdef_string);
/* make the initial "virtual" cdef name: 'cdef' + [a,b,c,d...] */
$cdef_graph_defs .= "CDEF:cdef" . generate_graph_def_name(strval($i)) . "=";