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
Alexander Zobnin
5c73ed6ecd
heatmap: use series names as top or bottom bounds, depends of datasource
2018-02-27 15:14:40 +03:00
Alexander Zobnin
f21cebeefd
heatmap: refactor
2018-02-27 14:17:57 +03:00
Alexander Zobnin
7c78e8e383
heatmap: add few tests for histogram converter
2018-02-27 14:17:29 +03: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
Alexander Zobnin
26ddb9977f
heatmap: fix Y bucket size calculation for 'tsbuckets' mode
2018-02-26 16:26:54 +03: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
bergquist
01fb3ea034
docs: adds accesskey and secret to securejsonfields
...
closes #11005
2018-02-23 09:32:22 +01:00
Carl Bergquist
75ae34cf84
Merge pull request #10999 from grafana/10995_docs
...
docs: update shortcut docs
2018-02-23 09:29:05 +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
victorclaessen
91e8468fb4
Added radiation units
...
Add common units in radiation and health physics monitoring, Bq, Ci, Gy, rad, Sv, rem. C/kg, R, Sv/h.
2018-02-22 19:21:08 +01:00
Marcus Efraimsson
0ac6d7cf4c
docs: update shortcut docs
2018-02-22 18:24:10 +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
c367cb294e
docs: minor folder http api changes
2018-02-22 16:07:55 +01:00
Marcus Efraimsson
6751bbc17f
Merge branch 'master' into docs_v5.0
2018-02-22 15:55:44 +01:00
Marcus Efraimsson
3aca9090e5
Merge pull request #10984 from grafana/10630_docs
...
Update http api docs for folder, dashboard and permissions
2018-02-22 15:53:57 +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
Alexander Zobnin
2a2675c1af
heatmap: fix bucket labels shift
2018-02-22 16:54:28 +03:00
