From 8586c7520c3ac262effa96cafa2cf256ca70756d Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Tue, 21 May 2013 16:54:33 +0200 Subject: [PATCH] Support negative graph values. Currently graph Y-Axes were hardcoded to start at 0. Choose the Y-scale automatically based on the graph data instead. --- web/static/js/graph.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/static/js/graph.js b/web/static/js/graph.js index 385d78730..b92d51fa2 100644 --- a/web/static/js/graph.js +++ b/web/static/js/graph.js @@ -74,7 +74,7 @@ Prometheus.Graph.prototype.initialize = function() { self.stacked = self.queryForm.find("input[name=stacked]"); self.insertMetric = self.queryForm.find("select[name=insert_metric]"); self.refreshInterval = self.queryForm.find("select[name=refresh]"); - + self.consoleTab = graphWrapper.find(".console"); self.graphTab = graphWrapper.find(".graph_container"); self.tabs = graphWrapper.find(".tabs");; @@ -403,7 +403,8 @@ Prometheus.Graph.prototype.showGraph = function() { width: Math.max(self.graph.innerWidth(), 200), renderer: (self.stacked.is(":checked") ? "stack" : "line"), interpolation: "linear", - series: self.data + series: self.data, + min: "auto", }); var xAxis = new Rickshaw.Graph.Axis.Time({ graph: self.rickshawGraph }); @@ -543,8 +544,8 @@ function init() { cache: false }); - $.ajax({ - url: "/static/js/graph_template.handlebar", + $.ajax({ + url: "/static/js/graph_template.handlebar", success: function(data) { graphTemplate = Handlebars.compile(data); var options = parseGraphOptionsFromUrl(); @@ -555,7 +556,7 @@ function init() { addGraph(options[i]); } $("#add_graph").click(function() { addGraph({}); }); - } + } }) } $(init);