public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,437 Commits 655 Branches 650 Tags
e1b554c61eb3e83ec3faae7bb4e79e709608de80
Commit Graph
13437 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson e1b554c61e dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231

(cherry picked from commit 5fbfd67b94)
 2018-03-14 14:39:41 +01:00
bergquist a747ec349e release 5.0.1 v5.0.1 2018-03-08 09:54:26 +01:00
Carl Bergquist d9f3c0931a Merge pull request #11148 from bergquist/v5.0.x 
Cherry pick #11145 and #11127
 2018-03-07 17:30:10 +01:00
Dan Cech f736e7aeb2 only use jwt token if it contains an email address 
(cherry picked from commit 9d005c50a2)
 2018-03-07 17:07:19 +01:00
Daniel Lee 84d6e67e6b alerting: fixes validation error when saving alerts in dash 
If a panelId in the dashboard json is set to zero then the validation
silently fails. Instead of returning an error, it just ignores alerts and
saves the dashboard.

(cherry picked from commit d96fbb486f)
 2018-03-07 17:06:50 +01:00
Daniel Lee 5ad76a29a0 Merge pull request #11142 from daniellee/v5.0.x 
Cherrypick for V5.0.x
 2018-03-07 15:51:41 +01:00
bergquist 5c6fd4f202 hide row actions for viewers 
closes #11112

(cherry picked from commit d3b23b01d8)
 2018-03-07 14:26:17 +01:00
Patrick O'Carroll f13ffa3a52 made drop-menu into link 
(cherry picked from commit 42cd462cbf)
 2018-03-07 14:21:17 +01:00
Patrick O'Carroll 55809ee92a changed background for mobile menu background on light theme, increased font size in and added border-right in menu 
(cherry picked from commit 9b3863a150)
 2018-03-07 14:20:25 +01:00
Daniel Lee a1db5561e0 scrolling: faster wheelspeed 
ref #11053

(cherry picked from commit 8e81dc1e79)
 2018-03-07 14:18:49 +01:00
Leonard Gram 3591e573f1 Merge pull request #11125 from xlson/cp_11121 
Cherry pick #11121
 2018-03-06 15:26:14 +01:00
Carl Bergquist b29c2da7ef Merge pull request #11124 from bergquist/cp_11093 
Cherry pick #11093
 2018-03-06 15:23:03 +01:00
Leonard Gram 0f601dc4b1 alerting: Limits telegram captions to 200 chars. 
The caption for inline images in Telegram is
limited to 200 characters.

Fixes #10975

(cherry picked from commit 891462b5d9)
 2018-03-06 14:58:11 +01:00
Carl Bergquist 5742c4d603 Merge pull request #11117 from grafana/cp-fix-11103 
cherry pick #11103 to v5.0.x
 2018-03-06 14:55:38 +01:00
Carl Bergquist 2226506a1d Merge pull request #11120 from bergquist/cp_11097 
Cherry-pick #11097
 2018-03-06 14:44:13 +01:00
Sven Klemm dcafc29bf2 use net/url to generate postgres connection url 
(cherry picked from commit 4904a051cf)
 2018-03-06 14:39:46 +01:00
bergquist 1b16a1ae81 fixes invalid link to profile pic when gravatar is disabled 
closes #11097

(cherry picked from commit 5934521137)
 2018-03-06 12:38:36 +01:00
Carl Bergquist 45e22da955 Fix Prometheus 2.0 stats (#11048) (#11115) 
Fixes #11016

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
(cherry picked from commit 69c93e6401)
 2018-03-06 11:27:56 +01:00
Torkel Ödegaard bc660ff3d5 fix: restores white resize handle for panels, fixes #11103 
(cherry picked from commit 0de90accfb)
 2018-03-06 11:21:58 +01:00
Carl Bergquist 426ae8bdd3 Merge pull request #11113 from bergquist/cp-11109 
Cherry-pick #11109
 2018-03-06 11:05:26 +01:00
bergquist 5bab016837 ignore iteration property when checking for unsaved changes 
closes #11063

(cherry picked from commit a7d62f44d3)
 2018-03-06 10:41:37 +01:00
Daniel Lee a7fcadd7c9 build: update publish_both with v5.0.0 2018-03-01 08:59:40 +01:00
Torkel Ödegaard af6e28366b build: updated version v5.0.0 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 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
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 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
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