0e54c474aa
Merge branch 'master' into docs-5.1
2018-03-06 09:28:13 +01:00
4d434d9845
docs: add v5.1 to versions
2018-03-06 09:27:40 +01:00
8a1bd2ee22
docs: fill for mysql/postgres
...
ref #10138
2018-03-06 09:24:36 +01:00
1a16e588f7
changelog: notes for #11055 and #9487
2018-03-05 19:44:09 +01:00
9c8733ac85
Merge pull request #11093 from svenklemm/postgres-connection
...
postgres: use net/url to generate postgres connection url
2018-03-05 19:27:02 +01:00
4904a051cf
use net/url to generate postgres connection url
2018-03-05 16:06:04 +01:00
7ce63169a0
Merge pull request #10138 from svenklemm/macroengine-interpolate
...
postgres+mysql: add optional fill parameter to $__timeGroup macro to fill in missing values in series
2018-03-04 21:38:30 +01:00
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
328fc45bcc
docs: removed beta notice in whats new article
2018-03-03 12:49:40 +01:00
4e826ff8f7
remove spaces around arguments of macros
2018-03-02 19:24:15 +01:00
f1ba9137c0
remove spaces around arguments before calling macro expansion
2018-03-02 19:20:30 +01:00
0f931f9e5e
Merge remote-tracking branch 'upstream/master' into macroengine-interpolate
2018-03-01 18:01:54 +01:00
655d2fb405
docs: update current version to 5.0
2018-03-01 10:11:52 +01:00
cc2f478792
Merge branch 'docs_v5.0'
2018-03-01 09:36:48 +01:00
f46f43dc32
docs: update install pages for v5.0.0
2018-03-01 09:20:52 +01:00
59a13f1847
update version to 5.0.1-pre1
2018-03-01 08:30:44 +01:00
2e2f47177d
changelog update for 5.0.0 stable
2018-03-01 08:14:27 +01:00
af6e28366b
build: updated version
2018-02-28 18:42:58 +01:00
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
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
e67b1ebf33
Merge branch 'master' of github.com:grafana/grafana
2018-02-28 13:06:16 +01:00
576deb37e8
login: hide sign up if configured so. Fixes #11041
2018-02-28 13:01:35 +01:00
0c6b34e216
Merge branch 'tag-variables' of https://github.com/DanCech/grafana into DanCech-tag-variables
2018-02-28 12:39:53 +01:00
c298c7f3c9
Merge pull request #11034 from grafana/10701_permissions
...
Only allow override permissions that is higher
2018-02-28 09:15:46 +01:00
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
ecf438f8d0
dashboard: add permission check for diff api route
...
ref #10770
2018-02-27 17:53:30 +01:00
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
71a0a298bf
permissions: remove client validation and handle server validation
2018-02-27 16:04:45 +01:00
f76b98d252
dashboards: change dashboard/folder permission error messages
2018-02-27 16:04:45 +01:00
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
3c14cecd50
folders: handle new guardian error responses and add tests
2018-02-27 16:04:45 +01:00
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
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
7d91b73774
grammar fix, add dir, and remove redundant info
2018-02-27 13:26:53 +01:00
dff2c14aed
fix: changed react-grid-layout to use grafana fork to a commit before https://github.com/STRML/react-grid-layout/commit/15503084fb7b0af826427c8c0706901e5745a39f , this fixes all the panel movement bugs, fixes #10831
2018-02-27 11:34:29 +01:00
7fb34f7918
gave scroll-canvas-dashboard 100% height in kiosk-mode, fixes #11010 ( #11017 )
2018-02-26 11:52:48 +01:00
6f4c043dd6
docs: update to install pages for beta5
2018-02-26 11:05:37 +01:00
ef67d20971
changelog: update for v5.0.0-beta5
2018-02-26 11:05:37 +01:00
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
c21d9deccb
build: update to version 5.0.0-beta5
2018-02-26 09:44:03 +01:00
1a170133ca
[doc] Fix extra alerting options in installation->configuration
2018-02-26 03:04:39 -03:00
3218927ead
yarn: update lock file with tarball change
2018-02-25 01:14:53 +01:00
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
abf498fc7f
improve maintainability
2018-02-23 09:51:19 -05:00
e350653430
docs: fix type in datasource http api
2018-02-23 14:52:45 +01:00
01fb3ea034
docs: adds accesskey and secret to securejsonfields
...
closes #11005
2018-02-23 09:32:22 +01:00
75ae34cf84
Merge pull request #10999 from grafana/10995_docs
...
docs: update shortcut docs
2018-02-23 09:29:05 +01:00
2d5d5e639f
Merge pull request #10998 from grafana/10995_shortcut
...
Fix keyboard shortcuts
2018-02-23 09:21:39 +01:00
3b836c9c5f
Merge pull request #10996 from grafana/snapshot_permissions
...
Snapshot fixes and changes to snapshot list
2018-02-23 09:17:59 +01:00
dc6f977304
support [[variable:type]] syntax
2018-02-22 18:45:11 -05:00
Daniel Lee
Sven Klemm
Julien Pivotto
Torkel Ödegaard
Marcus Efraimsson
Laurent Godet
Marcel Anacker
jganseman
Patrick O'Carroll
Marco Tulio R Braga
Dan Cech
bergquist
Carl Bergquist