Merge branch 'master' into alerting_influxdb

public/app/core/directives/metric_segment.js

@@ -43,7 +43,7 @@ function (_, $, coreModule) {
             var selected = _.find($scope.altSegments, {value: value});
             if (selected) {
               segment.value = selected.value;
-              segment.html = selected.html;
+              segment.html = selected.html || selected.value;
               segment.fake = false;
               segment.expandable = selected.expandable;
             }
@@ -186,27 +186,26 @@ function (_, $, coreModule) {
 
           $scope.getOptionsInternal = function() {
             if ($scope.options) {
-              cachedOptions = _.map($scope.options, function(option) {
-                return uiSegmentSrv.newSegment({value: option.text});
-              });
-              return $q.when(cachedOptions);
+              cachedOptions = $scope.options;
+              return $q.when(_.map($scope.options, function(option) {
+                return {value: option.text};
+              }));
             } else {
               return $scope.getOptions().then(function(options) {
-                cachedOptions =_.map(options, function(option) {
+                cachedOptions = options;
+                return  _.map(options, function(option) {
                   if (option.html) {
                     return option;
                   }
-                  return uiSegmentSrv.newSegment({value: option.text});
+                  return {value: option.text};
                 });
-                return cachedOptions;
               });
             }
           };
 
           $scope.onSegmentChange = function() {
-
             if (cachedOptions) {
-              var option = _.find(cachedOptions, {value: $scope.segment.value});
+              var option = _.find(cachedOptions, {text: $scope.segment.value});
               if (option && option.value !== $scope.property) {
                 $scope.property = option.value;
               } else if (attrs.custom !== 'false') {

public/app/features/plugins/import_list/import_list.html

@@ -14,8 +14,9 @@
 					</span>
 				</td>
 				<td>
-          <span ng-if="dash.imported" bs-tooltip='"Imported revision:" + dash.importedRevision'>
+          <span>
             Revision: {{dash.revision}}
+            <span ng-if="dash.imported" class="small">(Imported: {{dash.importedRevision}})</span>
           <span>
 				</td>
 				<td style="text-align: right">
@@ -23,7 +24,8 @@
 						Import
 					</button>
 					<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, true)" ng-show="dash.imported">
-						Update
+            <span ng-if="dash.revision !== dash.importedRevision">Update</span>
+            <span ng-if="dash.revision === dash.importedRevision">Re-import</span>
 					</button>
 					<button class="btn btn-danger btn-small" ng-click="ctrl.remove(dash)" ng-show="dash.imported">
 						<i class="fa fa-trash"></i>

public/app/plugins/datasource/elasticsearch/query_def.js

@@ -22,7 +22,7 @@ function (_) {
     bucketAggTypes: [
       {text: "Terms",           value: 'terms', requiresField: true},
       {text: "Filters",         value: 'filters' },
-      {text: "Geo Hash Grid",        value: 'geohash_grid', requiresField: true},
+      {text: "Geo Hash Grid",   value: 'geohash_grid', requiresField: true},
       {text: "Date Histogram",  value: 'date_histogram', requiresField: true},
     ],