IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 08:16:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,265 Commits 5,348 Branches 546 Tags 1.8 GiB
b4c51f8822
Commit Graph

13265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
d08a829b69 ux: fix for responsive breakpoints and solo mode showing sidemenu 2018-02-01 11:29:04 +01:00
Marcus Efraimsson
ef90b3e49c Merge branch '7883_new_url_structure' into 7883_frontend_step2 2018-02-01 11:08:39 +01:00
Torkel Ödegaard
b55ce1dd72 docs: moved whats new article to master 2018-02-01 10:55:29 +01:00
Marcus Efraimsson
b135df9a6c Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure 2018-02-01 10:48:06 +01:00
Torkel Ödegaard
e985a9cd7c ux: fixed issue with zoom on graph caused scroll, fixes #10696 2018-02-01 10:36:55 +01:00
Carl Bergquist
eff687bece
Merge pull request #10694 from grafana/7883_backend 
backend for new url structure.
 2018-02-01 09:35:00 +01:00
Carl Bergquist
1303dc7ac0
Merge pull request #10704 from alexanderzobnin/fix-backend-plugin-table-rows 
plugins: return table with empty rows array insteaf of nil
 2018-02-01 09:17:29 +01:00
Marcus Efraimsson
90933b0621 dashboard: refactor logic for retrieving url for folder/dashboard 2018-01-31 23:14:48 +01:00
Marcus Efraimsson
40c83e3e22 dashboards: update dashboard/folder url if browser url is not the same as from backend 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
c0c3f17d84 dashboards: when restoring a dashboard to an older version, set current uid 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
8fc648ac43 dashboards: fix updating folder so that correct url is returned 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
035b724725 dashboards: remove slug property in dashboard search responses 
Removes slug property in dashboard search responses since this property isn't needed
anymore and it haven't been released to any stable release.
 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b folders: change the front end route for browsing folders 
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
b23560ed5a dashboards: add validation to delete dashboard by slug 
Validates that there are only one folder/dashboard having that slug,
otherwise returns 412 Precondition Failed
 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
95d063621e dashboards: new route for deleting dashboards by uid 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
c19f4a866f
Merge pull request #10695 from grafana/7883_frontend_step 
WIP: Dashboard & Persistent urls - Frontend Step
 2018-01-31 18:37:05 +01:00
Alexander Zobnin
db7890ec1e plugins: return table with empty rows array insteaf of nil 2018-01-31 19:59:15 +03:00
bergquist
58cfb23625 retry uid generation 2018-01-31 17:29:17 +01:00
Torkel Ödegaard
75cf9ae27d fix: use replace when redirecting to new url 2018-01-31 17:26:35 +01:00
Johannes Schill
2e0cc2e347 ux: Change input width of UserPicker and TeamPicker in AddPermissions component #10676 2018-01-31 17:01:04 +01:00
Daniel Lee
3a0459e425 Merge branch 'dashboard_permissions' 2018-01-31 16:53:07 +01:00
Daniel Lee
a5197046e8 viewstore: fix test after merge 2018-01-31 16:49:41 +01:00
Johannes Schill
780c7f8775 tests: Add TeamPicker test and update TeamPicker/UserPicker snapshots so they match the latest classNames update #10676 2018-01-31 16:48:45 +01:00
Daniel Lee
a9e2273064 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-31 16:45:32 +01:00
Daniel Lee
a0fc5383fd dashfolders: fix for folder picker 
If the selected folder is not in the options then manually create it. This
can happen in some edge cases (if an user has been given access to a
dashboard but does not have access to its parent folder)
 2018-01-31 16:44:55 +01:00
Johannes Schill
a73af39056 ux: Add an optional className to the UserPicker and TeamPicker #10676 2018-01-31 16:44:14 +01:00
Daniel Lee
7e2e57c306 dashfolders: fixes #10671. Allow Editors default access to Root. 
Editors should be able to create dashboards in root and should be
able to create folders. They cannot administrate permissions though
and these dashboards and folders will get the default permissions.
 2018-01-31 16:43:21 +01:00
Torkel Ödegaard
4ac21d2e8f docs: added redirect from old provision page, #10691 2018-01-31 16:20:14 +01:00
Johannes Schill
20052150ba tests: Move tests from Permissions to AddPermissions #10676 2018-01-31 16:15:05 +01:00
Johannes Schill
1b9e02e4cc tests: Update tests in PermissionsStore and rem out the Permissions-tests for now #10676 2018-01-31 16:12:51 +01:00
bergquist
9aa488c084 Merge remote-tracking branch 'origin/7883_frontend_step' into 7883_backend 
* origin/7883_frontend_step:
  dashboards: make scripted dashboards work using the old legacy urls
  dashboards: redirect from old url used to load dashboard to new url
  dashboards: add new default frontend route for rendering a dashboard panel
  dashboards: fix links to recently viewed and starred dashboards
  dashboards: use new *url* prop from dashboard search for linking to dashboards
  dashboards: when saving dashboard redirect if url changes
  dashboards: add new default frontend route for loading a dashboard
  dashboards: return url in response to save dashboard. #7883
 2018-01-31 15:57:03 +01:00
Daniel Lee
2409d129c2 dashfolders: text change 2018-01-31 15:41:52 +01:00
Daniel Lee
9ef64d3056 dashfolders: special case for folders in root 
Allow users to change permissions inherited from root.
 2018-01-31 15:34:05 +01:00
bergquist
16a1642831 gofmt... 2018-01-31 15:15:15 +01:00
Daniel Lee
a7e57bc2f8 spelling 2018-01-31 15:07:17 +01:00
bergquist
3da2ab61e0 Verifies requirement of id in dashboards. 2018-01-31 14:36:14 +01:00
Johannes Schill
2ad4c30bc6 ux: POC - Update "Add permissions" design and add a fancy animation #10676 2018-01-31 14:19:07 +01:00
bergquist
7e96052594 ensure dashboard title is unique in folder 2018-01-31 14:18:54 +01:00
Frederic Hemberger
d90dfcc203 docs: Remove obsolete Ansible rule (#10689) 
According to the author, the Ansible role is obsolete:
https://github.com/picotrading/ansible-grafana/issues/8#issuecomment-342210822
As the proposed alternative (https://github.com/jtyr/ansible-grafana/) hasn't been updated in the last two years either, I'm suggesting it should be removed altogether in favor of the role maintained by cloudalchemy.
 2018-01-31 14:15:32 +01:00
Frederic Hemberger
f57e106dd5 docs: Fix outdated provisioning link (#10690) 2018-01-31 14:15:16 +01:00
Chris Rice
dba93d8240 Renamed "Period" to "Min period" in CloudWatch query editor (#10665) 2018-01-31 14:14:34 +01:00
Patrick O'Carroll
ad893614e1 created cta-bg variable and changed bg color on light theme (#10693) 2018-01-31 14:14:11 +01:00
Alexander Zobnin
56c526fad3 Repeat panels when row is expanding (#10679) 
* fix: repeat panels when row is expanding

* repeat panel: change test name to more clear one
 2018-01-31 14:13:47 +01:00
Marcus Efraimsson
57edf89033 dashboards: make scripted dashboards work using the old legacy urls 
Scripted dashboards are still requested from /dashboard/script/scripted.js
#7883
 2018-01-31 14:07:49 +01:00
Marcus Efraimsson
a99331cdb9 dashboards: redirect from old url used to load dashboard to new url 
If legacy backend routes (/dashboard/db/<slug> and /dashboard-solo/db/<slug>)
are requested we try to redirect to new routes with a 301 Moved Permanently
 #7883
 2018-01-31 14:06:19 +01:00
Daniel Lee
1cfc81de74 playlist: fixes #10254 
Closes #10254
 2018-01-31 11:07:27 +01:00
Marcus Efraimsson
3efb3d8efa dashboards: add new default frontend route for rendering a dashboard panel 
New default route /d-solo/<uid>/<slug of dashboard title> where dashboard
panel are rendered by unique identifier and panel identifier.
If old route /dashboard-solo/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
Change url logic for sharing a panel so that the new default route
for rendering a dashboard panel are used.
 #7883
 2018-01-31 11:01:23 +01:00
Daniel Lee
79fe01959b alerting: small refactoring 2018-01-31 10:47:31 +01:00
Johannes Schill
666d29fafa dashfolders: POC - Use separate component for "Add permission" #10676 2018-01-31 10:39:38 +01:00
bergquist
bb3183f6cd removes uniqnes check on slug when saving dashboards 2018-01-31 10:29:52 +01:00