IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 16:15:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,415 Commits 5,442 Branches 554 Tags 1.9 GiB
af6e28366b
Commit Graph

13415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
af6e28366b build: updated version 2018-02-28 18:42:58 +01:00
Marcus Efraimsson
3d4e99d8be
Merge pull request #11040 from grafana/permission-checks 
Add permission check for dashboard diff api route
 2018-02-28 18:23:39 +01:00
Laurent Godet
59704ee939 Fix Github OAuth not working with private Organizations (#11028) 
* Fix Github OAuth not working with private organizations

* Update documentation
 2018-02-28 13:08:15 +01:00
Torkel Ödegaard
e67b1ebf33 Merge branch 'master' of github.com:grafana/grafana 2018-02-28 13:06:16 +01:00
Marcus Efraimsson
576deb37e8 login: hide sign up if configured so. Fixes #11041 2018-02-28 13:01:35 +01:00
Torkel Ödegaard
0c6b34e216 Merge branch 'tag-variables' of https://github.com/DanCech/grafana into DanCech-tag-variables 2018-02-28 12:39:53 +01:00
Marcus Efraimsson
c298c7f3c9
Merge pull request #11034 from grafana/10701_permissions 
Only allow override permissions that is higher
 2018-02-28 09:15:46 +01:00
Marcus Efraimsson
f44e476580 permissions: fix validation of permissions before update 
Did a bad pointer comparison so extended the tests for duplicate permissions.
 2018-02-28 08:48:28 +01:00
Daniel Lee
ecf438f8d0 dashboard: add permission check for diff api route 
ref #10770
 2018-02-27 17:53:30 +01:00
Marcus Efraimsson
f4d9536ce1
Merge pull request #11031 from jganseman/patch-1 
grammar fix, add dir, and remove redundant info
 2018-02-27 16:36:44 +01:00
Marcus Efraimsson
71a0a298bf permissions: remove client validation and handle server validation 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
f76b98d252 dashboards: change dashboard/folder permission error messages 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
03f8eff880 dashboards: handle new guardian error responses and update tests 
Using a mocked guardian instead and relies on the actual guardian tests for verifying
permission handling correctness
 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
3c14cecd50 folders: handle new guardian error responses and add tests 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
955dfcc8fe dashboards: don't allow override of permissions with a lower precedence 
If a dashboard inherits permissions from a folder, don't allow same permission to be added
to the dashboard with a lower permission.
Add backend validation so that you cannot add same permission to folder/dashboard, for example
same user/team with different permissions
 2018-02-27 16:04:45 +01:00
Marcel Anacker
69006a7764 Alerting: Fix OK state doesn't show up in Microsoft Teams (#11032) 
* Alerting: Fix OK state doesn't show up in Microsoft Teams

* Fix formatting
 2018-02-27 15:48:36 +01:00
jganseman
7d91b73774
grammar fix, add dir, and remove redundant info 2018-02-27 13:26:53 +01:00
Torkel Ödegaard
dff2c14aed fix: changed react-grid-layout to use grafana fork to a commit before 15503084fb, this fixes all the panel movement bugs, fixes #10831 2018-02-27 11:34:29 +01:00
Patrick O'Carroll
7fb34f7918 gave scroll-canvas-dashboard 100% height in kiosk-mode, fixes #11010 (#11017) 2018-02-26 11:52:48 +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 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
Dan Cech
abf498fc7f
improve maintainability 2018-02-23 09:51:19 -05: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
Dan Cech
dc6f977304
support [[variable:type]] syntax 2018-02-22 18:45:11 -05:00
Brian Gann
fa193fa888
offer template variables for tags 2018-02-22 18:45:11 -05:00
Brian Gann
b316dfea98
feature for issue #9911 2018-02-22 18:45:11 -05: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