public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
3255 Commits
Author SHA1 Message Date
Torkel Ödegaard fdf4bad1b7 fix: sidemenu profile main text is now username instead of name 2017-12-15 13:03:07 +01:00
Torkel Ödegaard c395237710 Merge branch Grafana v5 'develop' branch 2017-12-15 12:06:09 +01:00
Torkel Ödegaard 8905c8e5fb Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop 2017-12-15 11:53:47 +01:00
Daniel Lee 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
bergquist 256f7176a2 teams: add team count when searching for team 
closes #10207
 2017-12-15 11:08:06 +01:00
Torkel Ödegaard 581257416e Merge remote-tracking branch 'origin/develop-icons' into develop 2017-12-14 19:56:19 +01:00
Carl Bergquist 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
Robin Gustafsson cf7a49977f proxyds: delete cookies except those listed in keepCookies 2017-12-14 11:46:44 +01:00
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
Marcus Efraimsson e136b7c286 dashfolders: /dashboards should render index page with a 200 OK 2017-12-14 11:30:57 +01:00
Daniel Lee f1b1dbc6dd dashboard: fix test after merge conflict 2017-12-14 09:34:00 +01:00
Simon Aquino 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
Trent White e2bbb85daa new icons created and added to nav 2017-12-13 17:48:44 -05:00
bergquist 97c5498093 fixes broken unit test 2017-12-13 19:27:53 +01:00
Torkel Ödegaard a7645b710d Merge remote-tracking branch 'origin/master' into develop 2017-12-13 19:18:10 +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
Torkel Ödegaard 7f0440fded minor tweaks 2017-12-13 18:00:16 +01:00
bergquist 7c0fc59dfb execute process directly instead of creating sub shell 2017-12-13 17:58:50 +01:00
Torkel Ödegaard 313735bd75 search: worked on search results 2017-12-13 15:51:59 +01:00
bergquist bf999a4f82 fixes broken alert eval when first condition is using OR 
closes #9318
 2017-12-13 13:37:10 +01:00
Torkel Ödegaard ccbd18006e ux: org user management changes 2017-12-13 13:16:44 +01:00
bergquist dd3dd407ad removes unused property 2017-12-13 13:12:50 +01:00
Torkel Ödegaard 22aa1f7e42 ux: change members to users 2017-12-13 11:21:33 +01:00
bergquist 0b6169b3f5 removes verbose logging 2017-12-13 10:21:11 +01:00
Torkel Ödegaard 2465fcbd6b fix: FolderId and IsFolder when saving dashboard 2017-12-13 10:00:54 +01:00
linux chips 6e7a067857 adding support for sgl native time datatypes 2017-12-12 23:43:24 +03: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
Torkel Ödegaard 67f1435dc7 minor fix for #10136 2017-12-12 17:18:25 +01:00
Torkel Ödegaard 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
Torkel Ödegaard 89db9cc976 fix: fixed dashboard api tests 2017-12-12 16:15:24 +01:00
Torkel Ödegaard 8a61e0967e Merge branch 'master' into develop 2017-12-12 13:22:13 +01:00
Torkel Ödegaard cafed8ce8f Merge branch 'master' into develop 2017-12-12 13:19:07 +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
Alfred Krohmer 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
Alexander Zobnin 26281dd9d8 refactor: format files by gofmt 2017-12-11 19:46:05 +03:00
bergquist 411e8a16c2 backend plugins: manage plugins lifecycle with context 2017-12-11 15:05:06 +01:00
bergquist 1af4f7a1b4 backend plugins: dont swallow errors 2017-12-11 13:16:16 +01:00
bergquist 026eb9ac36 backend plugins: cleanup protobuf files 2017-12-11 13:09:10 +01:00
bergquist 7f68c2a53d backend plugins: add more datasource params 2017-12-11 12:53:01 +01:00
Torkel Ödegaard 795d9c0362 ux: fixed navbar and sidemenu z-index issue and improved responsive rules 2017-12-11 11:42:13 +01:00
bergquist 48e7f866f6 code style 2017-12-11 11:26:36 +01:00
bergquist 55a39dd2ad implement upstream changes 2017-12-11 11:14:03 +01:00