public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arno Uhlig 1355c00c44 fix reader linux test 2018-09-20 13:42:56 +02:00
Arno Uhlig 6b2d91815a resolve symlink on each run 2018-09-20 11:46:32 +02: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
Torkel Ödegaard 5b52225450 wip: panel options idea2 2018-09-20 09:01:06 +02:00
Daniel Lee 8d1f293676 stackdriver: use group by fields to create default alias 2018-09-20 00:52:14 +02:00
Ryan McKinley 7168190f7a make sure we don't add the slash twice 2018-09-19 10:02:04 -07:00
Adrian Muraru ba4d5ddaaa Update render.js 2018-09-19 19:36:56 +03: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
Adrian Muraru dbcd242b09 Updated phantomjs render script to take full height screenshots 2018-09-19 18:43:33 +03: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 f25538744d Explore: Fix label suggestions for recording rules 
- parsing of recording rules failed for label suggestor
- added ':' to parsing routine
 2018-09-19 12:01:02 +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
Ryan McKinley 7c6227c061 remove the test that does not do anything 2018-09-18 11:18:55 -07:00
Ryan McKinley bc68aa99b2 add the trailing slash 2018-09-18 11:16:09 -07: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 3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +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
Ryan McKinley 71dfeff782 add a test 2018-09-17 12:28:36 -07: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
Erik Sundell edf38f040d stackdriver: making sure we dont pass too big alignmentPeriods to the stackdriver api 2018-09-17 17:13:06 +02:00
Erik Sundell f839d12de4 stackdriver: fix broken tests 2018-09-17 16:33:38 +02:00
Erik Sundell 109f00f584 stackdriver: adds default value for alignment period 2018-09-17 16:33:10 +02:00
Erik Sundell 71b1f7f8fd stackdriver: use alignment period that is passed from frontend. if set to auto, use value provided from the panel. also added tests for alignment period 2018-09-17 16:30:06 +02:00
Torkel Ödegaard e74ce72410 Merge pull request #13301 from bergquist/devenv_tests 
moves files from /tests to more appropriate folders
 2018-09-17 15:51:42 +02:00
Torkel Ödegaard 3853a0865c Merge pull request #13300 from bergquist/devenv_docker 
Moves docker/ to devenv/docker
 2018-09-17 15:51:06 +02:00
Erik Sundell 73dc7bddd0 stackdriver: use alignment that is passed from frontend in the query 2018-09-17 14:34:18 +02:00
Erik Sundell 549b4fc0ae stackdriver: adds advanced options collapse to query editor with the possibility to select secondary aggregation and alignment 2018-09-17 14:32:49 +02:00
Torkel Ödegaard c2686781b9 Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana 2018-09-17 13:21:11 +02:00
Torkel Ödegaard 742d2041a4 Merge pull request #13282 from grafana/davkal/explore-multiline-syntax 
Explore: Add multiline syntax highlighting to query field
 2018-09-17 13:20:19 +02:00