IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 00:54:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-12-12 14:37:40 +01:00
parent a90f650109
commit 8feaef20e0
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/submenu/submenu.ts
-1
View File
@@ -15,7 +15,6 @@ export class SubmenuCtrl {
private $location) { private $location) {
this.annotations = this.dashboard.templating.list; this.annotations = this.dashboard.templating.list;
this.variables = this.variableSrv.variables; this.variables = this.variableSrv.variables;
console.log(this.variables);
} }
annotationStateChanged() { annotationStateChanged() {
public/app/plugins/panel/graph/axes_editor.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export class AxesEditorCtrl {
this.xAxisStatOptions = [ this.xAxisStatOptions = [
{text: 'Avg', value: 'avg'}, {text: 'Avg', value: 'avg'},
{text: 'Min', value: 'min'}, {text: 'Min', value: 'min'},
{text: 'Max', value: 'min'}, {text: 'Max', value: 'max'},
{text: 'Total', value: 'total'}, {text: 'Total', value: 'total'},
{text: 'Count', value: 'count'}, {text: 'Count', value: 'count'},
{text: 'Current', value: 'current'}, {text: 'Current', value: 'current'},
public/app/plugins/panel/graph/data_processor.ts
+1 -1
View File
@@ -166,7 +166,7 @@ export class DataProcessor {
return [ return [
{text: 'Avg', value: 'avg'}, {text: 'Avg', value: 'avg'},
{text: 'Min', value: 'min'}, {text: 'Min', value: 'min'},
{text: 'Max', value: 'min'}, {text: 'Max', value: 'max'},
{text: 'Total', value: 'total'}, {text: 'Total', value: 'total'},
{text: 'Count', value: 'count'}, {text: 'Count', value: 'count'},
]; ];