IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 10:50:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,275 Commits 5,089 Branches 538 Tags 1.9 GiB
9d7ab78d9f
Commit Graph

5598 Commits

Author SHA1 Message Date
Marcus Efraimsson
55100d5ff9
Merge pull request #10760 from grafana/10749_link_to_folder 
Fix link to folder from permissions list
 2018-02-05 11:34:59 +01:00
Marcus Efraimsson
7d3b990e91 permissions: fix link to folder from permissions list 
Also, closing Add Permissions CTA when DashboardPermissions and
FolderPermissions unmounts.
Fixes #10749"
 2018-02-05 11:10:37 +01:00
Marcus Efraimsson
6def21e83f dashboard: fix loading of snapshot and scripted dashboard (#10755) 
Fixes #10753
 2018-02-05 10:31:53 +01:00
Carl Bergquist
cc0cc8dd73 changes to new urlformat for home dashboard (#10738) 2018-02-05 10:24:48 +01:00
Torkel Ödegaard
07fa2f1722
fix: alert list links did not work, changed dashboardUri to Url, this is breaking api change in alert api (#10756) 2018-02-05 09:42:41 +01:00
Torkel Ödegaard
40c9d5f2a3 ux: hide sidemenu in kiosk mode, and while playlist is playing, fixes #107402 2018-02-04 17:32:27 +01:00
Torkel Ödegaard
162f4941f0 fix: restored tags to search 2018-02-03 10:14:45 +01:00
Marcus Efraimsson
4b64c1d0d4 fix frontend validation for creating new folder and import dashboard (#10737) 
Fixes #10731
 2018-02-03 10:03:01 +01:00
Tyler Tolley
ca3c1d8c63 #10724 Fix whitespace 2018-02-02 09:31:05 -07:00
Tyler Tolley
bde5499552 #10724 Fix finding the x bucket 2018-02-02 07:29:54 -07:00
bergquist
0c98c4db30 removes uid when using 'save as' 
closes #10720
 2018-02-02 10:59:31 +01:00
Daniel Lee
512f6992f1 dashfolders: rename Root folder to General. Closes #10692 2018-02-02 10:39:26 +01:00
Marcus Efraimsson
f158a604a0
Merge pull request #10683 from grafana/7883_new_url_structure 
New dashboard/folder url structure
 2018-02-02 10:23:03 +01:00
Patrick O'Carroll
d2827a0005 Light theme icon color (#10730) 
* working on new colors for icons in light theme

* more work on icon colors

* changed colors of icons for light theme
 2018-02-02 10:18:45 +01:00
Marcus Efraimsson
cd61d2b237 Merge branch 'master' into 7883_new_url_structure 2018-02-01 17:32:43 +01:00
Marcus Efraimsson
cef910dd78 Merge branch '7883_new_url_structure' of github.com:grafana/grafana into 7883_new_url_structure 2018-02-01 16:32:33 +01:00
Marcus Efraimsson
3db328f516 fix for dashboard/folder url's when having a sub path in root_url config 2018-02-01 16:30:48 +01:00
Torkel Ödegaard
5171d7e285 Merge branch 'master' of github.com:grafana/grafana 2018-02-01 15:45:59 +01:00
Torkel Ödegaard
c3181552f8 ux: added max width to dashboard settings views 2018-02-01 15:45:15 +01:00
Daniel Lee
22a349051c
Merge pull request #10719 from grafana/add_permissions_10676 
Grafana 5.0: Add permissions modal for the permissions pages
 2018-02-01 14:20:04 +00:00
Daniel Lee
a77c656033 dashfolders: adds test for permission store 2018-02-01 14:48:11 +01:00
Daniel Lee
cc55ab6bc8 dashfolders: adds permission modal to dashboard settings 2018-02-01 14:32:19 +01:00
bergquist
74ca6f6dbf changes dashboard url in alertlist 2018-02-01 14:08:51 +01:00
Daniel Lee
9cdc1428d7 Merge remote-tracking branch 'upstream/master' into add_permissions_10676 2018-02-01 14:02:14 +01:00
Marcus Efraimsson
cdf2fd64b7 route params from angular to view store should be updated on routeChangeSuccess 2018-02-01 13:28:04 +01:00
Alexander Zobnin
16e1640ba4 repeat panel: process repeats when row is expanding (#10712) 2018-02-01 13:23:45 +01:00
Marcus Efraimsson
ee9c408188 folders: changes needed due to merge 2018-02-01 13:21:24 +01:00
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
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
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
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
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
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
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
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
Daniel Lee
a7e57bc2f8 spelling 2018-01-31 15:07:17 +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
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
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
Johannes Schill
666d29fafa dashfolders: POC - Use separate component for "Add permission" #10676 2018-01-31 10:39:38 +01:00
Daniel Lee
816c4d2340 url: fix for boolean querystring parameters 
Without this fix then the querystring looks like ?abool=true which causes
a mismatch with the angular routing. This results in a redirect and messes
up the browser history and back button.
 2018-01-31 09:58:21 +01:00
Marcus Efraimsson
7734df1d18 dashboards: fix links to recently viewed and starred dashboards 
Use new property url from dashboard search for linking to dashboards
#7883
 2018-01-31 00:48:36 +01:00
Marcus Efraimsson
f2014223b4 dashboards: use new *url* prop from dashboard search for linking to dashboards 
#7883
 2018-01-31 00:42:17 +01:00
Marcus Efraimsson
8009307c16 dashboards: when saving dashboard redirect if url changes 
Redirect if new dashboard created or existing url changes.
#7883
 2018-01-31 00:32:51 +01:00
Marcus Efraimsson
aefcff26a6 dashboards: add new default frontend route for loading a dashboard 
New default route /d/<uid>/<slug of dashboard title> where dashboard
are loaded by unique identifier.
If old route /dashboard/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
 #7883
 2018-01-31 00:27:51 +01:00
Marcus Efraimsson
6ab526881a dashboards: ensure that uid is returned from getSaveModelClone 
Without this the uid will not be sent to the backend when saving a
dashboard.
#7883
 2018-01-31 00:06:31 +01:00
Daniel Lee
eb765d288c alertlist: disable pause button when user does not have permission 2018-01-30 23:35:27 +01:00
Patrick O'Carroll
2c8e448559 moved icon (#10681) 2018-01-30 20:01:12 +01:00
Daniel Lee
4bc5945c17 dashfolders: remove inline styles 2018-01-30 17:26:44 +01:00
Alexander Zobnin
526960058a repeat panel: minor refactor 2018-01-30 14:19:10 +03:00
Daniel Lee
0fb05bcf59 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-30 09:26:23 +01:00
ilgizar
1c95da8f23 Fix horizontal panel repeat. Fix #10672. 2018-01-30 09:52:30 +05:00
Johannes Schill
ee57ed10f9 dashfolders: Add min-width to align icons in permissions list and some margin between icon and text #10275 2018-01-29 17:10:25 +01:00
Johannes Schill
0573545d5a ui: Fix Firefox align issue in dropdowns #10527 (#10662) 2018-01-29 17:06:16 +01:00
Torkel Ödegaard
b1cf4cf01c fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402, fixes #10663 2018-01-29 17:04:29 +01:00
Daniel Lee
d74a98feff dashfolders: link to folder for inherited permissions 
In the permissions view in dashboard settings, this adds a
link to the parent folder for inherited permissions. Which
allows the user to easily navigate to the folder and change
inherited permissions.
 2018-01-29 16:10:47 +01:00
Johannes Schill
7900fd4a79 test: Update Tooltip test to check for className support 2018-01-29 15:54:59 +01:00
Alexander Zobnin
479658489a fix: remove repeated rows when repeat was disabled. (#10653) 2018-01-29 15:17:27 +01:00
Johannes Schill
e6c161d897 test: Update Popover test to check for className support 2018-01-29 15:10:05 +01:00
Johannes Schill
51b0f2b0c8 dashfolders: Get rid of unused import #10275 2018-01-29 14:53:10 +01:00
Johannes Schill
787b493c00 dashfolders: Use grafana's question mark instead of FA's and use the react tooltip instead of angular's #10275 2018-01-29 14:53:10 +01:00
Johannes Schill
d9460d0b2b dashfolders: Add className to Tooltip component 2018-01-29 14:51:28 +01:00
Alexander Zobnin
04053ec56c fix: don't show manually hidden sidemenu after view mode toggle (#10659) 2018-01-29 14:33:41 +01:00
Daniel Lee
146af8595d dashfolders: css class as parameter for Picker 
For the permissions picker, pass in an extra class to decide
if the description should be aligned left or right.
 2018-01-29 14:30:01 +01:00
Daniel Lee
5ee2d1de05 dashfolders: select with description for permissions 
The dropdown for selecting permission is a new component built on
react-select that includes a description for the permission for
every option in the select.
 2018-01-29 13:56:12 +01:00
Alexander Zobnin
b3ac85766e fix: show sidebar after mouse wheel scrolling (#10657) 2018-01-29 13:38:37 +01:00
Torkel Ödegaard
a0323e96fa fix: tweak of PR #10635 2018-01-29 10:46:05 +01:00
Torkel Ödegaard
dd4374cc65 Merge remote-tracking branch 'origin/10612_table-date-format' 2018-01-29 10:41:57 +01:00
Torkel Ödegaard
b6ce16ebae ux: minor tweak of #10634 2018-01-29 10:41:06 +01:00
Torkel Ödegaard
c5a75ab84a Merge remote-tracking branch 'origin/10628_search_media_break' 2018-01-29 09:29:46 +01:00
Torkel Ödegaard
cd2161e796 Revert "Fix typeahead to avoid generating new backend request on each keypress. (#10596)" 
This reverts commit 475febd004.
 2018-01-29 08:38:23 +01:00
Daniel Lee
a7fba593df dashfolders: add help popover. Add folder title for inherited permissions 2018-01-27 18:16:21 +01:00
Daniel Lee
50b20a0e5a dashfolders: use react component for dashboard permissions 
Switch out the angular component for the new react component on the
dashboard permissions editview on the settings page.
 2018-01-27 17:26:40 +01:00
Patrick O'Carroll
5f81f401e3 replaced input with gf-form-dropdown 2018-01-26 17:25:12 +01:00
Patrick O'Carroll
ffff75b01a reverted media queries 2018-01-26 16:59:16 +01:00
Alexander Zobnin
e6c19eb8e9 graphite: fix nested alerting queries (#10633) 2018-01-26 15:05:05 +01:00
Patrick O'Carroll
2f891726c3 fix for sm 2018-01-26 14:57:55 +01:00
Patrick O'Carroll
08822fbdca added media break for md and sm 2018-01-26 14:46:52 +01:00
Daniel Lee
83548f98b9 dashfolders: add disabled Admin permission to list 
This is a fake entry that is used to signal to the user that an Admin
user always has Admin rights and they cannot be removed.
 2018-01-26 14:38:27 +01:00
hannes
eefcb3080a fix typo in parameter. (#10613) 
* options.scopedVars was called without 'd', so a undefined was passed
  to the function convertDimensionFormat()
 2018-01-26 14:10:17 +01:00
Daniel Lee
ccd86873e7 dashfolders: autosave permissions on change (remove update button) 2018-01-26 14:02:22 +01:00
Daniel Lee
08c78ab8b7 dashfolders: fix tests for ViewStore after merge 2018-01-26 09:55:03 +01:00
James Westover
475febd004 Fix typeahead to avoid generating new backend request on each keypress. (#10596) 
* Fix typeahead to not generate new request on each keypress.

* Change to debounce method
 2018-01-26 09:27:06 +01:00
Alexander Zobnin
cffbb6afd5 fix vertical panel repeat (#10619) 2018-01-26 09:24:56 +01:00
Alexander Zobnin
b79017e4a4 graph: fix series sorting issue (#10617) 2018-01-26 09:23:56 +01:00