Daniel Lee
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
bergquist
ade734168c
alertmanager: endAt should only be used if we have the correct value
2017-12-13 19:17:00 +01:00
bergquist
3691faf136
alertmanager: code style
2017-12-13 19:17:00 +01:00
bergquist
1240db31d3
alerting: reduce log level for notifiers
2017-12-13 19:17:00 +01:00
Thibault Chataigner
a8264fe316
Alertmanager notifier: add "metric" labels if no tags
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-13 19:17:00 +01:00
Thibault Chataigner
3a7939c930
Alertmanager notifier: make it match the new notifier interface
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-13 19:17:00 +01:00
Mitsuhiro Tanda
20d94f9703
support alertmanager
2017-12-13 19:17:00 +01:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
bergquist
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
bergquist
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
bergquist
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +01:00
Thibault Chataigner
fd633a1d5d
Add a per-notifier ShouldNotify()
...
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
2017-12-12 17:35:54 +01:00
bergquist
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
Carl Bergquist
ea2f65b4c3
Merge pull request #10110 from bwhaley/master
...
Fixes bug in cloudwatch regarding credentials
2017-12-12 10:16:53 +01:00
Carl Bergquist
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +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
jomenxiao
ad2a69bff4
add encoding param
2017-12-11 16:01:17 +08: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
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
Ben Whaley
51854ff4fa
Fix go fmt
2017-12-07 16:10:13 +00: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
Ben Whaley
fe88658bdd
Resolves grafana/grafana:#9309
2017-12-07 03:43:32 +00: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
