From 8feaef20e094e2f4149d3c38fdf3d9c77743c10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 12 Dec 2016 14:36:49 +0100 Subject: [PATCH] fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926 --- public/app/features/dashboard/submenu/submenu.ts | 1 - public/app/plugins/panel/graph/axes_editor.ts | 2 +- public/app/plugins/panel/graph/data_processor.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/submenu/submenu.ts index 5e011b7588d..2ecb298236c 100644 --- a/public/app/features/dashboard/submenu/submenu.ts +++ b/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() { diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts index 38083a80a56..b73ddf3868e 100644 --- a/public/app/plugins/panel/graph/axes_editor.ts +++ b/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'}, diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts index 6233ac345c9..50d62aff03a 100644 --- a/public/app/plugins/panel/graph/data_processor.ts +++ b/public/app/plugins/panel/graph/data_processor.ts @@ -166,7 +166,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'}, ];