IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,841 Commits 5,416 Branches 554 Tags
dbbd6b9b660f4b759bc4af3d49f4cd6c7293e129
Commit Graph

14841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zobnin
9460063ab5 show import menu in sidenav, dashboard search and manage dashboards page 
if user has editor permissions for at least one folder
 2018-06-06 13:55:00 +03:00
David Kaltschmidt
3bd58446d6 Fix metrics panel test by adding config mock 2018-06-06 11:15:24 +02:00
David Kaltschmidt
661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
David Kaltschmidt
56fc82151b Add .html to webpack.hot resolve extensions 2018-06-06 09:12:06 +02:00
Tom Wilkie
681326140d Version the tarball uploaded to s3 and tell the next step about it. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-05 20:02:51 +01:00
Alexander Zobnin
4ff4ac1d5f dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00
Alexander Zobnin
393f41cd14 dashboard: add Import button to manage page 2018-06-05 19:37:47 +03:00
Alexander Zobnin
4063ae37a4 dashboard: import to folder 2018-06-05 19:23:09 +03:00
David Kaltschmidt
d7379912c1 Query helpers for IFQL datasource 
* raw CSV preview next to query field (query inspector is not that
 useful here)
* added result table and record counts
 2018-06-05 17:15:35 +02:00
David
45a156577c Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
Leonard Gram
9e7651a1b3 docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
David Kaltschmidt
64f5874778 Remove round-robin urls in ifql DS 2018-06-05 13:49:35 +02:00
David Kaltschmidt
1d587450b3 IFQL range variable expansion 2018-06-05 13:42:32 +02:00
Leonard Gram
eb66266629 changelog: release v5.2.0-beta1. 2018-06-05 10:57:18 +02:00
Marcus Efraimsson
cb9fc3f6b4 changelog: add notes about closing #11657 
[skip ci]
 2018-06-05 09:35:24 +02:00
Carl Bergquist
6d27c3d0c5 Merge pull request #12154 from grafana/11657_server_admin 
Always show server admin link in sidenav if grafana admin
 2018-06-05 08:02:05 +02:00
Marcus Efraimsson
962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
Marcus Efraimsson
d09749eaaa Merge pull request #12153 from grafana/googleOAuthDocs 
update google auth config docs
 2018-06-04 18:50:28 +02:00
Dan Cech
9b29a19609 update google auth config docs 2018-06-04 12:32:35 -04:00
Marcus Efraimsson
58406707f9 changelog: add notes about closing #11525 
[skip ci]
 2018-06-04 18:10:28 +02:00
Marcus Efraimsson
38c94bb633 Merge pull request #12117 from grafana/11525-dashlist-folder-picker 
Fix search by folder in dashboard list panel
 2018-06-04 18:08:38 +02:00
Torkel Ödegaard
9e59751c07 fix: fixed problem with expanding access mode help in ds settings 2018-06-04 18:05:16 +02:00
Torkel Ödegaard
ae82112c2e dep: use master branch for plugin model 2018-06-04 17:47:38 +02:00
David
95aef8241c Merge pull request #12146 from grafana/12144-new-variable-save 
added if to check if new variable has been added
 2018-06-04 17:26:48 +02:00
Patrick O'Carroll
d650dc94c9 fixed so default is all and general only show dashboards 2018-06-04 17:25:20 +02:00
Marcus Efraimsson
09a0a49c52 changelog: add notes about closing #11882 
[skip ci]
 2018-06-04 16:32:42 +02:00
Patrick O'Carroll
937b26f3fd added s to folderId in params 2018-06-04 16:28:24 +02:00
Patrick O'Carroll
89238b4a04 renamed variable in tests 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
b122f53085 added comment, variableChange -> variableValueChange 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
609b0fa498 added a test 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
5e484e8393 added if to check if new variable has been added 2018-06-04 16:23:36 +02:00
Marcus Efraimsson
6281910591 Merge pull request #12037 from grafana/login-change-password 
change admin password after first login
 2018-06-04 16:21:45 +02:00
pari-
9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) 
Closes #12148
 2018-06-04 16:03:59 +02:00
David
b5c53aae97 Merge pull request #12108 from grafana/davkal/12001-explore-permissions 
Restrict Explore UI to Editor and Admin roles
 2018-06-04 16:01:39 +02:00
Patrick O'Carroll
cb6c6c8172 change admin password after first login 2018-06-04 16:01:09 +02:00
bergquist
574e92e1d8 changelog: adds note about closing #11958 
[skip ci]
 2018-06-04 16:00:44 +02:00
Carl Bergquist
7214ee9024 Merge pull request #12007 from bergquist/provisioning_symlinked_folders 
Add support for symlinked folders in dashboard provisioning
 2018-06-04 16:00:32 +02:00
Torkel Ödegaard
829af9425f revert: reverted singlestat panel position change PR #12004 2018-06-04 15:45:29 +02:00
bergquist
cd4026da6b Revert "provisioning: turn relative symlinked path into absolut paths" 
This reverts commit d089b5e05d.
 2018-06-04 15:38:37 +02:00
bergquist
d089b5e05d provisioning: turn relative symlinked path into absolut paths 2018-06-04 15:20:26 +02:00
Marcus Efraimsson
33ee1fba30 Merge pull request #12150 from grafana/12120_whats_new 
Draft: What's new in v5.2
 2018-06-04 15:17:31 +02:00
bergquist
c138ff2c90 changelog: adds note about closing #11670 2018-06-04 15:16:34 +02:00
Marcus Efraimsson
38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Carl Bergquist
49d9235433 Merge pull request #12122 from grafana/provisioning_ha 
Support provisioning in HA setup where modtime differs
 2018-06-04 15:12:46 +02:00
Marcus Efraimsson
0d5579b4c0 docs: what's new in v5.2 2018-06-04 14:31:43 +02:00
David Kaltschmidt
08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Marcus Efraimsson
7453df2662 changelog: add notes about closing #11167 
[skip ci]
 2018-06-04 11:57:13 +02:00
Marcus Efraimsson
e258f30704 Merge pull request #12129 from alexanderzobnin/fix-11167 
alert list panel: show alerts for user with viewer role
 2018-06-04 11:54:51 +02:00
Leonard Gram
e562ae753b docs: docker secrets support. (#12141) 
Closes #12132
 2018-06-04 11:49:12 +02:00
Alexander Zobnin
13c6f37ea5 alerting: show alerts for user with Viewer role 
changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
 2018-06-04 12:34:30 +03:00