Julien Pivotto
69c93e6401
Fix Prometheus 2.0 stats ( #11048 )
...
Fixes #11016
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-03-03 13:40:28 +01:00
Torkel Ödegaard
328fc45bcc
docs: removed beta notice in whats new article
2018-03-03 12:49:40 +01:00
Sven Klemm
4e826ff8f7
remove spaces around arguments of macros
2018-03-02 19:24:15 +01:00
Sven Klemm
f1ba9137c0
remove spaces around arguments before calling macro expansion
2018-03-02 19:20:30 +01:00
Sven Klemm
0f931f9e5e
Merge remote-tracking branch 'upstream/master' into macroengine-interpolate
2018-03-01 18:01:54 +01:00
Daniel Lee
655d2fb405
docs: update current version to 5.0
2018-03-01 10:11:52 +01:00
Daniel Lee
cc2f478792
Merge branch 'docs_v5.0'
2018-03-01 09:36:48 +01:00
Daniel Lee
f46f43dc32
docs: update install pages for v5.0.0
2018-03-01 09:20:52 +01:00
Alexander Zobnin
fa8403750b
Merge remote-tracking branch 'upstream/master' into prometheus-heatmap
2018-03-01 11:09:04 +03:00
Daniel Lee
59a13f1847
update version to 5.0.1-pre1
2018-03-01 08:30:44 +01:00
Daniel Lee
2e2f47177d
changelog update for 5.0.0 stable
2018-03-01 08:14:27 +01:00
Ryan Gifford
49266d5150
Add metrics that triggered alert to description
2018-02-28 15:26:11 -07:00
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
Alexander Zobnin
d6087eb5f4
heatmap: hide unused Y axis controls for tsbuckets mode
2018-02-28 16:30:00 +03:00
Alexander Zobnin
76c684cc01
heatmap: format numeric tick labels in tsbuckets mode
2018-02-28 16:19:58 +03:00
Alexander Zobnin
dfe8b0a0d2
heatmap: add rendering tests for tsbuckets mode
2018-02-28 15:58:28 +03: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
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
