412a1f6d99
stackdriver: wip - return metric descriptors in the format of tablew
2018-10-22 16:03:13 +02:00
ff5f281508
stackdriver: wip - get metric descriptors in the backend
2018-10-22 16:03:13 +02:00
60617d0bf7
stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider
2018-10-22 16:03:13 +02:00
102f531c1e
stackdriver: break out project name resolving into its own function in the stackdriver.go file
2018-10-22 16:03:12 +02:00
3f9ed2efaa
stackdriver: wip - temp remove jwt token auth
2018-10-22 16:03:12 +02:00
b2de0d8c3e
stackdriver: wip - always use gce default account for stackdriver
2018-10-22 16:03:12 +02:00
2002162073
stackdriver: wip - add scope and remove debug code
2018-10-22 16:03:12 +02:00
df215d9d09
stackdriver: WIP - test retrieving project id from gce metadata
2018-10-22 16:03:12 +02:00
fbe0ffd10b
skip jwt token auth if privateKey is empty
2018-10-22 16:03:12 +02:00
43aa6603a3
fetch token from GCE metadata server
2018-10-22 16:03:12 +02:00
68507e8855
pkg/services/alerting/reader.go: Fix should use for range instead of for { select {} }.
...
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/alerting/reader.go:37:2⚠️ should use for range instead of for { select {} } (S1000) (megacheck)
2018-10-19 19:49:04 +02:00
e673337cb9
pkg/middleware/middleware.go: Fix empty branch warning.
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/middleware/middleware.go:46:3⚠️ empty branch (SA9003) (megacheck)
2018-10-19 19:49:04 +02:00
abb6b135a3
pkg/plugins/plugins.go: remove ineffective break statement.
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/plugins/plugins.go:124:4⚠️ ineffective break statement. Did you mean to break out of the outer loop? (SA4011) (megacheck)
2018-10-19 19:49:04 +02:00
5b8178cdae
fixed gofmt issue after go update
2018-10-19 11:32:36 +02:00
68c460a957
fix cannot receive dingding alert bug
2018-10-19 17:17:38 +08:00
dddbe62d6c
Merge branch 'master' into react-panels-step1
2018-10-19 09:15:37 +02:00
0f592679f9
Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin
...
fix LDAP Grafana admin logic
2018-10-18 14:15:47 +02:00
77f23018a5
Merge pull request #13684 from mtanda/cw_concurrent_map
...
fix concurrent map writes
2018-10-18 13:41:39 +02:00
781e66ba3c
fix LDAP Grafana admin logic
...
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com >
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com >
2018-10-18 12:36:48 +02:00
1d0dee189c
Merge pull request #13705 from Yukinoshita-Yukino/master
...
Add socket support for mysql data source
2018-10-18 09:45:50 +02:00
f640df7a2c
simplify code
2018-10-18 01:45:14 +08:00
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
3245227016
permissions: cleanup.
2018-10-17 15:58:52 +02:00
62f21a254a
Merge pull request #12337 from mtanda/cw_regions
...
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00
36dbc5f51c
Add socket support for mysql data source
2018-10-17 17:45:06 +08:00
52f398e7f7
cloudwatch: return a distinct list of regions
2018-10-17 10:58:06 +02:00
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
5566a61aef
alerting: tests default value for disable resolve message
2018-10-17 09:53:03 +02:00
a3137e731d
clean up tests
2018-10-16 20:39:07 -04:00
e9b8051724
Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert
2018-10-16 17:43:26 -04:00
0eae7b077d
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:38:59 -04:00
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
49a3bd3097
add encrypt connstr param conditionally on the value chosen via GUI.
2018-10-16 13:14:22 -03:00
1329c70965
codestyle
2018-10-16 14:22:50 +02:00
18c73631ea
rename UI Option, align with control, update tests
2018-10-16 07:12:32 -04:00
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
fce50cf1b8
return default region list from backend
2018-10-16 12:20:39 +09:00
f6cb01d38a
show all CloudWatch regions
2018-10-16 12:03:33 +09:00
2b20402d7d
get region list from ec2:DescribeRegions
2018-10-16 12:03:33 +09:00
48aef0c50e
fix concurrent map writes
2018-10-16 11:45:58 +09:00
d859a6aeb8
rename new JSON data attrbute.
2018-10-15 20:34:03 -03:00
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
37f16ca80a
Add 'encrypt' setting to MSSQL data source.
...
Fixes #13629
2018-10-15 14:47:54 -03:00
938541be2e
Merge pull request #13660 from grafana/alerting-validation-messages
...
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
272274220c
Fix grammar in log message
2018-10-15 14:37:12 +02:00
631af46c48
Merge branch 'master' into react-panels-step1
2018-10-14 10:44:38 +02:00
6218fadf21
pkg/cmd/grafana-server/main.go: remove os.Kill as it cannot be trapped
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/cmd/grafana-server/main.go:103:42⚠️ os.Kill cannot be trapped (did you mean syscall.SIGTERM?) (SA1016) (megacheck)
2018-10-13 11:02:36 +02:00
ba67dc7689
changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError
2018-10-12 23:15:23 -07:00
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
d17025fb43
Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
...
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Erik Sundell
Mitsuhiro Tanda
Mario Trangoni
Torkel Ödegaard
Yuan Liu
Marcus Efraimsson
Adrien Fillon
Leonard Gram
bergquist
Dave Waters
Ramiro Morales
Peter Holmberg
Andreas Kohn