diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index 241e663d5ea..931d4c6f802 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -101,7 +101,6 @@ "legend_counts": true, "timezone": "browser", "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/dashboards/scripted.js b/src/app/dashboards/scripted.js index b8f428a9834..f4a438b7854 100644 --- a/src/app/dashboards/scripted.js +++ b/src/app/dashboards/scripted.js @@ -68,6 +68,17 @@ for (var i = 0; i < rows; i++) { 'target': "randomWalk('random walk2')" } ], + seriesOverrides: [ + { + alias: '/random/', + yaxis: 2, + fill: 0, + linewidth: 5 + } + ], + tooltip: { + shared: true + } } ] }); diff --git a/src/app/dashboards/template_vars.json b/src/app/dashboards/template_vars.json index affe7727ce2..43e9e37836c 100644 --- a/src/app/dashboards/template_vars.json +++ b/src/app/dashboards/template_vars.json @@ -65,7 +65,6 @@ "avg": false }, "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/directives/dropdown.typeahead.js b/src/app/directives/dropdown.typeahead.js index e02b90b2576..f46de052c06 100644 --- a/src/app/directives/dropdown.typeahead.js +++ b/src/app/directives/dropdown.typeahead.js @@ -37,6 +37,17 @@ function (angular, app, _, $) { return memo; }, []); + $scope.menuItemSelected = function(optionIndex, valueIndex) { + var option = $scope.menuItems[optionIndex]; + var result = { + $item: option.submenu[valueIndex], + $optionIndex: optionIndex, + $valueIndex: valueIndex + }; + + $scope.dropdownTypeaheadOnSelect(result); + }; + $input.attr('data-provide', 'typeahead'); $input.typeahead({ source: typeaheadValues, diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js index 34388a00173..da8e136ff6d 100644 --- a/src/app/panels/graph/module.js +++ b/src/app/panels/graph/module.js @@ -150,10 +150,6 @@ function (angular, app, $, _, kbn, moment, TimeSeries) { * queries */ percentage : false, - /** @scratch /panels/histogram/3 - * zerofill:: Improves the accuracy of line charts at a small performance cost. - */ - zerofill : true, nullPointMode : 'connected', diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js index bf46b086bea..b677bf19e17 100644 --- a/src/app/panels/graph/seriesOverridesCtrl.js +++ b/src/app/panels/graph/seriesOverridesCtrl.js @@ -23,7 +23,7 @@ define([ option.submenu = _.map(values, function(value, index) { return { text: String(value), - click: 'setOverride(' + option.index + ',' + index + ')' + click: 'menuItemSelected(' + option.index + ',' + index + ')' }; }); diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html index 9371eb16f2e..c4cd4069e91 100644 --- a/src/app/panels/timepicker/module.html +++ b/src/app/panels/timepicker/module.html @@ -10,19 +10,26 @@ }