}
} /* }}} function value_to_string */
-function instance_get_params (graph) /* {{{ */
+function instance_get_params (inst) /* {{{ */
{
- var graph_selector = graph.graph_selector;
- var inst_selector = graph.instance_selector;
+ var graph_selector = inst.graph_selector;
+ var inst_selector = inst.instance_selector;
var selector = {};
if (graph_selector.host == inst_selector.host)
return (ret);
} /* }}} ident_clone */
-function graph_get_defs (graph) /* {{{ */
+function inst_get_defs (inst) /* {{{ */
{
- if (!graph.def)
+ if (!inst.def)
{
- var params = ident_clone (graph.graph_selector);
+ var params = instance_get_params (inst);
params.action = "graph_def_json";
$.ajax({
if (!data)
return;
- graph.def = data;
+ inst.def = data;
}});
}
- if (graph.def)
- return (graph.def);
+ if (inst.def)
+ return (inst.def);
return;
-} /* }}} graph_get_defs */
+} /* }}} inst_get_defs */
function ident_matches (selector, ident) /* {{{ */
{
var chart_series = new Object ();
chart_series.type = 'line';
- chart_series.name = def.legend || def.data_source;
chart_series.pointInterval = data.interval * 1000;
chart_series.pointStart = data.first_value_time * 1000;
chart_series.data = data.data;
chart_series.shadow = false;
chart_series.marker = { enabled: false };
+ if (def.legend)
+ chart_series.name = def.legend;
+ else if (def.ds_name)
+ chart_series.name = def.ds_name;
+
if (def.area)
chart_series.type = 'area';
if (!inst)
return;
- def = graph_get_defs (inst);
+ def = inst_get_defs (inst);
if (!def)
return;