Merge branch 'v4.0.x'

pkg/services/alerting/conditions/reducer_test.go

@@ -11,6 +11,7 @@ import (
 
 func TestSimpleReducer(t *testing.T) {
 	Convey("Test simple reducer by calculating", t, func() {
+
 		Convey("sum", func() {
 			result := testReducer("sum", 1, 2, 3)
 			So(result, ShouldEqual, float64(6))

public/app/features/dashboard/submenu/submenu.ts

@@ -15,7 +15,6 @@ export class SubmenuCtrl {
               private $location) {
     this.annotations = this.dashboard.templating.list;
     this.variables = this.variableSrv.variables;
-    console.log(this.variables);
   }
 
   annotationStateChanged() {

public/app/plugins/panel/graph/axes_editor.ts

@@ -36,7 +36,7 @@ export class AxesEditorCtrl {
     this.xAxisStatOptions =  [
       {text: 'Avg', value: 'avg'},
       {text: 'Min', value: 'min'},
-      {text: 'Max', value: 'min'},
+      {text: 'Max', value: 'max'},
       {text: 'Total', value: 'total'},
       {text: 'Count', value: 'count'},
       {text: 'Current', value: 'current'},

public/app/plugins/panel/graph/data_processor.ts

@@ -163,7 +163,7 @@ export class DataProcessor {
         return [
           {text: 'Avg', value: 'avg'},
           {text: 'Min', value: 'min'},
-          {text: 'Max', value: 'min'},
+          {text: 'Max', value: 'max'},
           {text: 'Total', value: 'total'},
           {text: 'Count', value: 'count'},
         ];