IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,393 Commits 1,121 Branches 715 Tags
ecf438f8d01a521c63129164783fd3c77abafd73
Commit Graph
13393 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee ecf438f8d0 dashboard: add permission check for diff api route 
ref #10770
 2018-02-27 17:53:30 +01:00
Daniel Lee 6f4c043dd6 docs: update to install pages for beta5 2018-02-26 11:05:37 +01:00
Daniel Lee ef67d20971 changelog: update for v5.0.0-beta5 2018-02-26 11:05:37 +01:00
Marcus Efraimsson a7639855e4 Merge pull request #11014 from mtulio/doc-fix-config 
[doc] Fix extra alerting options in installation->configuration
 2018-02-26 09:54:10 +01:00
Daniel Lee c21d9deccb build: update to version 5.0.0-beta5 v5.0.0-beta5 2018-02-26 09:44:03 +01:00
Marco Tulio R Braga 1a170133ca [doc] Fix extra alerting options in installation->configuration 2018-02-26 03:04:39 -03:00
Daniel Lee 3218927ead yarn: update lock file with tarball change 2018-02-25 01:14:53 +01:00
Daniel Lee 3682225617 build: use tarball instead of git commit for tether drop 
It is the only js package that is installed directly from
GitHub - this changes it to download the tarball instead of doing a
git clone.

Background: Git clones against GitHub does currently does not work
with the container build which uses CentOS 6.6. It does not have support for
TLS 1.2 and cannot git clone against GitHub since they removed support for
TLS 1.0 and 1.1.
 2018-02-25 00:51:07 +01:00
Marcus Efraimsson e350653430 docs: fix type in datasource http api 2018-02-23 14:52:45 +01:00
Carl Bergquist 2d5d5e639f Merge pull request #10998 from grafana/10995_shortcut 
Fix keyboard shortcuts
 2018-02-23 09:21:39 +01:00
Daniel Lee 3b836c9c5f Merge pull request #10996 from grafana/snapshot_permissions 
Snapshot fixes and changes to snapshot list
 2018-02-23 09:17:59 +01:00
Marcus Efraimsson cacfdc6421 dashboards: remove non-supported keyboard shortcuts for delete/collapse row 2018-02-22 18:08:51 +01:00
Marcus Efraimsson 34f1611d18 dashboards: fix keyboard shortcut for expand/collapse rows 2018-02-22 18:03:29 +01:00
Marcus Efraimsson 609f3c1c9d dashboards: fix keyboard shortcut for remove panel 2018-02-22 18:02:29 +01:00
Daniel Lee fe49182b9d snapshots: fixes cleanup of old snapshots 
Snapshot cleanup did not work due to time.Now syntax error. Added test
for it as well to catch any future errors.

Added error and debug logging so that it is possible to see any errors in the future.

Removed an unused configuration value and deprecated the remove expired snapshots
setting.
 2018-02-22 16:12:16 +01:00
Marcus Efraimsson a34acdda1a Merge pull request #10739 from grafana/10630_folder_api 
New folder and permissions API
 2018-02-22 15:51:54 +01:00
Torkel Ödegaard 2451282563 Update ROADMAP.md 2018-02-22 15:24:38 +01:00
Torkel Ödegaard 5b8a49ee44 Update ROADMAP.md 2018-02-22 15:14:37 +01:00
Marcus Efraimsson 3f588b4c48 dashboards: created/updated and createdby/updatedby should be set before save 
If creating a new folder/dashboard created/updated and createdby/updatedby should always be set.
If updating an existing folder/dashboard updated and updatedby should always be set.
 2018-02-22 11:54:28 +01:00
Marcus Efraimsson bb7a6718f1 Fix save as dashboard from folder to General folder (#10988) 
* dashboards: fix save as dashboard from folder to general folder

* dashboards: disable save button in save dashboard as dialog when creating a new folder
 2018-02-22 10:52:21 +01:00
Marcus Efraimsson 20ebb614f6 dashboards: cleanup 
Move api calls to backend_srv
 2018-02-21 16:56:34 +01:00
Marcus Efraimsson b7cf6f9781 folders: use folder api for retrieving folder 2018-02-21 16:55:35 +01:00
Marcus Efraimsson 9d288c3a86 Merge branch 'master' into 10630_folder_api 2018-02-21 16:38:36 +01:00
Marcus Efraimsson 3f3175972e dashboards: fix batch dashboard/folder delete response 
Use message returned from backend and use that as alert success response to user
 2018-02-21 16:38:09 +01:00
Torkel Ödegaard aa3872a0e2 fix: elasticsearch terms size now allows custom values again, fixes #10124 2018-02-21 15:41:55 +01:00
Marcus Efraimsson 0135178645 folders: fix create folder in folder picker 2018-02-21 15:05:33 +01:00
Leonard Gram 13209f5671 Merge pull request #10639 from overcookedpanda/hash-rate-units 
added hash rate units for monitoring mining processes
 2018-02-21 13:39:09 +01:00
Daniel Lee 7d9a9fa29c snapshots: change to snapshot list query 
Admins can see all snapshots. Other roles can only see their own
snapshots.

Added permission check for deleting snapshots - admins can delete
any snapshot, other roles can delete their own snapshots or
snapshots that they have access to via dashboard permissions.
 2018-02-21 13:39:08 +01:00
Marcus Efraimsson 71c9741764 permissions: use updated api endpoint for dashboard permissions 2018-02-21 11:53:02 +01:00
Marcus Efraimsson 9889c92083 fix typos in api, acl to permissions 2018-02-21 11:50:32 +01:00
Marcus Efraimsson 3df8ae2306 folders: rename folder_acl in api to folder_permission 2018-02-21 11:45:19 +01:00
Marcus Efraimsson d68099bc4a dashboards: change api route for dashboard permissions 
From /api/dashboards/id/:id/acl to /api/dashboards/id/:id/permissions
 2018-02-21 11:42:54 +01:00
Marcus Efraimsson 8a8f3bd5bb folders: fix typo 2018-02-21 11:28:11 +01:00
Marcus Efraimsson 3c6bc263dc Merge branch 'master' into 10630_folder_api 2018-02-21 11:25:56 +01:00
Marcus Efraimsson 78283b9c77 folders: extend folder service tests 2018-02-21 11:25:21 +01:00
Leonard Gram f00a7e4dd7 dev: docker-compose setup for prom2. 
Copy of prometheus1 docker-compose config.
 2018-02-21 11:25:14 +01:00
Marcus Efraimsson a167e19b37 folders: folder api tests 2018-02-21 11:24:54 +01:00
Torkel Ödegaard 98a4731454 fix: scrollbar position now to max right pos, fixes #10982 2018-02-21 11:01:48 +01:00
Alexander Zobnin ceb8223ddf Fixes for heatmap panel in Grafana 5 (#10973) 
* heatmap: fix chart height

* heatmap: fix font size

* heatmap: fix legend size

* heatmap: fix rendering tests
 2018-02-21 09:16:56 +01:00
Marcus Efraimsson 417541c77f folders: folder permissions api tests 2018-02-20 18:11:50 +01:00
Marcus Efraimsson 02278f90a7 dashboards: make fake dashboard guardian available to other packages 2018-02-20 18:08:19 +01:00
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
Marcus Efraimsson 892bdecb19 folders: folder permission api routes 2018-02-20 15:25:16 +01:00
Marcus Efraimsson 717d8d0c45 folders: fix api error mapping 2018-02-20 15:01:20 +01:00
Marcus Efraimsson b56e2a61f9 folders: basic integration tests for folders 2018-02-20 14:00:32 +01:00
Marcus Efraimsson ea7998ca8e folders: use new folder service in folder api routes 2018-02-20 13:57:32 +01:00
Marcus Efraimsson 268fb4dc6c folders: new folder service for managing folders 2018-02-20 13:56:22 +01:00
Marcus Efraimsson 39aba03483 dashboards: created date should be set when creating a folder/dashboard 2018-02-20 13:54:31 +01:00
Torkel Ödegaard dceac3aa71 fix: fixes to signup flow, fixes #9816 2018-02-20 13:39:16 +01:00
Torkel Ödegaard 69ccbffaed fix: fixed github oauth login with allowed orgs filter, fixes #10964, reverts #10851 2018-02-20 11:30:18 +01:00