Commit Graph

6912 Commits

Author SHA1 Message Date
Torkel Ödegaard 93453c2d94 added caching of signed in user DB calls 2018-10-31 06:47:14 -07:00
Torkel Ödegaard 07d78da5ec Merge branch 'ds_cache_refactor' of https://github.com/marefr/grafana into marefr-ds_cache_refactor 2018-10-31 06:06:24 -07:00
Marcus Efraimsson d0c00388e6 add functionality to override service in registry 2018-10-30 13:37:30 +01:00
Marcus Efraimsson 6f9c0241af register datasource cache service with proper name 2018-10-30 12:32:14 +01:00
Marcus Efraimsson 5d4dc18bbc revert application lifecycle event support 2018-10-30 12:31:28 +01:00
Carl Bergquist 42d902b07d Add new build info metrics that contains more info (#13876)
* Add new build info metrics that contains more info

The goal was to add more information about Grafana. But rather than
just adding those to the current metrics I created a new metric
since its a common pattern in the prometheus community to expose that
info in a metric named `*_build_info`.

We keep the old metric to avoid introducing any breaking changes but
we should be able to remove it the next breaking change
2018-10-30 11:18:43 +01:00
Marcus Efraimsson 2332b3e205 remove unused code 2018-10-30 09:34:09 +01:00
Marcus Efraimsson 52d825f535 log error on datasource access denied 2018-10-30 09:32:32 +01:00
Marcus Efraimsson 70ddf93688 include teams on signed in user 2018-10-30 09:32:32 +01:00
Marcus Efraimsson 9edaa3fa8c application lifecycle event support 2018-10-30 09:32:32 +01:00
Marcus Efraimsson cfb061ddab refactor datasource caching 2018-10-30 09:31:56 +01:00
Nick Triller 3414be18bc Implement oauth_auto_login setting
Redirect in backend
2018-10-29 18:46:52 +01:00
bergquist c9ac762fb1 build: adds branch info to binary build 2018-10-29 13:27:29 +01:00
Marcus Efraimsson 6052257515 Merge pull request #13820 from grafana/13769_mysql_time_filter
mysql: fix timeFilter macro should respect local time zone
2018-10-26 09:02:59 +02:00
Mitsuhiro Tanda 220c4f4ab4 add test 2018-10-26 03:13:02 +09:00
Mitsuhiro Tanda 3447b8b299 cache region result 2018-10-26 01:23:44 +09:00
Mitsuhiro Tanda c40baa1a23 use default region to call DescribeRegions 2018-10-26 01:23:44 +09:00
Torkel Ödegaard d505d83ee1 Merge pull request #13679 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-25 16:31:53 +02: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
Marcus Efraimsson 97b22aa5a9 mysql: fix timeFilter macro should respect local time zone 2018-10-25 10:29:40 +02: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
Mario Trangoni 91447dcbf9 pkg/tsdb/stackdriver/stackdriver.go: Fix regular expression does not contain any meta characters.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/stackdriver/stackdriver.go:171:26⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:47 +02:00
Mario Trangoni bb12a1bc99 pkg/tsdb/graphite/graphite.go: Fix regular expression does not contain any meta characters.
I found this article benchmarking Replace vs Regexp,
https://medium.com/codezillas/golang-replace-vs-regexp-de4e48482f53

See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/graphite/graphite.go:167:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
pkg/tsdb/graphite/graphite.go:172:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:46 +02:00
Mario Trangoni 3466969a7c pkg/login/ldap.go: Fix warning comparison to bool constant
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/login/ldap.go:188:40⚠️ should omit comparison to bool constant, can be simplified to !*extUser.IsGrafanaAdmin (S1002) (megacheck)
2018-10-23 17:26:46 +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