From 39769ea65b7f816e9d73e41b03d0087fefc21cdf Mon Sep 17 00:00:00 2001 From: Benjamin Smith Date: Tue, 4 Oct 2016 12:40:34 -0700 Subject: [PATCH 1/7] fix(docs): duplicate word data in Graph Panel --- docs/sources/reference/graph.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/graph.md b/docs/sources/reference/graph.md index 9c2ab63fbaa..2e26334347e 100644 --- a/docs/sources/reference/graph.md +++ b/docs/sources/reference/graph.md @@ -91,7 +91,7 @@ The legend values are calculated client side by Grafana and depend on what type aggregation or point consolidation you metric query is using. All the above legend values cannot be correct at the same time. For example if you plot a rate like requests/second, this is probably using average as aggregator, then the Total in the legend will not represent the total number of requests. -It is just the sum of all data data points received by Grafana. +It is just the sum of all data points received by Grafana. ## Display styles From fa492c6828a596240f247c2761df18eab0da2cda Mon Sep 17 00:00:00 2001 From: mdadm Date: Thu, 13 Oct 2016 05:38:55 -0600 Subject: [PATCH 2/7] fixed scoping issue with certPool variable (#6261) --- pkg/login/ldap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go index cee7096dc45..97a34f129b1 100644 --- a/pkg/login/ldap.go +++ b/pkg/login/ldap.go @@ -30,7 +30,7 @@ func (a *ldapAuther) Dial() error { var err error var certPool *x509.CertPool if a.server.RootCACert != "" { - certPool := x509.NewCertPool() + certPool = x509.NewCertPool() for _, caCertFile := range strings.Split(a.server.RootCACert, " ") { if pem, err := ioutil.ReadFile(caCertFile); err != nil { return err From 44f064392d414f0dec48c162882726bd4a496bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 13 Oct 2016 15:22:54 +0200 Subject: [PATCH 3/7] feat(alerting): different colored lines/icons for alert annotations based on state, #6244 --- public/app/plugins/panel/graph/graph.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index a07701cef65..7e19d00251f 100755 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -384,10 +384,32 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) { if (!annotations || annotations.length === 0) { return; } + console.log(annotations); var types = {}; + types['$__alerting'] = { + color: 'rgba(237, 46, 24, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + types['$__ok'] = { + color: 'rgba(11, 237, 50, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + types['$__nodata'] = { + color: 'rgba(150, 150, 150, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + for (var i = 0; i < annotations.length; i++) { var item = annotations[i]; + if (item.newState) { + console.log(item.newState); + item.eventType = '$__' + item.newState; + continue; + } if (!types[item.source.name]) { types[item.source.name] = { From 7bdedff89c569f754e9d40914f154478078cf682 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Thu, 13 Oct 2016 15:36:35 +0200 Subject: [PATCH 4/7] feat(plugins): make sure windows data plugin path is absolute (#6264) --- pkg/setting/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 28eaaa5b5d5..94d93d3743e 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -461,7 +461,7 @@ func NewConfigContext(args *CommandLineArgs) error { Env = Cfg.Section("").Key("app_mode").MustString("development") InstanceName = Cfg.Section("").Key("instance_name").MustString("unknown_instance_name") - PluginsPath = Cfg.Section("paths").Key("plugins").String() + PluginsPath = makeAbsolute(Cfg.Section("paths").Key("plugins").String(), HomePath) server := Cfg.Section("server") AppUrl, AppSubUrl = parseAppUrlAndSubUrl(server) From da2aaf70951decf162c4e2c6c7993234179cbccb Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 13 Oct 2016 17:11:04 +0200 Subject: [PATCH 5/7] feat(build): trigger windows build after successfull CI build --- circle.yml | 1 + scripts/trigger_windows_build.sh | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100755 scripts/trigger_windows_build.sh diff --git a/circle.yml b/circle.yml index 007d0b29217..39dc626df04 100644 --- a/circle.yml +++ b/circle.yml @@ -28,3 +28,4 @@ deployment: owner: grafana commands: - ./scripts/trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} + - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} diff --git a/scripts/trigger_windows_build.sh b/scripts/trigger_windows_build.sh new file mode 100755 index 00000000000..521a365a299 --- /dev/null +++ b/scripts/trigger_windows_build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +_token=$1 + +curl \ + -H "Content-Type: application/json" \ + -H "Authorization: Bearer ${_token}" \ + -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \ + https://ci.appveyor.com/api/builds From b2acc7cf037830b220c0c931a0d5840db3adbc35 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 13 Oct 2016 17:50:51 +0200 Subject: [PATCH 6/7] feat(build): build zipfile before creating artifact --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1b6027b5eb6..e8a7d3edfcf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,9 @@ install: build_script: - go run build.go build - grunt release + - 7z a grafana.zip %APPVEYOR_BUILD_FOLDER%\dist\* artifacts: - - path: dist/* + - path: grafana.zip + #- path: dist/* name: binzip From fb99d9d6805418452cc6ac158a643634cb2108b8 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 14 Oct 2016 07:05:36 +0200 Subject: [PATCH 7/7] feat(build): remove dist from artifact path --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e8a7d3edfcf..22f0e5606dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,9 +25,10 @@ install: build_script: - go run build.go build - grunt release - - 7z a grafana.zip %APPVEYOR_BUILD_FOLDER%\dist\* + #- 7z a grafana.zip %APPVEYOR_BUILD_FOLDER%\dist\* + - cp dist/* . artifacts: - - path: grafana.zip + - path: grafana-*windows-ia32.zip #- path: dist/* name: binzip