f36aa2e953
Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1
...
* 'patch-1' of https://github.com/devkid/grafana :
Add default message for Pushover notifications
2017-12-19 14:30:09 +01:00
644c2f7fb0
test: remove unused code
2017-12-19 11:23:21 +01:00
66cf224e31
alerting: make alert extractor backwards compatible
...
closes #10270
2017-12-19 11:20:05 +01:00
1816e89730
alerting: move test json into files
2017-12-19 10:22:26 +01:00
51ec64f872
fix: reduced team name column length, fixes #10244
2017-12-18 13:38:29 +01:00
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
2b814738c1
dashfolder: change to migration text
...
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
2017-12-15 11:35:14 +01:00
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
5dbbf1826c
Avoid ID validation before provisioning dashboards
...
Attempting to provision grafana using a previously exported
JSON dashboard with the ID field already set, might result in an error.
In fact, Grafana might believe that a dashboard with that
given ID already exists in the database, throwing an error if it doesn't.
(see pkg/services/sqlstore/dashboard.go#L32)
The dashboard provisioner should set the dashboard id to zero in order to
avoid this behaviour inducing the dashboard to be written to the DB
without ID validation.
2017-12-14 02:07:50 +01:00
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
ade734168c
alertmanager: endAt should only be used if we have the correct value
2017-12-13 19:17:00 +01:00
3691faf136
alertmanager: code style
2017-12-13 19:17:00 +01:00
1240db31d3
alerting: reduce log level for notifiers
2017-12-13 19:17:00 +01:00
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
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
20d94f9703
support alertmanager
2017-12-13 19:17:00 +01:00
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
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +01:00
2465fcbd6b
fix: FolderId and IsFolder when saving dashboard
2017-12-13 10:00:54 +01:00
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
67f1435dc7
minor fix for #10136
2017-12-12 17:18:25 +01:00
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
72e686457c
Add default message for Pushover notifications
...
If the message field is left empty for Pushover notifications, the API will return an error. This adds a default message if the message would otherwise be empty.
This fixes #8006 .
2017-12-11 22:14:38 +01:00
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
2017-12-07 15:27:01 +01:00
1dfa529941
dashboards as cfg: avoid walking fs in parallel
2017-12-07 15:27:01 +01:00
b28ea0b407
dashboards as cfg: type
2017-12-07 15:27:01 +01:00
099178466d
dashboards as cfg: wire up dashboard repo
2017-12-07 15:27:01 +01:00
288cc35529
dashboards as cfg: use gocache for caching
2017-12-07 15:27:01 +01:00
f5eac2e91d
dashboards as cfg: expose dashboard service as interface
2017-12-07 15:27:01 +01:00
16f072b320
dashboards as cfg: move saving logic for dashboards into its own service
2017-12-07 15:27:01 +01:00
9cebb23e01
dashboards as cfg: revert minor changes
2017-12-07 15:27:01 +01:00
74e12c260f
dashboards as cfg: move dashboard saving into its own service
2017-12-07 15:27:01 +01:00
09cb0f378b
dashboards as cfg: minor tweaks
2017-12-07 15:27:01 +01:00
93e1d8a19c
dashboards as cfg: make dashboard none editable by default
2017-12-07 15:27:01 +01:00
7f3a7ea128
dashboards as cfg: more tests
2017-12-07 15:27:01 +01:00
dc0fb8be06
dashboards as cfg: code cleanup
2017-12-07 15:27:01 +01:00
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Carl Bergquist
Torkel Ödegaard
Daniel Lee
Simon Aquino
Thibault Chataigner
Mitsuhiro Tanda
Carl Bergquist
Alfred Krohmer
Alexander Zobnin