Commit Graph

12641 Commits

Author SHA1 Message Date
Marcus Efraimsson
854d22fa8e dashfolders: bulk move/delete improvements
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4f56d4ac07 snapshots: fixed snapshot issues, fixes #10214 2017-12-14 14:58:45 +01:00
bergquist
4a433ee630
docs: include all notifiers type 2017-12-14 14:45:17 +01:00
Patrick O'Carroll
33f2e31393 replaced old table with filter-table, removed edit button, made whole rows to links 2017-12-14 14:30:13 +01:00
Torkel Ödegaard
4e38526404 playlist: fixed playlist buttons in dashboard header, fixes #10213 2017-12-14 14:27:47 +01:00
Torkel Ödegaard
66ca8a6621
Update CHANGELOG.md 2017-12-14 13:58:33 +01:00
Torkel Ödegaard
88e9012cef
Update CHANGELOG.md 2017-12-14 13:58:11 +01:00
bergquist
f6f9e58d45 docs: update latest version to 4.6.3 2017-12-14 13:45:44 +01:00
Torkel Ödegaard
0085114d4e ux: minor changes to search input 2017-12-14 13:08:32 +01:00
Johannes Schill
b012131050 Magnifying glass on search fields #10188 (#10206)
* ux: Add magnifying glass icon to search input and remove the text label (#10188)

* ux: Add new look on search field to manage dashboards, users, teams, data sources, plugins. Change to use our own icon class instead of .fa (#10188)

* ux: Add new search look on org/users (#10188)
2017-12-14 12:46:00 +01:00
Torkel Ödegaard
776c39fd79 templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title 2017-12-14 12:31:57 +01:00
Torkel Ödegaard
9007e26106 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-14 12:10:59 +01:00
Torkel Ödegaard
ff89531849 fix: ignore row clones in schema migration 2017-12-14 12:10:32 +01:00
Robin Gustafsson
cf7a49977f proxyds: delete cookies except those listed in keepCookies 2017-12-14 11:46:44 +01:00
Daniel Lee
bcc85862fe dshttpsettings: Move whitelisted cookies to end of config page 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
Daniel Lee
592cb386e2 dshttpsettings: add field for cookies that should be kept
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
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
bergquist
43ac2b1dba update version for packagecloud 2017-12-14 11:30:10 +01:00
Marcus Efraimsson
196a05d487 dashfolders: bulk move/delete improvements
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
2017-12-14 11:26:16 +01:00
bergquist
294a6a0046 add release date for 4.6.3 2017-12-14 11:20:34 +01:00
Daniel Lee
fcca36a256 fix: after removed file 2017-12-14 09:46:55 +01:00
Daniel Lee
34cffc6b92 dashfolder: fix after backendSrv change
also removes unused create folder modal
2017-12-14 09:35:14 +01:00
Daniel Lee
f1b1dbc6dd dashboard: fix test after merge conflict 2017-12-14 09:34:00 +01:00
Daniel Lee
c5c403b6ef orgswitcher: update test 2017-12-14 09:02:23 +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
2c4de364f8 annotation icon fix 2017-12-13 18:18:51 -05:00
Trent White
d23131bbd2 udpate dark json icon 2017-12-13 18:18:15 -05:00
Trent White
1cbd88fc14 dashboard settings icons 2017-12-13 18:17:56 -05:00
Trent White
2a32d01bd5 replace icon on dashboard list (fa-th-large - looked squished) with a smaller version of dashbord icon. This may not be the best way to do the css, so it's a separate commit 2017-12-13 17:51:01 -05:00
Trent White
e2bbb85daa new icons created and added to nav 2017-12-13 17:48:44 -05:00
bergquist
75ecc019d3 changelog: adds note about closing #7481 2017-12-13 19:32:06 +01:00
Torkel Ödegaard
00e2413013 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 19:18:47 +01:00
Torkel Ödegaard
a7645b710d Merge remote-tracking branch 'origin/master' into develop 2017-12-13 19:18:10 +01:00
bergquist
a7d746375d Merge branch 'Thib17-master'
* Thib17-master:
  alertmanager: endAt should only be used if we have the correct value
  alertmanager: code style
  alerting: reduce log level for notifiers
  Alertmanager notifier: add "metric" labels if no tags
  Alertmanager notifier: make it match the new notifier interface
  support alertmanager
2017-12-13 19:17: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
Marcus Efraimsson
a583f92d16 dashfolders: bulk move dashboards synchronously
#10181
Also added better error handling when moving dashboards to other folders
2017-12-13 18:21:49 +01:00
Marcus Efraimsson
d736795fe6 dashfolders: remove error message when moving to the same folder. #10135 2017-12-13 18:21:49 +01:00
Torkel Ödegaard
26b8483fb0 teams: Fixes to edit team page 2017-12-13 18:20:49 +01:00
Torkel Ödegaard
529fcc46c0 Merge remote-tracking branch 'origin/10172_team_edit' into develop 2017-12-13 18:13:16 +01:00
Torkel Ödegaard
6254304667 Merge remote-tracking branch 'origin/select-wrapper' into develop 2017-12-13 18:12:35 +01:00
Torkel Ödegaard
9fb5367eea Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 18:08:29 +01:00
Torkel Ödegaard
2765c2ecc7 Merge branch 'develop-settings-links' into develop 2017-12-13 18:08:12 +01:00
Torkel Ödegaard
e99f846a6f ux: minor text change to #10177 2017-12-13 18:07:56 +01:00