Fix downsampling option in querier URL

Signed-off-by: Olivier Biesmans <olivier.biesmans@blablacar.com>
thanos-io · Sep 25, 2019 · e77da40 · e77da40
1 parent 749b378
commit e77da40
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 73 deletions.
diff --git a/pkg/ui/bindata.go b/pkg/ui/bindata.go
diff --git a/pkg/ui/static/js/graph.js b/pkg/ui/static/js/graph.js
@@ -93,6 +93,8 @@ 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.maxSourceResolution = self.queryForm.find("select[name=max_source_resolution_input]");
+
 
   self.consoleTab = graphWrapper.find(".console");
   self.graphTab   = graphWrapper.find(".graph_container");
@@ -231,6 +233,8 @@ Prometheus.Graph.prototype.initialize = function() {
     stylePartialResponseBtn();
   });
 
+  self.maxSourceResolution.val(self.options.max_source_resolution_input);
+
   self.queryForm.submit(function() {
     self.consoleTab.addClass("reload");
     self.graphTab.addClass("reload");
@@ -377,7 +381,6 @@ Prometheus.Graph.prototype.getOptions = function() {
     "range_input",
     "end_input",
     "step_input",
-    "downsample_input",
     "stacked",
     "moment_input"
   ];
@@ -390,6 +393,9 @@ Prometheus.Graph.prototype.getOptions = function() {
       }
     }
   });
+
+  options.max_source_resolution_input = self.queryForm.find("select[name=max_source_resolution_input]").val();
+
   options.expr = self.expr.val();
   options.tab = self.options.tab;
   return options;

diff --git a/pkg/ui/static/js/graph_template.handlebar b/pkg/ui/static/js/graph_template.handlebar
@@ -115,7 +115,7 @@
                         <div class="prometheus_input_group pull-left">
                            <select name="max_source_resolution_input" title="Downsampling option" id="max_source_resolution_input{{id}}">
                               <option value="">Auto downsampling</option>
-                              <option selected="selected" value="0s">Only raw data</option>
+                              <option value="0s">Only Raw data</option>
                               <option value="5m">Max 5m downsampling</option>
                               <option value="1h">Max 1h downsampling</option>
                            </select>