Commit Graph

16330 Commits

Author SHA1 Message Date
Erik Sundell
b6a918ba79 stackdriver: merge commit 2018-09-25 15:13:24 +02:00
Erik Sundell
7666e7bfe3 stackdriver: break out aggretation logic into its own directive and controller. also adds tests for new dropdown population logic 2018-09-25 14:42:47 +02:00
Erik Sundell
b700c6b0e4 stackdriver: populate alignment and aggregation dropdowns based on metric type and value type 2018-09-25 09:34:14 +02:00
Daniel Lee
1aba5f814b stackdriver: fix test after parameter added to constructor 2018-09-24 16:05:16 +02:00
Daniel Lee
4777689f29 stackdriver: skeleton for more query types on the backend 2018-09-24 16:02:35 +02:00
Daniel Lee
fbc1af6cd5 stackdriver: better error handling for getLabels 2018-09-24 15:40:10 +02:00
Daniel Lee
c9ee05422f stackdriver: move getLabels from query_ctrl to datasource
so can reuse for annotation query ctrl.
2018-09-24 15:26:49 +02:00
Daniel Lee
e101bcdb13 stackdriver: fix bug when multiple projects connected to service account
We had incorrectly assumed that a service account could only be connected
to one project.
2018-09-24 10:17:06 +02:00
Daniel Lee
636d8421d0 stackdriver: refactoring - extract out filtersegments component 2018-09-24 00:59:28 +02:00
Daniel Lee
681cd7496e stackdriver: alias patterns WIP
This is using the {{}} syntax for alias patterns. Might
switch to the  syntax instead.
2018-09-23 22:04:24 +02:00
Torkel Ödegaard
6db0880fd8 invalidate access token cache after datasource is updated 2018-09-21 14:24:44 +02:00
Torkel Ödegaard
040095b5a8 fix: use same User-Agent header as in other places in grafana when making external requests 2018-09-21 11:35:55 +02:00
Torkel Ödegaard
855a2a9259 docs: changed Json Web Token wording to be just JSON key file 2018-09-21 11:30:57 +02:00
Torkel Ödegaard
94ee39291f added beta notice 2018-09-21 11:28:19 +02:00
Torkel Ödegaard
c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Torkel Ödegaard
785f35b1c9 Merge branch 'master' of github.com:grafana/grafana 2018-09-21 09:24:03 +02:00
Daniel Lee
ddee919edc stackdriver: remove WIP tests 2018-09-20 20:34:16 +02:00
Marcus Efraimsson
a6c438c878
Merge pull request #13367 from grafana/davkal/explore-julius-fixes
Explore: Query field fixes
2018-09-20 17:57:01 +02:00
David Kaltschmidt
9e86809ace Explore: remove closing brace with opening brace 2018-09-20 17:22:38 +02:00
David Kaltschmidt
0e173918aa Explore: show series title in tooltip of legend item 2018-09-20 17:02:26 +02:00
David Kaltschmidt
377bc44062 Explore: dont rate-hint on rate queries 2018-09-20 16:59:06 +02:00
David Kaltschmidt
4a8d80a940 Explore: Fix metric suggestions when first letters have been typed 2018-09-20 16:57:58 +02:00
Marcus Efraimsson
d8b566a177
Merge pull request #13363 from k3ypad/auth_overview_typo
Fix misspelled authentication in Auth overview doc
2018-09-20 16:28:34 +02:00
Ben Doyle
7a95791025 Fix misspelled authentication in Auth overview doc 2018-09-20 14:16:43 +01:00
Daniel Lee
8211f7d0ea stackdriver: add templating support for metric, filter and group by
Still have to figure out if we should have templating for aggregation
fields
2018-09-20 11:44:17 +02:00
Daniel Lee
8d1f293676 stackdriver: use group by fields to create default alias 2018-09-20 00:52:14 +02:00
Marcus Efraimsson
667ca3d54d
devenv: fix docker blocks paths 2018-09-19 17:59:55 +02:00
Torkel Ödegaard
c67327d768 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 17:45:58 +02:00
Marcus Efraimsson
28ff8a6716
Merge pull request #13342 from svenklemm/unnest
Don't use unnest in queries for redshift compatibility
2018-09-19 16:08:23 +02:00
Marcus Efraimsson
978284bc3d
devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
Torkel Ödegaard
6eb15df953
Merge pull request #13339 from grafana/davkal/13337-fix-rules-filter
Explore: Fix click to filter for recording rule expressions
2018-09-19 13:53:42 +02:00
David Kaltschmidt
6aac8610eb Explore: Fix click to filter for recording rule expressions
- recording rule names contain ':'
- include this in the pattern for metric names
2018-09-19 11:45:55 +02:00
Sven Klemm
e07513bd65 Don't use unnest in queries for redshift compatibility 2018-09-19 10:59:25 +02:00
Carl Bergquist
fe9d86c070
Merge pull request #13330 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-09-19 09:52:09 +02:00
Torkel Ödegaard
dc1535cf64 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 09:09:25 +02:00
Mario Trangoni
13a1d0a026 pkg/tsdb/elasticsearch/client/client.go: use time.Since instead of time.Now().Sub
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/tsdb/elasticsearch/client/client.go:147:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:190:14⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:218:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni
f19fd1a9b0 pkg/plugins/dashboards_updater.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/plugins/dashboards_updater.go:51:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni
bb5aaa2dce pkg/services/sqlstore/alert_notification.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/services/sqlstore/alert_notification.go:242:3⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:20 +02:00
Daniel Lee
408d4bda95 stackdriver: add custom User-Agent header 2018-09-18 16:07:14 +02:00
Daniel Lee
e05b86375b stackdriver: remove hardcoding of test project name 2018-09-18 16:02:38 +02:00
Torkel Ödegaard
61b2100b9f
Merge pull request #13317 from bergquist/nuke_codecov
disable codecov
2018-09-18 12:33:24 +02:00
Torkel Ödegaard
d964a6505f
Merge pull request #13305 from bergquist/devenv_cleanup
removes unused files
2018-09-18 12:32:26 +02:00
bergquist
0f8b9b8ff9 set maxworkers 2 for frontend tests 2018-09-18 12:18:35 +02:00
bergquist
63ed02e626 removes codedov refs 2018-09-18 11:44:31 +02:00
bergquist
1be26ad362 disable codecov 2018-09-18 11:39:22 +02:00
Marcus Efraimsson
ccf3cb5c8b
Merge pull request #13307 from Nick-Triller/fix_setting_test
Fix setting test
2018-09-17 18:28:22 +02:00
Nick Triller
f8ca55bb1f Fix setting test 2018-09-17 17:56:52 +02:00
Erik Sundell
7b8ea5fc54 stackdriver: improve query look 2018-09-17 17:34:01 +02:00
bergquist
8dbba467f1 moves /tests to /pkg/plugins
ref #11433
2018-09-17 17:29:47 +02:00
Erik Sundell
cfb8017567 stackdriver: add alignment period to query controller 2018-09-17 17:16:14 +02:00