Athurg Feng
b7787db34e
Add new option to set where to open the message url
2018-11-08 18:44:00 +08:00
Athurg Feng
201dd6bf65
Optimize the Dingding match values format
2018-10-25 18:53:45 +08:00
Athurg Feng
cb86e38628
Add Dingding message type to support mass text notification
2018-10-25 18:34:34 +08:00
Athurg Feng
7f45afac63
Split text template into variable
2018-10-25 18:24:04 +08:00
Athurg Feng
ca6dd73923
Add match values into Dingding notification message
2018-10-25 18:23:37 +08:00
Carl Bergquist
0d41904ee5
Merge pull request #13755 from Yukinoshita-Yukino/master
...
Fix cannot receive dingding alert when alert message is empty
2018-10-24 14:56:08 +02:00
Marcus Efraimsson
1bcd4c040b
Merge pull request #13806 from bergquist/proviosioing_when_folder_is_deleted
...
Delete provisioning meta data when deleting Folder
2018-10-24 13:55:14 +02:00
bergquist
0a9bfc5529
delete provisioning meta data when deleting folder
...
prior to this fix Grafana didnt delete meta data
about the provisioned dashboard in `dashboard_provisioning`
which means that the dashboard wasn't inserted into
Grafana again if the folder was delete within Grafana.
closes #13280
2018-10-24 13:32:45 +02:00
Erik Sundell
c5af0bf1c5
Resource type filter ( #13784 )
...
* stackdriver: add resource type to filter and group bys
* stackdriver: remove not used param
* stackdriver: refactor filter and group by code
* stackdriver: remove resource type if its already in filter list
* stackdriver: remove debug logging
* stackdriver: remove more debug logging
* stackdriver: append resource type to legend name if there are more than one type present in the response
* stackdriver: only make new request if filter has real value
* stackdriver: format legend support for resource type
* stackdriver: add resource type to documentation
* stackdriver: not returning promise from query function
* stackdriver: fix refactoring bug
* stackdriver: remove not used import
2018-10-24 11:18:49 +02:00
Marcus Efraimsson
8a3b1cf484
Merge pull request #13785 from grafana/13729_perm_debug
...
Add debug logging of dashboard permission checks
2018-10-23 11:50:47 +02:00
Marcus Efraimsson
b371f2d91f
add debug logging of folder/dashbord permission checks
2018-10-23 11:08:57 +02:00
Erik Sundell
6abbf5b3b8
stackdriver: refactoring request builder
2018-10-22 16:12:55 +02:00
Erik Sundell
1756e82d8b
stackdriver: remove not used struct
2018-10-22 16:12:55 +02:00
Erik Sundell
5b04a8b6c2
stackdriver: remove not used query file
2018-10-22 16:11:17 +02:00
Erik Sundell
1a329e4e47
stackdriver: remove test datasource query. use ensuredefaultproject instead
2018-10-22 16:11:17 +02:00
Erik Sundell
b02a8127ff
stackdriver: remove debug comments
2018-10-22 16:11:17 +02:00
Erik Sundell
afe0b4b8db
stackdriver: fix typo
2018-10-22 16:11:17 +02:00
Erik Sundell
b2c6c743ce
stackdriver: add debug logging
2018-10-22 16:11:17 +02:00
Erik Sundell
3999578300
stackdriver: fix broken braces
2018-10-22 16:11:17 +02:00
Erik Sundell
3935f9d24c
stackdriver: use constant instead of variable
2018-10-22 16:11:17 +02:00
Erik Sundell
8b4fff8b87
stackdriver: use gce variable
2018-10-22 16:11:17 +02:00
Erik Sundell
4a51d05477
stackdriver: add variable for gce authentication type
2018-10-22 16:11:17 +02:00
Erik Sundell
b9cb4649bb
stackdriver: get default project from backend. also ensure default project could be retrieved when authentication type is gce
2018-10-22 16:11:17 +02:00
Erik Sundell
cd7b454e25
stackdriver: add default value for authentication type
2018-10-22 16:03:14 +02:00
Erik Sundell
823838a839
stackdriver: wip - remove debug code
2018-10-22 16:03:14 +02:00
Erik Sundell
0b82fda49c
stackdriver: only get default token from metadata server when applying route
2018-10-22 16:03:14 +02:00
Erik Sundell
2b1709b875
stackdriver: only get default token from metadata server when applying route
2018-10-22 16:03:13 +02:00
Erik Sundell
dd9e9ed419
stackdriver: make backend query a pure test datasource function
2018-10-22 16:03:13 +02:00
Erik Sundell
9c7022be86
stackdriver: add status code
2018-10-22 16:03:13 +02:00
Erik Sundell
412a1f6d99
stackdriver: wip - return metric descriptors in the format of tablew
2018-10-22 16:03:13 +02:00
Erik Sundell
ff5f281508
stackdriver: wip - get metric descriptors in the backend
2018-10-22 16:03:13 +02:00
Erik Sundell
60617d0bf7
stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider
2018-10-22 16:03:13 +02:00
Erik Sundell
102f531c1e
stackdriver: break out project name resolving into its own function in the stackdriver.go file
2018-10-22 16:03:12 +02:00
Erik Sundell
3f9ed2efaa
stackdriver: wip - temp remove jwt token auth
2018-10-22 16:03:12 +02:00
Erik Sundell
b2de0d8c3e
stackdriver: wip - always use gce default account for stackdriver
2018-10-22 16:03:12 +02:00
Erik Sundell
2002162073
stackdriver: wip - add scope and remove debug code
2018-10-22 16:03:12 +02:00
Erik Sundell
df215d9d09
stackdriver: WIP - test retrieving project id from gce metadata
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
fbe0ffd10b
skip jwt token auth if privateKey is empty
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
43aa6603a3
fetch token from GCE metadata server
2018-10-22 16:03:12 +02:00
Torkel Ödegaard
5b8178cdae
fixed gofmt issue after go update
2018-10-19 11:32:36 +02:00
Yuan Liu
68c460a957
fix cannot receive dingding alert bug
2018-10-19 17:17:38 +08:00
Torkel Ödegaard
dddbe62d6c
Merge branch 'master' into react-panels-step1
2018-10-19 09:15:37 +02:00
Torkel Ödegaard
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
Marcus Efraimsson
77f23018a5
Merge pull request #13684 from mtanda/cw_concurrent_map
...
fix concurrent map writes
2018-10-18 13:41:39 +02:00
Adrien Fillon
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
Marcus Efraimsson
1d0dee189c
Merge pull request #13705 from Yukinoshita-Yukino/master
...
Add socket support for mysql data source
2018-10-18 09:45:50 +02:00
Yuan Liu
f640df7a2c
simplify code
2018-10-18 01:45:14 +08:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
Leonard Gram
3245227016
permissions: cleanup.
2018-10-17 15:58:52 +02:00
Marcus Efraimsson
62f21a254a
Merge pull request #12337 from mtanda/cw_regions
...
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00