IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,959 Commits 5,454 Branches 554 Tags 1.9 GiB
db83255460
Commit Graph

2486 Commits

Author SHA1 Message Date
Torkel Ödegaard
3964d6b797 fix: added new known data source plugins, and minor migration fix for v1 dashboards 2018-02-20 16:08:43 +01:00
Torkel Ödegaard
dceac3aa71 fix: fixes to signup flow, fixes #9816 2018-02-20 13:39:16 +01:00
Torkel Ödegaard
21d48df095 fix: plugin dashboard did not get plugin id after import 2018-02-20 11:30:18 +01:00
Torkel Ödegaard
7d0c3ae6a7 fix: alert history list now shows on graphs with manually added annotation events, fixes #10968 2018-02-20 09:33:28 +01:00
Marcus Efraimsson
fce1e3f7f1 Merge branch 'master' into 10630_folder_api 2018-02-19 13:32:45 +01:00
Mitsuhiro Tanda
f47542db28 migrate panels in collapsed rows (#10948) 2018-02-19 09:07:29 +01:00
Torkel Ödegaard
2e9433c495 fix: fixed redirect after save, fixes #10946 2018-02-16 16:29:14 +01:00
Mitsuhiro Tanda
3b04efa4c0 migrate minSpan (#10924) 2018-02-16 09:29:10 +01:00
Alexander Zobnin
2c5f3fbc5b repeat row: fix panels placement bug (#10932) 2018-02-16 09:11:26 +01:00
Leonard Gram
3ddfd8bd09 alert notifiers: better error messages. 2018-02-15 16:48:01 +01:00
Marcus Efraimsson
cb8c82f7f6 Merge branch 'master' into 10630_folder_api 2018-02-12 15:14:41 +01:00
Torkel Ödegaard
e949eb3f58 Merge branch 'master' into dashboard-search-permissions-filter 2018-02-09 15:16:34 +01:00
Torkel Ödegaard
8e8f3c4332 dashboard and folder search with permissions 2018-02-08 17:11:01 +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
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
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
0e61a670bb fix: error handling now displays page correctly, fixes #10777 2018-02-06 12:28:17 +01:00
Alexander Zobnin
45d66e4b29 embedded panel: hide side menu during init (#10788) 2018-02-06 10:01:10 +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
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
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
4b64c1d0d4 fix frontend validation for creating new folder and import dashboard (#10737) 
Fixes #10731
 2018-02-03 10:03:01 +01: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
3db328f516 fix for dashboard/folder url's when having a sub path in root_url config 2018-02-01 16:30:48 +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
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
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
Daniel Lee
a7e57bc2f8 spelling 2018-01-31 15:07:17 +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
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
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
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
Alexander Zobnin
479658489a fix: remove repeated rows when repeat was disabled. (#10653) 2018-01-29 15:17:27 +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
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
Alexander Zobnin
cffbb6afd5 fix vertical panel repeat (#10619) 2018-01-26 09:24:56 +01:00
Johannes Schill
1255a0a356 refactor: Replace _.find with Array.prototype.find() 2018-01-25 15:37:27 +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
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
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
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
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
Dan Cech
80a6e0d8d1
support specifying tag_values("<tag>") as graphite template query 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
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
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
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
7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +01:00
Torkel Ödegaard
5d5de23025 refactoring: alert list improvments PR #10452 2018-01-10 11:54:47 +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
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
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
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
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
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