![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/share/collection.js b/share/collection.js
index 57bd04dbb0ce1960b2c2d06e946acf20a154b846..e1a6a2255be5b5114a775118627f094f1151e864 100644 (file)
--- a/share/collection.js
+++ b/share/collection.js
var c4 =
{
- instances: []
+ instances: new Array (),
+ config:
+ {
+ width: 324,
+ height: 200
+ }
};
function value_to_string (value) /* {{{ */
}
} /* }}} function def_draw */
-function inst_get_chart_opts (inst, def) /* {{{ */
+/*
+ * Given one metric definition, returns the appropriate data from the data
+ * list. */
+function def_get_data (def, data_list)
{
- var chart_opts = new Object ();
+ var i;
- chart_opts.chart =
- {
- renderTo: inst.container,
- zoomType: 'x'
- };
- chart_opts.xAxis =
- {
- type: 'datetime',
- maxZoom: 300, // five minutes
- title: { text: null },
- events:
- {
- setExtremes: function (event)
- {
- var begin = null;
- var end = null;
-
- if ((event.min) && (event.max))
- {
- begin = event.min / 1000.0;
- end = event.max / 1000.0;
- }
- inst_fetch_data (inst, begin, end);
- }
- }
- };
- chart_opts.yAxis =
+ for (i = 0; i < data_list.length; i++)
{
- labels:
- {
- formatter: function () { return (value_to_string (this.value)); }
- },
- startOnTick: false,
- endOnTick: false
+ if ((def.ds_name) && (def.ds_name != data_list[i].data_source))
+ continue;
+ if (!ident_matches (def.select, data_list[i].file))
+ continue;
+
+ return (data_list[i]);
+ }
+ return;
+}
+
+function def_to_rickshaw_one (def, data)
+{
+ var series = {
+ data: []
};
- chart_opts.legend =
- {
- labelFormatter: function ()
- {
- var series = this;
- var min = Number.MAX_VALUE;
- var max = Number.NEGATIVE_INFINITY;
- var num = 0;
- var sum = 0;
- var avg;
- var i;
+ var i;
- for (i = 0; i < this.data.length; i++)
- {
- var v;
+ if (def.legend)
+ series.name = def.legend;
- v = this.data[i].y;
- if (v == null)
- continue;
+ if (def.color)
+ series.color = def.color;
- if (min > v)
- min = v;
- if (max < v)
- max = v;
+ for (i = 0; i < data.data.length; i++)
+ {
+ var x = data.first_value_time + (i * data.interval);
+ var y = data.data[i];
- sum += v;
- num++;
- }
+ series.data.push ({'x': x, 'y': y});
+ }
- if (num == 0)
- {
- min = null;
- max = null;
- avg = null;
- }
- else
- {
- avg = sum / num;
- }
+ return (series);
+}
- return (this.name + " (" + value_to_string (min) + " min, "
- + value_to_string (avg) + " avg, "
- + value_to_string (max) + " max)");
- }
+function def_to_rickshaw (graph_def, data_list)
+{
+ var graph_config = {
+ renderer: 'line',
+ series: []
};
- chart_opts.series = new Array ();
+ var graph;
+ var i;
- if (def.title)
- chart_opts.title = { text: def.title };
+ for (i = 0; i < graph_def.defs.length; i++)
+ {
+ var def = graph_def.defs[i];
+ var data = def_get_data (def, data_list);
+ var series;
- if (def.vertical_label)
- chart_opts.yAxis.title = { text: def.vertical_label };
+ if (!data)
+ continue;
- return (chart_opts);
-} /* }}} function chart_opts_get */
+ series = def_to_rickshaw_one (def, data);
+ if (series)
+ graph_config.series.push (series);
-function inst_draw (inst, def, data_list) /* {{{ */
+ //if (def.area)
+ // graph_config.renderer = 'area';
+ }
+
+ return (graph_config);
+}
+
+function inst_draw_rickshaw (inst, def, data_list)
{
- var chart_opts;
- var i;
+ var graph_config = def_to_rickshaw (def, data_list);
- if (!inst || !def || !data_list)
- return;
+ graph_config.element = document.getElementById (inst.container);
- chart_opts = inst_get_chart_opts (inst, def);
+ inst.chart = new Rickshaw.Graph (graph_config);
+ inst.chart.render ();
- for (i = def.defs.length - 1; i >= 0; i--)
- def_draw (def.defs[i], data_list, chart_opts.series);
+ var x_axis = new Rickshaw.Graph.Axis.Time({
+ graph: inst.chart
+ });
+ x_axis.render ();
- inst.chart = new Highcharts.Chart (chart_opts);
-} /* }}} function inst_draw */
+ var y_axis = new Rickshaw.Graph.Axis.Y({
+ graph: inst.chart
+ });
+ y_axis.render ();
+}
+
+function inst_draw (inst, def, data_list)
+{
+ inst_draw_rickshaw (inst, def, data_list);
+}
function inst_redraw (inst, def, data_list) /* {{{ */
{
}
for (i = inst.chart.series.length - 1; i >= 0; i--)
+ {
+ series_array[i].visible = inst.chart.series[i].visible;
inst.chart.series[i].remove (/* redraw = */ false);
+ }
for (i = 0; i < series_array.length; i++)
inst.chart.addSeries (series_array[i], /* redraw = */ false);
params.action = "instance_data_json";
params.begin = begin || inst.begin;
params.end = end || inst.end;
+ params.resolution = (params.end - params.begin) / c4.config.width;
$.getJSON ("collection.fcgi", params,
function (data)
return (zoom_relative (graph_id, (-1.0 / 3.0), (1.0 / 3.0)));
} /* }}} function zoom_earlier */
+function graph_recalc_width () /* {{{ */
+{
+ var tmp;
+
+ tmp = $("#layout-middle-center").width ();
+ if (!tmp)
+ return;
+
+ if (tmp < 324)
+ tmp = 324;
+
+ c4.config.width = tmp;
+ c4.config.height = Math.round (tmp / 1.61803398874989484820);
+ $(".graph-json").each (function ()
+ {
+ $(this).width (c4.config.width);
+ $(this).height (c4.config.height);
+ });
+} /* }}} function graph_recalc_width */
+
$(document).ready(function() {
/* $("#layout-middle-right").html ("<ul id=\"search-suggest\" class=\"graph_list\"></ul>"); */
$("#search-form").append ("<ul id=\"search-suggest\" class=\"graph_list\"></ul>");
+ "<div class=\"graph-button\" onClick=\"zoom_reference ('"+id+"');\">!</div>"
+ "</div>"
+ "<div class=\"graph-buttons navigation\">"
- + "<div class=\"graph-button\" onClick=\"zoom_earlier ('"+id+"');\">←</div>"
- + "<div class=\"graph-button\" onClick=\"zoom_out ('"+id+"');\">−</div>"
+ + "<div class=\"graph-button\" onClick=\"zoom_earlier ('"+id+"');\">\u2190</div>"
+ + "<div class=\"graph-button\" onClick=\"zoom_out ('"+id+"');\">\u2212</div>"
+ "<div class=\"graph-button\" onClick=\"zoom_in ('"+id+"');\">+</div>"
- + "<div class=\"graph-button\" onClick=\"zoom_later ('"+id+"');\">→</div>"
+ + "<div class=\"graph-button\" onClick=\"zoom_later ('"+id+"');\">\u2192</div>"
+ "</div>"
);
});
+ graph_recalc_width ();
+
var i;
for (i = 0; i < c4.instances.length; i++)
{