3fb4eb7322
Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting
...
Respect explore settings in config ini
2018-06-07 12:08:42 +02:00
f93d83befe
adds missing return statement
2018-06-06 22:17:19 +02:00
9db964bf35
Fix typo: eleasticsearch -> elasticsearch ( #12184 )
2018-06-06 13:09:16 -07:00
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
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource
...
InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
962f996799
always show server admin link in sidenav if grafana admin
2018-06-04 19:28:01 +02:00
9680a3d44d
Gravatar fallback does not respect 'AppSubUrl'-setting ( #12149 )
...
Closes #12148
2018-06-04 16:03:59 +02:00
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
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
cd4026da6b
Revert "provisioning: turn relative symlinked path into absolut paths"
...
This reverts commit d089b5e05d
2018-06-04 15:38:37 +02:00
d089b5e05d
provisioning: turn relative symlinked path into absolut paths
2018-06-04 15:20:26 +02:00
38906acda9
elasticsearch: sort bucket keys to fix issue wth response parser tests
2018-06-04 15:15:47 +02:00
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
08ee1da6b1
InfluxDB IFQL datasource
2018-06-04 12:24:47 +02:00
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
f606654c50
provisioning: adds fallback if evalsymlink/abs fails
2018-06-04 09:04:33 +02:00
3f5078339c
tests: uses different paths depending on os
2018-06-04 08:27:03 +02:00
75ee1e9208
renames intervalSeconds to updateIntervalSeconds
2018-06-04 08:13:20 +02:00
b6afe5f2e8
Merge pull request #11380 from WPH95/feature/add_es_alerting
...
elasticsearch: alerting support
2018-06-01 15:17:28 +02:00
0c269d64d0
Alert panel filters ( #11712 )
...
alert list panel: filter alerts by name, dashboard, folder, tags
2018-06-01 14:36:40 +02:00
333af6fd9b
provisioning: makes the interval for polling for changes configurable
2018-05-31 21:07:34 +02:00
c817aecd66
provisioning: only update dashboard if hash of json changed
2018-05-31 21:05:52 +02:00
b8ff3b1e3f
remove dead code
2018-05-31 19:05:32 +02:00
dcac63936b
elasticsearch: minor refactor
...
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
2018-05-31 19:02:20 +02:00
28f0acd854
Merge branch 'master' into feature/add_es_alerting
2018-05-31 16:33:07 +02:00
44f5b92fbc
provisioning: only provision if json file is newer then db
2018-05-31 11:38:29 +02:00
0c45ee63a9
Guard /explore by editor role on the backend
2018-05-31 11:26:24 +02:00
2bd4c14e5f
make path absolute before following symlink
2018-05-31 09:53:15 +02:00
47d3884377
provisioning: follow symlinked folders
...
fixes #11958
2018-05-31 09:38:09 +02:00
d5aeae3a90
test: fixes broken test on windows
2018-05-31 08:27:29 +02:00
5c30643f6e
Merge pull request #12101 from bergquist/devenv
...
devenv: initial scripts for setting up devenv
2018-05-30 21:49:17 +02:00
50d1519a91
build: mysql integration testing on ci.
2018-05-30 16:27:47 +02:00
f69654fcd5
Restrict Explore UI to Editor and Admin roles
...
Access is restricted via not showing in the following places:
* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`
Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
2018-05-30 13:13:29 +02:00
48fc5edda1
Support InfluxDB count distinct aggregation ( #11658 )
...
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
c7acbcdaf5
provisioning: enable relative path's
...
this commit enable relatives path for provisioning dashboards.
this enables easier dev setups
2018-05-30 08:46:44 +02:00
813a9a975f
Merge pull request #12090 from grafana/11858_create_dashboard_link
...
Show create dashboard link if at least editor in one folder
2018-05-29 17:18:41 +02:00
1411709db1
provisioning: place testfiles within testdata folder
2018-05-29 16:30:12 +02:00
048ac3089b
Merge branch 'master' into feature/add_es_alerting
2018-05-29 14:36:52 +02:00
3ba3fd9a59
Add new regions to handleGetRegions function ( #12082 )
...
As public/app/plugins/datasource/cloudwatch/partials/config.html and this file differ between the AWS regions available, I've updated the latest so they share the same data.
In that way, the regions() method in dashboards returns the same list as the frontend does.
2018-05-29 14:26:33 +02:00
1bc94c7d5a
Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured
...
inviting users: show friendlier error message when smtp is not configured
2018-05-29 10:46:46 +02:00
e6f2811b21
sql: seconds epochs are now correctly converted to ms.
...
Closes #12061
2018-05-29 08:44:03 +02:00
d7b5fb4604
go fmt fixes
2018-05-28 20:48:01 +02:00
bafe25fbd9
configure proxy environments for Transport property
...
related issue: https://github.com/grafana/grafana/issues/9703
2018-05-28 20:48:01 +02:00
7548d6f6d1
Show create dashboard link if at least editor in one folder
2018-05-28 20:37:39 +02:00
b487aa3e6a
return better error message when err is ErrSmtpNotEnabled
...
fixes #12087
2018-05-28 17:49:31 +00:00
e5e1683840
Merge branch 'master' into feature/add_es_alerting
2018-05-28 18:10:34 +02:00
5a96863eed
pin versions of xorm to resolve sql tests
...
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
2018-05-28 13:07:41 +02:00
519e58a267
Merge pull request #12071 from grafana/12056_usage_stats
...
Additional anonymous usage stats
2018-05-28 11:23:16 +02:00
c9e9f25699
use sql builder for the get system stats sql query
2018-05-28 10:37:17 +02:00
6c259eb04d
Merge pull request #12077 from roidelapluie/logout
...
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
2018-05-28 08:06:00 +02:00
Marcus Efraimsson
bergquist
Sławek Piotrowski
David Kaltschmidt
pari-
Carl Bergquist
Alexander Zobnin
Patrick O'Carroll
Leonard Gram
Kim Christensen
Christophe Le Guern
iyeonok
thurt