IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,633 Commits 5,454 Branches 554 Tags 1.9 GiB
7c3e8afd82
Commit Graph

1172 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Torkel Ödegaard
27835f373e cleanup: removed unused typescript typings import 2018-01-04 10:12:02 +01:00
Torkel Ödegaard
c42a232644 Merge branch 'react-mobx' 2018-01-04 09:12:57 +01:00
Marcus Efraimsson
11ae7d5964 dashfolders: relative links should work when root_path is specified (#10363) 
Fixes #10336
 2017-12-31 12:24:21 +01:00
Torkel Ödegaard
8aff969f70 Merge branch 'master' into react-mobx 2017-12-27 11:00:37 +01:00
Torkel Ödegaard
c8f87a3d09 refactor: minor refactoring of PR #10236 2017-12-27 09:49:12 +01:00
Alexander Zobnin
77843623b2 don't save dashboard on make editable, #10236 2017-12-27 09:49:12 +01:00
Alexander Zobnin
d4ff603eb0 fix scripted dashboard loader, #10350 (#10351) 2017-12-27 09:36:25 +01:00
Torkel Ödegaard
3e7420320c Merge branch 'master' into react-mobx 2017-12-26 13:53:39 +01:00
Marcus Efraimsson
39eb8f9eba Dashboard: View JSON improvements (#10327) 
* dashboard: enable copy to clipboard for view json and panel json

* dashboard: use code editor for view json under settings
 2017-12-26 13:52:19 +01:00
Torkel Ödegaard
c11cf18879 refactor: tried to simplify and also minimize scope a bit for #10323 2017-12-26 13:22:01 +01:00
Torkel Ödegaard
b4ab91d651 Merge remote-tracking branch 'origin/10248_copy_panels' 2017-12-26 12:31:46 +01:00
Torkel Ödegaard
8fb0692da6 Merge remote-tracking branch 'origin/migrate-dashboard-files-to-ts' 2017-12-26 12:26:50 +01:00
Marcus Efraimsson
68457f5636 dashboard: copy panel to clipboard 
Adds a new menu item to panels, Copy to Clipboard, that will both
copy the panel json to the clipboard and temporarily store the panel object
in the browsers window object. The temporarily stored panel object are
available in Add Panel from any dashboard for as long you don't refresh
the browser.
Fixes #10248, #1004
 2017-12-22 10:24:55 +01:00
Patrick O'Carroll
972c3bc635 code formatting fix 2017-12-21 13:44:34 +01:00
Patrick O'Carroll
9b63a81756 migrated files to ts + fixed specfile 2017-12-21 13:22:20 +01:00
Torkel Ödegaard
4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Torkel Ödegaard
3a1f52d8a2 prettier: ran on all files again, sorry. now settings are defined in package.json 2017-12-21 08:39:31 +01:00
Marcus Efraimsson
d41ce4f9ca Various dashboard folders improvements (#10309) 
* dashfolders: fix url for create dashboard from manage dashboards

Don't include folderId querystring if you don't manage a folder and
creating a new dashboard from there.

* dashfolders: don't store folderId in dashboard model

Use folderId from meta instead
#10307

* dashfolders: minor ux fix

* dashfolders: minor fix for edit folder title
 2017-12-20 21:17:55 +01:00
Torkel Ödegaard
85879a7014 prettier: change to single quoting 2017-12-20 12:33:33 +01:00
Marcus Efraimsson
bbdb1cddd7 dashboard: delete row improvements 
Possibility to delete row and all its panels or
only the row which will leave its panels in the dashboard.
 2017-12-20 11:13:24 +01:00
Marcus Efraimsson
1ddcaf5b6f minor fixes and formatting after review 2017-12-19 18:01:09 +01:00
Marcus Efraimsson
0bfedfe4d6 dashfolders: use validation service for folder creation and dashboard import. #10197 2017-12-19 18:00:59 +01:00
Marcus Efraimsson
4846125ec0 dashfolders: support creating new folder when moving dashboards. #10197 2017-12-19 18:00:47 +01:00
Marcus Efraimsson
2d0f5f06e4 dashfolders: support creating new folder when saving a dashboard. #10197 2017-12-19 18:00:38 +01:00
Marcus Efraimsson
7f9c0df464 dashfolders: support creating new folder in dashboard settings. #10197 2017-12-19 18:00:26 +01:00
Marcus Efraimsson
60d7e4308c dashfolders: support creating new folder from the folder picker. #10197 2017-12-19 18:00:06 +01:00
Torkel Ödegaard
fadfc665e4 tech: ran pretttier on all typescript files 2017-12-19 16:06:54 +01:00
Daniel Lee
6ad06364c7
search: closes dash search when selecting current dashboard (#10285) 
Fixes #10231.
 2017-12-19 15:28:58 +01:00
Johannes Schill
0bc6f4e2bd fix: Original dashboard link from snapshot should be an a-tag, not a button (#10269) (#10283) 2017-12-19 14:58:12 +01:00
Daniel Lee
77cc546315 dashfolder: nginject fix 2017-12-15 16:36:31 +01:00
Torkel Ödegaard
71658d1e76 grid: disable resize and drag on non editable dashboards, closes #10235 2017-12-15 16:23:26 +01:00
Torkel Ödegaard
4112abd699 logging: removed logging from panel loader 2017-12-15 15:43:32 +01:00
Torkel Ödegaard
d1e0e36996 fix: dont show settings for viewers 2017-12-15 14:51:20 +01:00
Torkel Ödegaard
a8a5f8181b fix: viewers can edit now works correctly 2017-12-15 14:19:49 +01:00
Torkel Ödegaard
3300af909a Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 09:50:18 +01:00
Torkel Ödegaard
ba3dbac50d fix: view json from share modal now works, #10217 2017-12-15 09:49:57 +01:00
Torkel Ödegaard
581257416e Merge remote-tracking branch 'origin/develop-icons' into develop 2017-12-14 19:56:19 +01:00
Marcus Efraimsson
b1bb012343 dashfolders: fix folder selection dropdown in dashboard settings 
Use folder id from meta instead of dashboard object
 2017-12-14 15:58:24 +01:00
Marcus Efraimsson
854d22fa8e dashfolders: bulk move/delete improvements 
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
 2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4f56d4ac07 snapshots: fixed snapshot issues, fixes #10214 2017-12-14 14:58:45 +01:00
Torkel Ödegaard
4e38526404 playlist: fixed playlist buttons in dashboard header, fixes #10213 2017-12-14 14:27:47 +01:00
Torkel Ödegaard
776c39fd79 templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title 2017-12-14 12:31:57 +01:00
Torkel Ödegaard
9007e26106 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-14 12:10:59 +01:00
Torkel Ödegaard
ff89531849 fix: ignore row clones in schema migration 2017-12-14 12:10:32 +01:00
Marcus Efraimsson
196a05d487 dashfolders: bulk move/delete improvements 
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
 2017-12-14 11:26:16 +01:00
Daniel Lee
fcca36a256 fix: after removed file 2017-12-14 09:46:55 +01:00
Daniel Lee
34cffc6b92 dashfolder: fix after backendSrv change 
also removes unused create folder modal
 2017-12-14 09:35:14 +01:00
Trent White
2c4de364f8 annotation icon fix 2017-12-13 18:18:51 -05:00
Trent White
1cbd88fc14 dashboard settings icons 2017-12-13 18:17:56 -05:00
Marcus Efraimsson
a583f92d16 dashfolders: bulk move dashboards synchronously 
#10181
Also added better error handling when moving dashboards to other folders
 2017-12-13 18:21:49 +01:00
Torkel Ödegaard
2765c2ecc7 Merge branch 'develop-settings-links' into develop 2017-12-13 18:08:12 +01:00
Torkel Ödegaard
7f0440fded minor tweaks 2017-12-13 18:00:16 +01:00
Alexander Zobnin
a48ba7b19e Dashboard grid fixes (#10194) 
* grid: fix layout saving after panel move, #10185

* don't allow to drag fullscreen panels, #10171
 2017-12-13 17:53:57 +01:00
Torkel Ödegaard
d417a625d5 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 15:55:16 +01:00
Torkel Ödegaard
313735bd75 search: worked on search results 2017-12-13 15:51:59 +01:00
Patrick O'Carroll
daf32c579d changed width to input fields (#10184) 2017-12-13 12:42:50 +01:00
Torkel Ödegaard
60e2ba111f plugins: fixed plugin edit page and plugin page 2017-12-13 11:12:35 +01:00
Daniel Lee
c98e15903e dashfolder: settings page for folder 
with rename and delete. Fixes #10120
 2017-12-13 10:54:08 +01:00
Torkel Ödegaard
05cc1f85c3 Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team 2017-12-12 17:07:00 +01:00
Torkel Ödegaard
cfd755eb93 updated new dashboard folder 2017-12-12 15:19:59 +01:00
Torkel Ödegaard
d379b501aa ux: search look update 2017-12-12 13:55:32 +01:00
Torkel Ödegaard
e98f573732 build: fixed broken test 2017-12-12 12:31:41 +01:00
Torkel Ödegaard
bbd0b98be9 Merge branch 'develop-settings' into develop 2017-12-12 12:03:10 +01:00
Torkel Ödegaard
7b0bbefb96 ux: minor updates to dashboard settings 2017-12-12 12:02:44 +01:00
Torkel Ödegaard
0a8bd5d289 ux: dashboard settings updated 2017-12-12 11:49:01 +01:00
Patrick O'Carroll
6ae94dda87 redesign dashlinks 2017-12-12 11:21:32 +01:00
Torkel Ödegaard
79d9b64f82 fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161 2017-12-12 11:00:16 +01:00
Torkel Ödegaard
cc046f03aa ux: dashboard settings progress 2017-12-11 17:19:17 +01:00
Torkel Ödegaard
97bd00c520 ux: dashboard settings work progress 2017-12-11 16:46:10 +01:00
Torkel Ödegaard
008b9bb3e9 ux: dashboard settings work progress 2017-12-11 16:28:57 +01:00
Torkel Ödegaard
c4b759fe6d ux: dashboard settings progress 2017-12-11 15:04:48 +01:00
Torkel Ödegaard
7f597283e8 ux: dashboard settings progress 2017-12-11 13:47:04 +01:00
Torkel Ödegaard
61dbcfd35b ux: dashboard settings progress 2017-12-11 13:29:23 +01:00
Torkel Ödegaard
05ec7541c8 ux: dashboard settings progress 2017-12-11 13:04:06 +01:00
Torkel Ödegaard
8354c64ff5 Merge branch 'develop' into develop-settings 2017-12-11 12:15:59 +01:00
Torkel Ödegaard
09cc60ffe4 ux: dashboard settings progress 2017-12-11 12:13:45 +01:00
Torkel Ödegaard
2ce4a8e4c5 fix: fixed build failure 2017-12-11 10:52:38 +01:00
Torkel Ödegaard
511fa7dec1 ux: dashboard settings progress 2017-12-10 12:41:11 +01:00
Torkel Ödegaard
00c723f04a ux: minor changes 2017-12-10 12:21:04 +01:00
Torkel Ödegaard
e1440dcc44 ux: navbar progress 2017-12-09 22:45:33 +01:00
Torkel Ödegaard
1e5983b46c Merge branch 'develop' into develop-settings 2017-12-09 21:50:26 +01:00
Torkel Ödegaard
55609382f1 fix: fixed panel size rerendering issues 2017-12-09 13:53:03 +01:00
Torkel Ödegaard
fbe9f759ad ux: work on dashboard settings views 2017-12-08 18:15:24 +01:00
Marcus Efraimsson
47014ddb65 dashfolders: Do not allow loading a folder as a dashboard 2017-12-08 17:50:37 +01:00
Marcus Efraimsson
1985027549 dashfolders: Folder picker should set correct default values. Fixes #10135 2017-12-08 17:46:52 +01:00
Alexander Zobnin
e4675ca5c1 refactor: user groups to teams, replace rest mentions 2017-12-08 19:01:10 +03:00
Alexander Zobnin
d8612380e9 refactor: rename User Groups to Teams 2017-12-08 18:25:45 +03:00
Torkel Ödegaard
7a2e886e70 Merge branch 'develop' into develop-settings 2017-12-08 16:02:42 +01:00
Torkel Ödegaard
1b6be031e5 ux: dashboard settings progress 2017-12-08 15:53:26 +01:00
Torkel Ödegaard
db663c380b new timepicker is working 2017-12-08 14:38:33 +01:00
Torkel Ödegaard
9369a87e93 Merge branch 'develop' into develop-settings 2017-12-08 14:32:15 +01:00
Marcus Efraimsson
b03b360414 dashfolders: Create nav model for folder page client side #10083 2017-12-08 14:08:16 +01:00
Torkel Ödegaard
63b717f607 ux: minor change to new folder page 2017-12-08 13:54:11 +01:00
Torkel Ödegaard
77b537f45f ux: added react scrollbar component and added it to add panel panel 2017-12-08 13:30:16 +01:00
Torkel Ödegaard
2bc23d2063 tech: updated ngreact and with custom PR applied 2017-12-08 12:26:19 +01:00
Torkel Ödegaard
e03abde778 refactoring: #10130 2017-12-08 12:17:09 +01:00
Torkel Ödegaard
974d4d9739 Revert "Don't animate panels on initial render (#10130)" 
This reverts commit e0c173c5af.
 2017-12-08 11:53:51 +01:00
Alexander Zobnin
e0c173c5af Don't animate panels on initial render (#10130) 
* grid: dont animate panels on initial render

* grid: dont animate panels on initial render
 2017-12-08 11:49:14 +01:00
Alexander Zobnin
3de17ecda7 dashboard grid: enable CSS transforms (#10125) 2017-12-08 08:21:00 +01:00
Marcus Efraimsson
017b337f00 dashfolders: create folder page 
Fixes #10085
 2017-12-07 19:32:38 +01:00
Marcus Efraimsson
2ea663df78 dashfolders: New Dashboard Folder page 
Fixes #10083. Permissions page is just a placeholder
for now.
 2017-12-07 17:30:54 +01:00
Torkel Ödegaard
68dab71275 refactor: sidemenu toggle & hiding logic 2017-12-07 16:25:21 +01:00
Torkel Ödegaard
beb9f8ee74 Merge remote-tracking branch 'origin/master' into develop 2017-12-07 14:14:50 +01:00
Marcus Efraimsson
f87b9aaa8a dashboard: keyboard nav in dashboard search - closes #10100 
Pressing enter/return for a folder toggles it.
Pressing enter/return for a dashboard navigates to it.
 2017-12-06 20:34:41 +01:00
Marcus Efraimsson
0029d96579 dashboard: Show CTA for empty lists/folders #10083 2017-12-06 14:27:29 +01:00
Marcus Efraimsson
dd3c9da009 dashboard: Dashboard folder page wip #10083 2017-12-06 14:11:25 +01:00
Marcus Efraimsson
8e8c3d2eeb Merge branch 'develop' into develop_searchresults 2017-12-05 14:25:20 +01:00
Daniel Lee
781349d360 dashboard: dashboard search results component. closes #10080 2017-12-05 14:20:44 +01:00
Torkel Ödegaard
90bcec8178 nav: updated nav item id for manage dashboards 2017-12-05 12:25:59 +01:00
Torkel Ödegaard
90da964a14 refactoring PR #10068 2017-12-05 12:19:01 +01:00
Torkel Ödegaard
cc2349f6aa Merge branch 'feat-10064' of https://github.com/alexanderzobnin/grafana into develop 2017-12-05 12:03:33 +01:00
Alexander Zobnin
afc036492c dashboard: migrations for repeat rows (#10070) 2017-12-05 11:46:58 +01:00
Alexander Zobnin
4d7ff4de15 move import menu item to the original place 2017-12-04 18:00:22 +03:00
Alexander Zobnin
4403d919c1 move DashboardImportCtrl tests to jest 2017-12-04 16:51:37 +03:00
Alexander Zobnin
44ea0ff71d Move import dashboard from modal to the page 2017-12-04 15:55:37 +03:00