bergquist
a4748d82ab
Merge branch 'master' into backend_plugins
...
* master:
changelog: adds note about closing #10131
Explicitly specify default region in CloudWatch datasource (#9440 )
wait for all sub routines to finish
changelog: adds ntoe about closing #10111
postgres: change $__timeGroup macro to include "AS time" column alias (#10119 )
fixes broken test
Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate.
2017-12-11 10:43:41 +01:00
bergquist
66bc1fea2d
changelog: adds note about closing #10131
2017-12-11 09:45:47 +01:00
Carl Bergquist
a5b3f2b891
Merge pull request #10132 from bergquist/go_routine_management
...
Wait for all sub routines to finish before closing Grafana
2017-12-11 09:43:37 +01:00
Mikael Olenfalk
8e7166b5c4
Explicitly specify default region in CloudWatch datasource ( #9440 )
...
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.
This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
bergquist
f7ed24475c
wait for all sub routines to finish
...
simple solution for waiting for all go sub routines to
finish before closing Grafana. We would use errGroup
here as well but I dont like spreading context's all
over the place.
closes #10131
2017-12-11 08:53:06 +01:00
bergquist
0506cfdc1d
changelog: adds ntoe about closing #10111
2017-12-08 16:09:32 +01:00
Carl Bergquist
2408d8f09a
Merge pull request #10112 from adiletmaratov/master
...
Solves problem with Github authentication restriction by organization
2017-12-08 16:05:27 +01:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
bergquist
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
bergquist
f0abe696b5
Merge branch 'master' into backend_plugins
...
* master:
improve error handling for datasources as cfg
improve sample datasource.yaml
2017-12-08 10:55:55 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
bergquist
c766802325
improve sample datasource.yaml
2017-12-08 10:28:38 +01:00
bergquist
7f6e028850
Merge branch 'master' into backend_plugins
...
* master:
make gitignore more generic
fixes issue with datasource/dash as cfg and gitignore
2017-12-08 10:26:26 +01:00
bergquist
80a852b00a
make gitignore more generic
2017-12-08 09:35:46 +01:00
bergquist
79d7213e11
fixes issue with datasource/dash as cfg and gitignore
2017-12-08 06:52:47 +01:00
bergquist
9edd7701b2
fixes failing tests
2017-12-07 18:05:11 +01:00
bergquist
e1d4bf2607
kill plugin processes when grafana shuts down
2017-12-07 16:59:35 +01:00
bergquist
a2d47427ba
separate plugin impl and proto files
2017-12-07 16:33:36 +01:00
bergquist
0bc5bf53ce
correct comments
2017-12-07 16:33:36 +01:00
bergquist
3f5daa5e58
add hclog wrapper for grafanas logger in plugins
2017-12-07 16:33:36 +01:00
bergquist
0f6c470e03
add go-plugin deps to vendor
2017-12-07 16:33:36 +01:00
bergquist
a97360ab27
initial version of proto files
2017-12-07 16:32:17 +01:00
bergquist
7b81ebc991
changelog: breaking regardless what your running
2017-12-07 16:29:56 +01:00
bergquist
f39b40c2dd
changelog: better styling
2017-12-07 16:29:00 +01:00
bergquist
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
bergquist
5fb8b37241
changelog: note about closing #5269 and #9654
2017-12-07 16:13:08 +01:00
Carl Bergquist
fb386f3c8d
Merge pull request #10052 from bergquist/dashboards_from_disk
...
Load dashboards from disk into the database at regular interval
2017-12-07 16:12:02 +01:00
bergquist
5006f9e4c5
dashboards as cfg: update docs to use /provisioning
2017-12-07 15:55:00 +01:00
bergquist
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
2017-12-07 15:27:01 +01:00
bergquist
50bc801f1c
dashboards as cfg: copy dash/ds files if missing
2017-12-07 15:27:01 +01:00
bergquist
361acd3fa1
dashboards as cfg: include cfg files in dist packages
2017-12-07 15:27:01 +01:00
bergquist
1dfa529941
dashboards as cfg: avoid walking fs in parallel
2017-12-07 15:27:01 +01:00
bergquist
b28ea0b407
dashboards as cfg: type
2017-12-07 15:27:01 +01:00
bergquist
2a18345eb2
dashboards as cfg: disable loading dashboards from disk by default
2017-12-07 15:27:01 +01:00
bergquist
099178466d
dashboards as cfg: wire up dashboard repo
2017-12-07 15:27:01 +01:00
bergquist
288cc35529
dashboards as cfg: use gocache for caching
2017-12-07 15:27:01 +01:00
bergquist
f5eac2e91d
dashboards as cfg: expose dashboard service as interface
2017-12-07 15:27:01 +01:00
bergquist
16f072b320
dashboards as cfg: move saving logic for dashboards into its own service
2017-12-07 15:27:01 +01:00
bergquist
9cebb23e01
dashboards as cfg: revert minor changes
2017-12-07 15:27:01 +01:00
bergquist
74e12c260f
dashboards as cfg: move dashboard saving into its own service
2017-12-07 15:27:01 +01:00
bergquist
09cb0f378b
dashboards as cfg: minor tweaks
2017-12-07 15:27:01 +01:00
bergquist
93e1d8a19c
dashboards as cfg: make dashboard none editable by default
2017-12-07 15:27:01 +01:00
bergquist
7f3a7ea128
dashboards as cfg: more tests
2017-12-07 15:27:01 +01:00
bergquist
dc0fb8be06
dashboards as cfg: code cleanup
2017-12-07 15:27:01 +01:00
bergquist
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
Sven Klemm
a62ebb3e59
mysql: pass timerange for template variable queries ( #10071 )
...
* mysql: pass timerange for template variable queries
* mysql: document time range macro usage in template variables
* mysql: docs for on time range change refresh mode for template queries
* Revert "mysql: docs for on time range change refresh mode for template queries"
This reverts commit 5325972aa4
2017-12-07 11:18:36 +01:00
Adilet Maratov
50daf7463d
Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate.
...
How it is solved:
* Take organizations_url field data from user basic data response
* Make another request to get all organization the user is a member of (public membership)
* Authenticate user if appropriate organization found in that list
2017-12-07 16:13:49 +06:00
Sven Klemm
b44c599410
postgres: pass timerange for template variable queries ( #10069 )
...
* pass timerange for template queries when refresh is set to timerange
change
* document on time range change refresh mode for template queries
2017-12-07 10:05:04 +01:00
Sven Klemm
c80eadcdf4
handle native postgres datetime types in annotation queries ( #9986 )
2017-12-06 18:12:24 +01:00
Sven Klemm
373389c920
treat any text column in timeseries query as metric name unless column ( #9985 )
...
named metric is present
2017-12-06 18:04:33 +01:00
bergquist
Carl Bergquist
Mikael Olenfalk
Sven Klemm
Adilet Maratov