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
887af65ca9
Merge pull request #10264 from SteelPhase/patch-2
...
fix: Extra forward slash added when org redirect middleware is called (#10263 )
2017-12-19 13:58:33 +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
a320a83138
Use strings.TrimPrefix to make sure relative url doesn't start with forward slash
...
Closes grafana/grafana#10263
2017-12-19 03:01:33 -05:00
40482d9ada
Merge branch 'master' of github.com:grafana/grafana
2017-12-18 13:38:54 +01:00
51ec64f872
fix: reduced team name column length, fixes #10244
2017-12-18 13:38:29 +01:00
fcf1ff10d2
Kinesis Metric Capitalization
...
Fixes the capitalization of the AWS/Kinesis ShardId metric, which
was incorrectly specified as "ShardID" instead of "ShardId" as
specified in the AWS documentation:
http://docs.aws.amazon.com/streams/latest/dev/monitoring-with-cloudwatch.html
2017-12-15 12:44:13 -06:00
36fe8f5873
menu: fixed create default url
2017-12-15 15:17:05 +01:00
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
2797e8e2d0
profile: use name or fallback for profile page
2017-12-15 13:06:11 +01:00
fdf4bad1b7
fix: sidemenu profile main text is now username instead of name
2017-12-15 13:03:07 +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
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
45eda16a87
Merge pull request #10203 from queeno/dashboard_provisioner_id_validation
...
Avoid ID validation before provisioning dashboards
2017-12-14 15:43:07 +01:00
cf7a49977f
proxyds: delete cookies except those listed in keepCookies
2017-12-14 11:46:44 +01:00
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
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
f1b1dbc6dd
dashboard: fix test after merge conflict
2017-12-14 09:34:00 +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
e2bbb85daa
new icons created and added to nav
2017-12-13 17:48:44 -05: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
7f0440fded
minor tweaks
2017-12-13 18:00:16 +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
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
22aa1f7e42
ux: change members to users
2017-12-13 11:21:33 +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
89db9cc976
fix: fixed dashboard api tests
2017-12-12 16:15:24 +01:00
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
ea2f65b4c3
Merge pull request #10110 from bwhaley/master
...
Fixes bug in cloudwatch regarding credentials
2017-12-12 10:16:53 +01:00
Carl Bergquist
Carl Bergquist
SteelPhase
Torkel Ödegaard
Scott Ernst
Daniel Lee
Robin Gustafsson
Marcus Efraimsson
Simon Aquino
Trent White
Thibault Chataigner
Mitsuhiro Tanda