IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.0.x'

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-12-12 14:39:53 +01:00
parent 40b359334b 8feaef20e0
commit 5ec7dea81a
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/alerting/conditions/reducer_test.go
View File

@@ -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))

1
public/app/features/dashboard/submenu/submenu.ts
View File

@@ -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() {

2
public/app/plugins/panel/graph/axes_editor.ts
View File

@@ -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'},

2
public/app/plugins/panel/graph/data_processor.ts
View File

@@ -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'},
];