bergquist
59cd2d5102
provisioning: avoid caching and use updated field from db
2018-02-09 15:23:38 +01:00
bergquist
31f3fdcba3
provisioning: delete dashboards before insert/update
2018-02-09 12:17:58 +01:00
Leonard Gram
e0abd862e0
provisioning: fixed bug in saving dashboards.
2018-02-08 16:36:53 +01:00
Leonard Gram
5a85fb6d32
Merge branch 'master' into provisioning
2018-02-08 13:43:19 +01:00
Marcus Efraimsson
0e8377a9f4
Update logic for create/update dashboard, validation and plugin dashboard links ( #10809 )
...
* enables overwrite if dashboard allready exist in folder
* dashboard: Don't allow creating a folder named General
* dashboards: update logic for save/update dashboard
No id and uid creates a new dashboard/folder.
No id and uid, with an existing title in folder allows overwrite
of dashboard.
Id without uid, allows update of existing dashboard/folder without
overwrite.
Uid without id allows update of existing dashboard/folder without
overwrite.
Id without uid, with an existing title in folder allows overwrite
of dashboard/folder and updated will have the uid of overwritten.
Uid without id, with an existing title in folder allows overwrite
of dashboard/folder and new will have the same uid as provided.
Trying to change an existing folder to a dashboard yields error.
Trying to change an existing dashboard to a folder yields error.
* dashboards: include folder id when confirmed to save with overwrite
* dashboards: fixes due to new url structure
Return importedUrl property in response to importing dashboards and
getting plugin dashboards and use this for redirects/links in the
frontend.
2018-02-08 12:48:38 +01:00
Leonard Gram
b549d29319
Merge branch 'master' into provisioning
2018-02-08 11:01:09 +01:00
Patrick O'Carroll
fc05fc42c9
added width class to add member choose ( #10835 )
2018-02-08 10:52:13 +01:00
Torkel Ödegaard
39238c192d
fix: folder redirect after creation
2018-02-07 15:33:08 +01:00
Daniel Lee
db1423eebc
dashfolders: fixes #10820
2018-02-07 15:13:34 +01:00
Torkel Ödegaard
541b0a0ca1
fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817
2018-02-07 14:10:23 +01:00
Torkel Ödegaard
17cbd9d6b4
fix: removed old shortcut that does not exist, fixes #10802
2018-02-07 10:43:42 +01:00
Torkel Ödegaard
76c2a6e5ee
build: fixed recovery test
2018-02-06 13:16:21 +01:00
Torkel Ödegaard
f54ba20783
fix: css fix, found a better way to fix #10772
2018-02-06 13:01:23 +01:00
Torkel Ödegaard
f1f8c23206
fix: minor build fix
2018-02-06 12:43:11 +01:00
Torkel Ödegaard
0e61a670bb
fix: error handling now displays page correctly, fixes #10777
2018-02-06 12:28:17 +01:00
Alexander Zobnin
6e68c2069e
Merge PR #10742
2018-02-06 13:39:31 +03:00
Alexander Zobnin
fd5e838f0e
heatmap tooltip: minor refactor
2018-02-06 13:38:17 +03:00
Torkel Ödegaard
cf7be5da0b
fix: changed dashboard title length to match slug length, will fix mysql index size issue, fixes #10779
2018-02-06 11:03:37 +01:00
Torkel Ödegaard
bc8e59a8d8
docs: added graphite section
2018-02-06 10:32:27 +01:00
Torkel Ödegaard
3614906828
docs: minor update
2018-02-06 10:19:23 +01:00
Alexander Zobnin
81dc051ae9
graph panel: fix csv export (series as col) ( #10769 )
2018-02-06 10:11:17 +01:00
Daniel Lee
5ca03972a8
org-switcher: should redirect to home page ( #10782 )
...
Fixes #10776
2018-02-06 10:02:28 +01:00
Alexander Zobnin
45d66e4b29
embedded panel: hide side menu during init ( #10788 )
2018-02-06 10:01:10 +01:00
Alexander Zobnin
ece9eb54b9
Merge branch 'master' of https://github.com/thattolleyguy/grafana into thattolleyguy-master
2018-02-06 11:38:33 +03:00
Daniel Lee
8c027ea707
scroll: css for #10722
...
Missed adding to previous commit. Ref #10722
2018-02-05 19:31:16 +01:00
Daniel Lee
5d756707ab
dashlist: scroll fix when no header
...
The first item in the dashlist has a margin that messes up
the height calculation for the scroll bar when the Show headings
option is not selected. This fix adds a margin-top set to 0 for
the 1st item in the list in this case. This prevents a scrollbar
being shown incorrectly. Fixes #10772
2018-02-05 19:22:15 +01:00
Torkel Ödegaard
1a8501450c
docs: video fix
2018-02-05 18:46:03 +01:00
Marcus Efraimsson
690beac277
Update changelog with deprecation notes of http api
2018-02-05 18:42:47 +01:00
Alexander Zobnin
f97be541af
redirect "permission denied" requests to "/" ( #10773 )
2018-02-05 18:17:47 +01:00
Torkel Ödegaard
24d882e7d8
docs: fix
2018-02-05 18:13:06 +01:00
Daniel Lee
4ce862c5b4
scroll: use wheelpropagation. Ref #10772
...
Once the vertical scrollbar comes to its end position, it should
allow the page scroll bar to start scrolling.
2018-02-05 18:12:04 +01:00
Marcus Efraimsson
57e172b30a
Merge branch 'master' of github.com:grafana/grafana
2018-02-05 17:59:11 +01:00
Marcus Efraimsson
e1d857887f
docs: update dashboard model, persistent urls and api changes in what's new in v5
2018-02-05 17:58:43 +01:00
Torkel Ödegaard
e800b19ef6
docs: fix download link
2018-02-05 17:56:48 +01:00
Torkel Ödegaard
061320ba7b
docs: minor update
2018-02-05 17:26:44 +01:00
Torkel Ödegaard
e9aadab355
docs: updated whats new
2018-02-05 17:00:19 +01:00
Marcus Efraimsson
7a968c1025
Update CHANGELOG.md
2018-02-05 16:53:32 +01:00
Marcus Efraimsson
24a1abaab2
Update CHANGELOG.md
2018-02-05 16:50:33 +01:00
Marcus Efraimsson
874c355e49
Merge branch 'master' of github.com:grafana/grafana
2018-02-05 16:43:39 +01:00
Marcus Efraimsson
e86fe0b144
docs: update dashboard model, new url structure and api changes in what's new in v5
2018-02-05 16:40:49 +01:00
Torkel Ödegaard
9138b38b93
Update CHANGELOG.md
2018-02-05 16:32:30 +01:00
Torkel Ödegaard
97bba1d826
build: updated publish script
2018-02-05 16:29:10 +01:00
Torkel Ödegaard
b2f62ae19c
docs: update docs with download links
2018-02-05 16:02:17 +01:00
Torkel Ödegaard
8f98e8b8f4
Update CHANGELOG.md
2018-02-05 15:36:16 +01:00
Torkel Ödegaard
3e2da1fee5
build: increased version to beta1
2018-02-05 15:28:57 +01:00
Torkel Ödegaard
e6b82b2fb1
fix: fixed permission list caching issue, fixes #10750
2018-02-05 15:23:46 +01:00
Daniel Lee
2d1bd270fb
Stale permissions ( #10768 )
...
* dashfolders: hide permissions in settings if folder has changed
and the dashboard has not been saved yet. Otherwise the use will
see stale permissions from the original folder.
* dashfolders: return folder url for inherited permissions
2018-02-05 14:28:24 +01:00
Carl Bergquist
04a94ce396
adds unique index for org_id+folder_id+title on dashboards ( #10766 )
2018-02-05 14:11:19 +01:00
Marcus Efraimsson
8ce2074eb2
docs: fix links in HTTP API Reference page
...
Fixes #10745
2018-02-05 14:05:52 +01:00
Marcus Efraimsson
a879dd8c0c
dashboards: render correct link for folder when searching for dashboards ( #10763 )
...
Fixes #10761
2018-02-05 13:23:24 +01:00
