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
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
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
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
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
bergquist
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
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
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
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
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
35232a77e6
removes unused properties
...
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.
closes #10072
2017-12-05 08:26:43 +01:00
bergquist
d6d64c53cd
typo 💥
2017-12-01 16:23:55 +01:00
Carl Bergquist
89fb60a956
Merge pull request #10020 from jomenxiao/master
...
fix render http[get] params error
2017-12-01 16:22:47 +01:00
bergquist
9282182805
influxdb: pass tags to alerting from influxdb client
...
closes #10046
2017-12-01 16:16:49 +01:00
bergquist
17bf87fb62
typo 💥
2017-12-01 14:05:47 +01:00
bergquist
7a497fd617
move systemd ready notification to server.go
2017-12-01 14:02:05 +01:00
Carl Bergquist
820abef82d
Merge pull request #10025 from jgrassler/systemd-sdnotify
...
Use systemd notification where applicable
2017-12-01 13:26:13 +01:00
Johannes Grassler
d28ca54129
Use systemd notification where applicable
...
With this change in place, the grafana service will signal
readiness to serve by writing "READY=1" to the path specified
through the NOTIFY_SOCKET environment variable. If this
environment variable is not present or empty, no notification
will happen. This notification is the standard systemd
mechanism for indicating a service is ready to serve. For
Grafana this may be a couple of seconds from startup due to
database migrations. This change also adjusts the Grafana
systemd service definition to make use of this feature.
2017-12-01 10:31:58 +01:00
Andrei Kalasok
68d4211c50
grafana-10039: fix query time range ends in the past
2017-11-30 15:50:35 +01:00
Marcus Efraimsson
1e10fcad83
test: fix failing postgres test
...
Should use case insensitive matching when searching for users
2017-11-29 15:17:31 +01:00
Daniel Lee
554c7ba96f
notifier: Fixes path for uploaded image for Slack notifier
...
Fixes #10012
2017-11-29 11:16:45 +01:00
jomenxiao
3f95180c98
fix render http[get] params error
2017-11-28 22:20:22 +08:00
bergquist
c0e087640b
test: close file before deleting
2017-11-28 15:05:53 +01:00
THIERRY SALLE
658109e0d6
Optimized number of lines fetching in log file initialisation
...
Added unit tests for file logging line counting
Remove file after unit test
2017-11-22 14:25:39 +01:00
Carl Bergquist
79e788e46f
Merge pull request #9937 from saady/gcs-path
...
[GCS] Support for gcs path
2017-11-21 19:46:53 +01:00
