IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,891 Commits 5,114 Branches 538 Tags 1.9 GiB
84dce3282a
Commit Graph

5331 Commits

Author SHA1 Message Date
ilgizar
425586f67d Set default threshold axis to 'left' for panels created before this feature. 2018-02-14 23:44:04 +05:00
Torkel Ödegaard
fcaa8227a6
Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
Torkel Ödegaard
8dd4d505ee Merge branch 'dashboard-search-permissions-filter' 2018-02-14 10:48:55 +01:00
Torkel Ödegaard
bb681cd498 Merge branch '10819_empty_dashboard_list' 2018-02-14 09:38:19 +01:00
Torkel Ödegaard
b0fae0129c ux: refactoring #10884 2018-02-14 09:37:39 +01:00
Mitsuhiro Tanda
6a85369c50 add 13-24 for min width (#10891) 2018-02-13 17:22:55 +01:00
Patrick O'Carroll
aaf4e760c6 new dashboard is now hidden from viewer, fixes #10815 (#10854) 
* new dashboard is now hidden from viewer, fixes #10815

* changed orgRole to isEditor

* removed unused import

* added contextSrv mock to search.jest
 2018-02-12 17:11:41 +01:00
Marcus Efraimsson
ac3bf54fb4 login: fix broken reset password form (#10881) 2018-02-12 17:09:39 +01:00
Patrick O'Carroll
f2d8222af5 moved div in code 2018-02-12 16:13:39 +01:00
Patrick O'Carroll
5fced6e92b added buttons and text to empty dashboard list 2018-02-12 16:10:23 +01:00
Marcus Efraimsson
cb8c82f7f6 Merge branch 'master' into 10630_folder_api 2018-02-12 15:14:41 +01:00
Marcus Efraimsson
2b31465254 Merge branch 'master' into docs_v5.0 2018-02-12 14:29:22 +01:00
Willy Hu (IS-TW)
725e23ef7d Cloudwatch dimension_values add dimension filter. 
issue #10029

e.g.
- dimension_values($region, $namespace, cpu_usage_system, cpu)
- dimension_values($region, $namespace, disk_used_percent, device, {"InstanceId": "$instance_id"})
- dimension_values($region, $namespace, disk_used_percent, path, {"InstanceId": "$instance_id", "device": "$device"})
 2018-02-12 10:13:55 +00:00
Alexander Zobnin
111b32290a Fixes for graphite tags editor (#10861) 
* graphite: don't fetch tags on editor init

* add debounce option to query editor directives

* graphite: debounce tag queries
 2018-02-09 16:20:30 +01:00
Torkel Ödegaard
c01b80522e fix: clear items list before fetching permissions list 2018-02-09 16:13:20 +01:00
Torkel Ödegaard
e949eb3f58 Merge branch 'master' into dashboard-search-permissions-filter 2018-02-09 15:16:34 +01:00
Marcus Efraimsson
a86f2fa34b user picker should only include users from current org (#10845) 2018-02-09 10:42:37 +01:00
ilgizar
57e31ca71b Correct code style. 2018-02-09 10:06:50 +05:00
Torkel Ödegaard
8e8f3c4332 dashboard and folder search with permissions 2018-02-08 17:11:01 +01:00
Marcus Efraimsson
a91bd53a34 dashboard: fix delete of folder from folder settings tab. 
Fixes #10821
 2018-02-08 14:25:23 +01:00
ilgizar
98e5815c97 append test to thresholds on right axis 2018-02-08 17:28:24 +05: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
Patrick O'Carroll
fc05fc42c9 added width class to add member choose (#10835) 2018-02-08 10:52:13 +01:00
ilgizar
578ee88ff3 Fix #7107 2018-02-08 12:53:02 +05:00
Torkel Ödegaard
39238c192d fix: folder redirect after creation 2018-02-07 15:33:08 +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
f54ba20783 fix: css fix, found a better way to fix #10772 2018-02-06 13:01:23 +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
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
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
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
Torkel Ödegaard
7f5e195cb4 Merge branch 'master' into docs_v5.0 2018-02-05 16:29:49 +01:00
Torkel Ödegaard
e6b82b2fb1 fix: fixed permission list caching issue, fixes #10750 2018-02-05 15:23:46 +01:00
Marcus Efraimsson
49c02aa8d2 Merge branch 'master' into docs_v5.0 2018-02-05 15:23:32 +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
Marcus Efraimsson
a879dd8c0c dashboards: render correct link for folder when searching for dashboards (#10763) 
Fixes #10761
 2018-02-05 13:23:24 +01:00
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
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
Marcus Efraimsson
3a906ea335 Merge branch 'master' into 10630_folder_api 2018-02-02 14:34:10 +01: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
d217688d5e folders: use new folder api in frontend 2018-02-01 22:32:26 +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
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
Mitsuhiro Tanda
cf1be5fdfc support multiple histogram series 2018-02-01 19:06:35 +09: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
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
Torkel Ödegaard
c1cdcd3bda docs: updated whatsnew 2018-01-31 09:41:49 +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
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
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
Overcooked Panda
c226f8eeb9 added hash rate units for monitoring mining processes 2018-01-27 01:58:43 -06:00
Patrick O'Carroll
5f81f401e3 replaced input with gf-form-dropdown 2018-01-26 17:25:12 +01:00
Alexander Zobnin
e6c19eb8e9 graphite: fix nested alerting queries (#10633) 2018-01-26 15:05:05 +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
Johannes Schill
49634593cf dashfolders: New snapshot since we changed from defaultValue to value per latest React documentation #10275 2018-01-25 15:37:49 +01:00
Johannes Schill
1255a0a356 refactor: Replace _.find with Array.prototype.find() 2018-01-25 15:37:27 +01:00
Johannes Schill
34f27f6b15 dashfolders: Convert mobx observable to js objects and remove the observer() since we want to use the component outside the react/mobx world #10275 2018-01-25 15:37:15 +01:00
Johannes Schill
0722ea04a6 dashfolders: Clean up more variables and move newType, aclTypes and permissionOptions to the store #10275 2018-01-25 15:37:05 +01:00
Johannes Schill
4ea9f3027a dashfolders: Remove variables not used and pass in the real dashboardId #10275 2018-01-25 15:36:56 +01:00
Johannes Schill
02a3951f95 dashfolders: Remove those 2-line-components from PageHeader to make it easier to read and make sure components listening to the mobx state are wrapped with observer() #10275 2018-01-25 15:36:45 +01:00
Johannes Schill
766ab69143 dashfolders: Add support for breadcrumbs in NavStore #10275 2018-01-25 15:36:34 +01:00
Johannes Schill
3a94918b8f dashfolders: Rename UserPicker folder => Picker. Inject the permission-store in the FolderPermissions-container instead of the Permissions component, add the PermissionsStore to the RootStore and and the error-message to the Permissions-store #10275 2018-01-25 15:36:04 +01:00
Johannes Schill
126607de83 dashfolders: Add Permissions information box #10275 2018-01-25 15:33:56 +01:00
Johannes Schill
6b421b80a6 dashfolders: Fix page max width #10275 2018-01-25 15:33:45 +01:00
Johannes Schill
c3664e1d87 dashfolders: Update jest tests with backendSrv #10275 2018-01-25 15:33:36 +01:00
Johannes Schill
5a9fe9aff9 dashfolders: Add a Team Picker component and use it on the dashboard permissions page #10275 2018-01-25 15:33:11 +01:00
Johannes Schill
6b9858c1d3 dashfolders: Working user picker on the dashboard permissions page #10275 2018-01-25 15:30:43 +01:00
Johannes Schill
2de0489868 dashfolders: Send down backendSrv to the react components #10275 2018-01-25 15:30:15 +01:00
Johannes Schill
b79a15b057 dashfolders: Re-use the API of the angular user picker instead, which is reusable #10275 2018-01-25 15:29:21 +01:00
Johannes Schill
1d8ce3673e dashfolders: Remove the PermissionsInner-strategy since we have a container for this route now #10275 2018-01-25 15:20:56 +01:00
Johannes Schill
a5d441e78e dashfolders: Permissions are injected via MST so it needs to be defined as optional #10275 2018-01-25 15:20:37 +01:00
Johannes Schill
f23fb740a9 dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 2018-01-25 15:20:00 +01:00
Johannes Schill
7e13d0f773 dashfolders: Always get dashboardid and backendsrv from props #10275 2018-01-25 15:19:41 +01:00
Johannes Schill
3490c44636 dashfolders: Rem code to avoid tests to fail #10275 2018-01-25 15:19:30 +01:00
Johannes Schill
44ea8e58e2 wip: More on the permissions. Left are team picker and user picker, tests and error messages #10275 2018-01-25 15:19:17 +01:00
Johannes Schill
c8193e10b9 dashfolder: wip: More wip on acl.html2permissions.tsx #10275 2018-01-25 15:18:16 +01:00
Johannes Schill
7616cfb5f0 dashfolders: wip - Move Permissions into React #10275 2018-01-25 15:14:59 +01:00
Daniel Lee
bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Daniel Lee
4cfe179f47 variables: lint fix 2018-01-25 14:49:51 +01:00
Daniel Lee
8aa55ee352 variables: fix when datasource returns error 2018-01-25 14:16:06 +01:00
Jonathan McCall
579d2b63f8 Disable prefix and postfix font size when gauge mode is enabled (#10573) 
* Disable prefix and postfix font size when gauge mode is enabled

* Use function to hide prefix/postfix size when using gauge

* Rename disableFontSizes to canChangeFontSizes
 2018-01-25 09:27:25 +01:00
Torkel Ödegaard
889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Torkel Ödegaard
dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Marcus Efraimsson
b5a6a9ab3b dashboards: Fix issue with first click when expanding folder in search 
Fixes #10580
 2018-01-22 16:12:52 +01:00
Carl Bergquist
89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by 
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
 2018-01-22 10:42:20 +01:00
Carl Bergquist
27d103adae
Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked 
Disable instead of hide mode options when line/points is unchecked
 2018-01-22 08:11:19 +01:00
Jonathan McCall
f516c82ddc Disable instead of hide mode options when line/points is unchecked 2018-01-20 19:23:26 -05:00
Daniel Lee
94a54248c1 dashfolders: show folders use can save to in picker 
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
 2018-01-20 01:58:28 +01:00
Daniel Lee
f443cb8229 dashfolders: fix bug in save as modal 2018-01-20 01:58:28 +01:00
Jonathan McCall
88e1ec3382 Add lumens unit 2018-01-19 19:12:30 -05:00
Torkel Ödegaard
cfa775e012 ds: updated ds nav 2018-01-18 18:17:58 +01:00
Torkel Ödegaard
dc3e943a4e feat: ds edit fix 2018-01-18 17:43:41 +01:00
Torkel Ödegaard
ccde8d9e2f feat: ds edit nav 2018-01-18 17:42:40 +01:00
Andrew Cottrell
8368bfeab4
Recommend a limit on database query 
Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.
 2018-01-18 14:31:42 +00:00
Daniel Lee
10018d8455 dashfolders: add breadcrumbs to NavStore 2018-01-18 12:12:07 +01:00
Daniel Lee
1a019052d5 mysql: convert numbers to text for annotation tooltip 2018-01-18 11:50:16 +01:00
Torkel Ödegaard
561561d8fe fix: fixed build issue 2018-01-17 10:48:07 +01:00
Torkel Ödegaard
66edb29f53 fix: multi valued query variables did not work correctly, fixes #10539 2018-01-17 09:41:35 +01:00
Dan Cech
c62b0858ae
move graphite /functions parsing into gfunc.ts 2018-01-16 18:04:59 -05:00
Dan Cech
315ecf8505
fix tests & some display issues 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
e9d33750cb
fix: graphite func editor fixes, this component is messy and ugly as hell 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
1a6bf692c6
fix: minor fixes 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
38f4d5d06d
fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
7e750cef43
fix: query editor needs to wait for function definitions to load 2018-01-16 17:02:03 -05:00
Dan Cech
b483d42d34
fix issue with metric find & functions being loaded multiple times 2018-01-16 17:02:03 -05:00
Dan Cech
60ba6ee6a2
interpolate variables in tags & values during autocomplete 2018-01-16 17:02:03 -05:00
Dan Cech
92086bc858
fix typo 2018-01-16 17:02:03 -05:00
Dan Cech
da9e1a7e98
fix line length, run jscs & jshint in precommit 2018-01-16 17:02:03 -05:00
Dan Cech
3ddb65fc8b
function description formatting 2018-01-16 17:02:03 -05:00
Dan Cech
4d3bac0284
tooltips for function definitions 2018-01-16 17:02:03 -05:00
Dan Cech
80a6e0d8d1
support specifying tag_values("<tag>") as graphite template query 2018-01-16 17:02:03 -05:00
Dan Cech
7c1be021ac
use typeahead value in graphite find requests 2018-01-16 17:02:03 -05:00
Dan Cech
ff759b0ef7
send prefix when auto-completing tags 2018-01-16 17:02:03 -05:00
Dan Cech
d8f2a20775
add button to trigger evaluation of tag queries 2018-01-16 17:02:03 -05:00
Dan Cech
a3dba6070e
sync function categories with graphite-web 2018-01-16 17:02:03 -05:00
Dan Cech
ebad19b232
work on tag dropdown behavior 2018-01-16 17:02:03 -05:00
Dan Cech
3a4e05133e
support for loading function definitions from graphite 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
307b419f7c ux: dashboard nav and settings tweaks 2018-01-16 14:41:08 +01:00
Torkel Ödegaard
11ba8070b8
Tag filters in search (#10521) 
* tag filter: initial react component

* dashboard: move tag filter to filterbox

* tag filter: customize value rendering

* tag filter: get color from name

* tag filter:  custom option renderer

* tag filter: mode with tags in different container

* tag filter: refactor

* refactoring PR #10519

* tag filter: refactor of PR #10521
 2018-01-16 12:52:13 +01:00
Torkel Ödegaard
42d7308034 fix: save as enter key now works and folder selection also works, fixes #10464 2018-01-16 12:50:24 +01:00
Daniel Lee
a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
Patrick O'Carroll
08211eb220 added a variable for grid color and if statment to switch colors, fixes #10509 (#10517) 2018-01-15 12:43:09 +01:00
Daniel Lee
58293ce5cc dashfolders: bugfix after rename 2018-01-15 10:15:52 +01:00
Daniel Lee
4948d4fd75 dashfolders: bugfix after rename 2018-01-15 10:14:10 +01:00
Torkel Ödegaard
270db4da8b fix: share snapshot controller was missing ngInject comment, fixes #10511 2018-01-15 09:05:26 +01:00
Daniel Lee
21b5ded75b dashfolder: refactor breadcrumbs in PageHeader 
Combines title and breadcrumbs in PageHeader instead of having to
set title to empty and add it as a breadcrumb.
 2018-01-11 17:53:06 +01:00
Daniel Lee
545d7b9477 dashfolders: convert folder settings to React 2018-01-11 15:42:45 +01:00
Torkel Ödegaard
f3a66ecbcb fix: alert list pause/start toggle was not working properly 2018-01-11 15:18:38 +01:00
Marcus Efraimsson
2843961677 dashboard: Close/hide 'Add Panel' before saving a dashboard (#10482) 
Fixes #10472
 2018-01-11 08:56:19 +01:00
Torkel Ödegaard
9606a34e0a fix: removed unused param 2018-01-10 14:34:08 +01:00
Alexander Zobnin
bfd7e1043b Fix variables values passing when both repeat rows and panels is used (#10488) 
* dashboard: repeat rows and panels tests

* fix variable values passing when both repeat rows and panels is used
 2018-01-10 14:30:43 +01:00
Torkel Ödegaard
b76958f07b ux: minor change to alert list page 2018-01-10 14:18:58 +01:00
Torkel Ödegaard
32df74ffec ux: minor word change to alert list 2018-01-10 13:17:43 +01:00
Torkel Ödegaard
686548a6ed fix: updated snapshot test 2018-01-10 13:16:16 +01:00
Torkel Ödegaard
7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +01:00
nicolasguyomar
66d7884b48 Add eu-west-3 in cloudwatch datasource default's region (#10477) 
* Add eu-west-3 as a possible default datasource

* Add eu-west-3 as a possible default datasource
 2018-01-10 12:07:04 +01:00
Johannes Schill
79bad41843 fix: Remove conflict file #10289 2018-01-10 12:00:28 +01:00
Alexander Zobnin
1fdc24c412 text panel: fix $apply already in progress error (#10486) 2018-01-10 11:56:01 +01:00
Torkel Ödegaard
5d5de23025 refactoring: alert list improvments PR #10452 2018-01-10 11:54:47 +01:00
Johannes Schill
e4a2bda4f2 10389 react tooltip components (#10473) 
* poc: Use react-popper for tooltips #10389

* poc: Add popover component and use a hoc() for Tooltip + Popover to avoid code duplication #10389

* jest: Add snapshot tests to Popover and Tooltip #10389

* poc: Move target from hoc into Popover/Tooltip-component #10389

* poc: Clean up unused styles and use the existing Grafana style/colors on popper tooltip #10389

* poc: Remove test code before PR

* poc: Remove imports used in poc but shouldn't be included anymore #10389
 2018-01-10 10:27:33 +01:00
Johannes Schill
ffda5eef95 test: Updated snapshot for UserPicker jest test #10289 2018-01-09 15:48:02 +01:00
Johannes Schill
aac1b250af ux: When adding a new panel we should scroll to top until we figure o… (#10417) 
* ux: When adding a new panel we should scroll to top until we figure out a better solution #10299

* ux: Use jquery to add smooth scrolling when scrolling up to add a panel, and make sure to pass the scope to the event emitter, #10299

* ux: Add a close button to the "New panel"-box and make sure you scroll to top every time you click "Add panel" #10299
 2018-01-09 15:27:53 +01:00
Patrick O'Carroll
d48be3ca15 naming fixes and added test file 2018-01-09 15:16:55 +01:00
Daniel Lee
e1aff1d5ff dashfolders: show/hide create folder or dashboard buttons 
depending on the user role and the permissions the user has for a
folder.
 2018-01-09 14:44:36 +01:00
Daniel Lee
a8e9a4995c dashfolders: fix mergeconflict error 2018-01-09 14:44:36 +01:00
Daniel Lee
6f98117641 dashfolders: prettify 2018-01-09 14:44:36 +01:00
Daniel Lee
3ae1bf0c16 dashfolders: permissions for saving annotations 
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
 2018-01-09 14:44:36 +01:00
Daniel Lee
eef37c4071 dashfolders: disable save button after save of acl 2018-01-09 14:44:36 +01:00
Daniel Lee
e77878bba8 dashfolders: on folder page, hide tabs if not has admin permission 2018-01-09 14:44:36 +01:00
Daniel Lee
f7bbfeba28 dashfolders: must have admin permission to save/see dash acl 2018-01-09 14:44:36 +01:00
Daniel Lee
5b6ee6f37b dashfolders: prettify on tests file 2018-01-09 14:44:36 +01:00
Daniel Lee
1e496ec76c dashfolders: permissions tab in dashboard settings 2018-01-09 14:44:36 +01:00
Daniel Lee
5400692cd4 dashfolders: permissions tab for dashboard folders 2018-01-09 14:44:36 +01:00
Daniel Lee
3ea63a1064 fix for unsaved changes popup on tab close/refresh 
Incorrect return values in onbeforeunload event handler mean that the
unsaved changes popup is shown despite there being no changes.
 2018-01-09 14:42:58 +01:00
Johannes Schill
c62a6aa7df fix: Clean up logging and remove unused css #10289 2018-01-09 14:42:23 +01:00
Johannes Schill
c297a1c5a5 fix: Rename directive user-pickerr (yes two r's) to select-user-picker 2018-01-09 14:42:23 +01:00
Johannes Schill
1a993378bd fix: Accidently added the conflict files (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
76ba7d1f8c test: Add snapshot tests for UserPicker and UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
68d43b865f fix: Add interface for props to UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
5931d6c87d ux: POC on new select box for the user picker (#10289) 2018-01-09 14:39:10 +01:00
Alexander Zobnin
04b9752932 dashboard: fix opening links in new tab (#10465) 2018-01-09 13:59:11 +01:00
Alexander Zobnin
51cd3a0d0c alert list: fix rendering timeout when share panel (#10467) 2018-01-09 13:58:24 +01:00
Marcus Efraimsson
3ecec8e0d2 More fixes for relative urls when running Grafana under a different sub path (#10470) 
* Add nginx proxy docker container

Ease test/verification of running Grafana thru a reverse proxy

* Add apache proxy docker container

Ease test/verification of running Grafana thru a reverse proxy

* Fix relative urls for reset password page

* Fix relative urls for signup page

* Fix relative urls for login page

* Fix relative urls edit plugin page
 2018-01-09 13:56:41 +01:00
Patrick O'Carroll
48548f0641 put this.props.search in the Highlighter 2018-01-09 13:18:16 +01:00
Patrick O'Carroll
bebcc24f3d moved state handling for search to store 2018-01-09 13:05:50 +01:00
Marcus Efraimsson
4af1aca97c
Merge pull request #10463 from AnonyV/master 
Fixed the subUrl bugs for folder/settings/teams etc. with root_url modified
 2018-01-09 12:42:22 +01:00
Torkel Ödegaard
62165f91bf fix: added back colors to rootScope, fixes #10462 2018-01-09 11:13:37 +01:00
AnonyV
6c9554499b fixed the subUrl bugs from https://community.grafana.com/t/suburl-not-work-at-some-links-and-buttons/4701 with folder/settings/teams etc. 2018-01-09 18:03:43 +08:00