From 0df679334f7d97aceff07c193490aaa90a3b26b8 Mon Sep 17 00:00:00 2001 From: Ian Berry Date: Fri, 30 Jan 2004 04:51:27 +0000 Subject: [PATCH] added two new special data sources for cdefs: CURRENT_GRAPH_MINIMUM_VALUE and CURRENT_GRAPH_MAXIMUM_VALUE git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1494 860744bd-22fc-0310-8c96-e9fe5004b5ca --- include/config_arrays.php | 6 ++++-- lib/rrd.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/config_arrays.php b/include/config_arrays.php index ab8fb3a4b..a3141bc2a 100644 --- a/include/config_arrays.php +++ b/include/config_arrays.php @@ -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( diff --git a/lib/rrd.php b/lib/rrd.php index 6133d2a72..e68e5526f 100644 --- a/lib/rrd.php +++ b/lib/rrd.php @@ -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)) . "=";