feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code

torkelo · torkelo · commit 44d377b81063 · 2015-10-06T14:34:44.000+02:00
diff --git a/public/app/plugins/datasource/prometheus/datasource.js b/public/app/plugins/datasource/prometheus/datasource.js
@@ -5,7 +5,7 @@ define([
   'moment',
   'app/core/utils/datemath',
   './directives',
-  './queryCtrl',
+  './query_ctrl',
 ],
 function (angular, _, kbn, dateMath) {
   'use strict';
@@ -22,7 +22,6 @@ function (angular, _, kbn, dateMath) {
 
       var url = datasource.url;
       if (url[url.length-1] === '/') {
-        // remove trailing slash
         url = url.substr(0, url.length - 1);
       }
       this.url = url;
diff --git a/public/app/plugins/datasource/prometheus/partials/query.editor.html b/public/app/plugins/datasource/prometheus/partials/query.editor.html
@@ -48,13 +48,7 @@
              placeholder="query expression"
              data-min-length=0 data-items=100
              ng-model-onblur
-             ng-change="refreshMetricData()"
-             >
-      <a bs-tooltip="target.datasourceErrors.query"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.datasourceErrors.query">
-        <i class="fa fa-warning"></i>
-      </a>
+             ng-change="refreshMetricData()">
     </li>
     <li class="tight-form-item">
       Metric
@@ -66,13 +60,7 @@
              spellcheck='false'
              bs-typeahead="suggestMetrics"
              placeholder="metric name"
-             data-min-length=0 data-items=100
-             >
-      <a bs-tooltip="target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.errors.metric">
-        <i class="fa fa-warning"></i>
-      </a>
+             data-min-length=0 data-items=100>
     </li>
 
   </ul>
@@ -113,7 +101,7 @@
              bs-tooltip="'Leave blank for auto handling based on time range and panel width'"
              data-placement="right"
              spellcheck='false'
-             placeholder="{{target.calculatedInterval}}"
+             placeholder="{{interval}}"
              data-min-length=0 data-items=100
              ng-model-onblur
              ng-change="refreshMetricData()"
@@ -131,12 +119,6 @@
       </select>
     </li>
 
-    <li class="tight-form-item">
-      <a href="{{target.prometheusLink}}" target="_blank" bs-tooltip="'Link to Graph in Prometheus'">
-        <i class="fa fa-share-square-o"></i>
-      </a>
-    </li>
-
   </ul>
 
   <div class="clearfix"></div>
diff --git a/public/app/plugins/datasource/prometheus/queryCtrl.js b/public/app/plugins/datasource/prometheus/queryCtrl.js
diff --git a/public/app/plugins/datasource/prometheus/query_ctrl.js b/public/app/plugins/datasource/prometheus/query_ctrl.js
@@ -0,0 +1,50 @@
+define([
+  'angular',
+  'lodash',
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('grafana.controllers');
+
+  module.controller('PrometheusQueryCtrl', function($scope) {
+
+    $scope.init = function() {
+      var target = $scope.target;
+
+      target.expr = target.expr || '';
+      target.intervalFactor = target.intervalFactor || 2;
+
+      $scope.metric = '';
+      $scope.resolutions = _.map([1,2,3,4,5,10], function(f) {
+        return {factor: f, label: '1/' + f};
+      });
+
+      $scope.$on('typeahead-updated', function() {
+        $scope.$apply($scope.inputMetric);
+        $scope.refreshMetricData();
+      });
+    };
+
+    $scope.refreshMetricData = function() {
+      if (!_.isEqual($scope.oldTarget, $scope.target)) {
+        $scope.oldTarget = angular.copy($scope.target);
+        $scope.get_data();
+      }
+    };
+
+    $scope.inputMetric = function() {
+      $scope.target.expr += $scope.target.metric;
+      $scope.metric = '';
+    };
+
+    $scope.suggestMetrics = function(query, callback) {
+      $scope.datasource
+        .performSuggestQuery(query)
+        .then(callback);
+    };
+
+    $scope.init();
+  });
+
+});
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
@@ -63,7 +63,6 @@ module.exports = function(config,grunt) {
           'app/plugins/datasource/grafana/datasource',
           'app/plugins/datasource/graphite/datasource',
           'app/plugins/datasource/influxdb/datasource',
-          'app/plugins/datasource/prometheus/datasource',
         ]
       },
     ];

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ module.exports = function(config,grunt) {`
`63`	`63`	`'app/plugins/datasource/grafana/datasource',`
`64`	`64`	`'app/plugins/datasource/graphite/datasource',`
`65`	`65`	`'app/plugins/datasource/influxdb/datasource',`
`66`		`- 'app/plugins/datasource/prometheus/datasource',`
`67`	`66`	`]`
`68`	`67`	`},`
`69`	`68`	`];`