bergquist
9c1758b593
bus: Dispatch now passes empty ctx if handler require it
2018-06-15 12:46:20 +02:00
bergquist
9ca9a7c302
bus: dont start transaction when creating session
2018-06-15 12:46:20 +02:00
bergquist
629eab0b1e
bus: dont mix ctx/classic handlers
2018-06-15 12:46:20 +02:00
bergquist
e2275701d8
bus: DispatchCtx can now invoke any handler
2018-06-15 12:46:20 +02:00
Torkel Ödegaard
5af0b924ff
refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
2018-06-15 12:46:20 +02:00
Torkel Ödegaard
442e0e437b
refactoring: transaction manager PR #12203
2018-06-15 12:46:20 +02:00
bergquist
6775a82c82
fixes typo in code
2018-06-15 12:46:20 +02:00
bergquist
1bd31aa313
check if admin exists or create one in one transaction
2018-06-15 12:46:20 +02:00
bergquist
263572813a
replace begin/end with wrapper function
2018-06-15 12:46:20 +02:00
bergquist
8143610024
bus: support multiple dispatch in one transaction
...
this makes it possible to run multiple DispatchCtx
in one transaction. The TransactionManager will
start/end the transaction and pass the dbsession
in the context.Context variable
2018-06-15 12:46:20 +02:00
Carl Bergquist
e33d18701d
Merge pull request #12287 from bergquist/fix_12286
...
Influxdb: add mode functions
2018-06-15 12:43:47 +02:00
David Kaltschmidt
d5196ab322
remove internal influx ifql datasource
2018-06-14 20:42:33 +01:00
bergquist
c63533f004
tests: rewrite into table tests
2018-06-14 20:33:36 +02:00
bergquist
bf4ee9bcc6
influxdb: adds mode func to backend
...
closes #12286
2018-06-14 20:33:22 +02:00
Marcus Efraimsson
81d34137a8
Merge pull request #11484 from manacker/master
...
alerting: fix mobile notifications for microsoft teams notifier
2018-06-14 15:56:18 +02:00
Marcus Efraimsson
284045748c
Merge pull request #12243 from grafana/12236-ds-proxy-tokens
...
dsproxy: allow multiple access tokens per datasource
2018-06-14 14:03:08 +02:00
Daniel Lee
10d30f0b73
dsproxy: move http client variable back
...
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
2018-06-14 13:39:46 +02:00
Anton Sergeyev
2565a8087c
#11607 corrected file cleanup test
2018-06-14 13:00:07 +05:00
Anton Sergeyev
7818578d6a
#11607 removed unnecessary conversion (from gometalinter)
2018-06-14 12:50:18 +05:00
Anton Sergeyev
2024cf4b56
#11607 fixed formatting
2018-06-14 12:46:29 +05:00
Anton Sergeyev
516839d7b2
#11607 Cleanup time of temporary files is now configurable
2018-06-14 12:35:22 +05:00
Marcus Efraimsson
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796
...
Import dashboard to folder
2018-06-13 13:10:52 +02:00
Alexander Zobnin
25504e84ed
dashboard import to folder: minor fixes
2018-06-13 10:44:37 +03:00
Daniel Lee
719ebdc24d
dsproxy: allow multiple access tokens per datasource
...
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
2018-06-12 17:39:38 +02:00
Marcus Efraimsson
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
bergquist
f93d83befe
adds missing return statement
2018-06-06 22:17:19 +02:00
Sławek Piotrowski
9db964bf35
Fix typo: eleasticsearch -> elasticsearch ( #12184 )
2018-06-06 13:09:16 -07:00
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
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
Alexander Zobnin
4063ae37a4
dashboard: import to folder
2018-06-05 19:23:09 +03:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource
...
InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
Marcus Efraimsson
962f996799
always show server admin link in sidenav if grafana admin
2018-06-04 19:28:01 +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
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
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
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
David Kaltschmidt
08ee1da6b1
InfluxDB IFQL datasource
2018-06-04 12:24:47 +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
bergquist
f606654c50
provisioning: adds fallback if evalsymlink/abs fails
2018-06-04 09:04:33 +02:00
bergquist
3f5078339c
tests: uses different paths depending on os
2018-06-04 08:27:03 +02:00
bergquist
75ee1e9208
renames intervalSeconds to updateIntervalSeconds
2018-06-04 08:13:20 +02:00
Marcus Efraimsson
b6afe5f2e8
Merge pull request #11380 from WPH95/feature/add_es_alerting
...
elasticsearch: alerting support
2018-06-01 15:17:28 +02:00
Patrick O'Carroll
0c269d64d0
Alert panel filters ( #11712 )
...
alert list panel: filter alerts by name, dashboard, folder, tags
2018-06-01 14:36:40 +02:00
bergquist
333af6fd9b
provisioning: makes the interval for polling for changes configurable
2018-05-31 21:07:34 +02:00
bergquist
c817aecd66
provisioning: only update dashboard if hash of json changed
2018-05-31 21:05:52 +02:00
Marcus Efraimsson
b8ff3b1e3f
remove dead code
2018-05-31 19:05:32 +02:00
Marcus Efraimsson
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
Marcus Efraimsson
28f0acd854
Merge branch 'master' into feature/add_es_alerting
2018-05-31 16:33:07 +02:00
bergquist
44f5b92fbc
provisioning: only provision if json file is newer then db
2018-05-31 11:38:29 +02:00
David Kaltschmidt
0c45ee63a9
Guard /explore by editor role on the backend
2018-05-31 11:26:24 +02:00
bergquist
2bd4c14e5f
make path absolute before following symlink
2018-05-31 09:53:15 +02:00
bergquist
47d3884377
provisioning: follow symlinked folders
...
fixes #11958
2018-05-31 09:38:09 +02:00
bergquist
d5aeae3a90
test: fixes broken test on windows
2018-05-31 08:27:29 +02:00
Carl Bergquist
5c30643f6e
Merge pull request #12101 from bergquist/devenv
...
devenv: initial scripts for setting up devenv
2018-05-30 21:49:17 +02:00
Leonard Gram
50d1519a91
build: mysql integration testing on ci.
2018-05-30 16:27:47 +02:00
David Kaltschmidt
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
Kim Christensen
48fc5edda1
Support InfluxDB count distinct aggregation ( #11658 )
...
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
bergquist
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
Carl Bergquist
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
bergquist
1411709db1
provisioning: place testfiles within testdata folder
2018-05-29 16:30:12 +02:00
Marcus Efraimsson
048ac3089b
Merge branch 'master' into feature/add_es_alerting
2018-05-29 14:36:52 +02:00
Christophe Le Guern
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
Marcus Efraimsson
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
Leonard Gram
e6f2811b21
sql: seconds epochs are now correctly converted to ms.
...
Closes #12061
2018-05-29 08:44:03 +02:00
bergquist
d7b5fb4604
go fmt fixes
2018-05-28 20:48:01 +02:00
iyeonok
bafe25fbd9
configure proxy environments for Transport property
...
related issue: https://github.com/grafana/grafana/issues/9703
2018-05-28 20:48:01 +02:00
Marcus Efraimsson
7548d6f6d1
Show create dashboard link if at least editor in one folder
2018-05-28 20:37:39 +02:00
thurt
b487aa3e6a
return better error message when err is ErrSmtpNotEnabled
...
fixes #12087
2018-05-28 17:49:31 +00:00
Marcus Efraimsson
e5e1683840
Merge branch 'master' into feature/add_es_alerting
2018-05-28 18:10:34 +02:00
Marcus Efraimsson
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
Carl Bergquist
519e58a267
Merge pull request #12071 from grafana/12056_usage_stats
...
Additional anonymous usage stats
2018-05-28 11:23:16 +02:00
Marcus Efraimsson
c9e9f25699
use sql builder for the get system stats sql query
2018-05-28 10:37:17 +02:00
Carl Bergquist
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
Julien Pivotto
a5e6cb9a02
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-05-27 14:52:50 +02:00
bergquist
238139fad6
alerting: refactor tests
2018-05-25 16:12:34 +02:00
Marcus Efraimsson
fbc44025dc
add usage stats for datasource access mode
2018-05-25 16:06:35 +02:00
Marcus Efraimsson
2ea5b6fe33
add additional usage stats metrics
...
nr of folders
nr of folder permissions
nr of dashboard permissions
nr of snapshots
nr of teams
nr of provisioned dashboards
2018-05-25 14:33:37 +02:00
Marcus Efraimsson
a6a12d36d7
add tests for sending usage stats
2018-05-25 13:32:55 +02:00
Marcus Efraimsson
4752d7884a
elasticsearch: adds some more/better debug logging to client
2018-05-25 10:31:56 +02:00
Torkel Ödegaard
80d694d205
Backend image rendering as plugin ( #11966 )
...
* rendering: headless chrome progress
* renderer: minor change
* grpc: version hell
* updated grpc libs
* wip: minor progess
* rendering: new image rendering plugin is starting to work
* feat: now phantomjs works as well and updated alerting to use new rendering service
* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)
* rendering: now render key is passed and render auth is working in plugin mode
* removed unneeded lines from gitignore
* rendering: now plugin mode supports waiting for all panels to complete rendering
* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases
* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values
* fix: another update to tz param generation
* renderer: added http mode to renderer service, new ini setting [rendering] server_url
2018-05-24 15:26:27 +02:00
Dan Cech
417db13efb
Fix dashboard snapshot deletion ( #12025 )
...
* fix issue deleting dashboard snapshots by deleteKey, add dedicated endopoint for authenticated requests, update frontend, tests & docs.
2018-05-24 08:55:16 +02:00
Marcus Efraimsson
16c3566a87
elasticsearch: handle NaN values
2018-05-23 22:57:46 +02:00
Marcus Efraimsson
688f5b830c
elasticsearch: metric and pipeline agg setting json encoding fix
2018-05-23 22:21:41 +02:00
Marcus Efraimsson
4436b8da12
elasticsearch: query interval override fix
2018-05-23 22:07:52 +02:00
Marcus Efraimsson
8870e3e85b
elasticsearch: default interval fix
...
5s instead of 15s
2018-05-23 21:44:09 +02:00
Marcus Efraimsson
242689abe2
elasticsearch: pipeline aggregation fix for json encoding
2018-05-23 16:46:26 +02:00
Marcus Efraimsson
dce59ccff2
fix: remove deadcode to make gometalinter happy
2018-05-23 15:28:36 +02:00
Marcus Efraimsson
4840adff00
elasticsearch: refactor query handling and use new es simple client
...
Removes moment dependency.
Adds response parser tests (based on frontend tests).
Adds time series query tests (based on frontend tests).
Fixes various issues related to response parsing and building search request queries.
Added support for extended stats metrics and geo hash grid aggregations.
2018-05-23 15:09:58 +02:00
Marcus Efraimsson
e171ed8910
elasticsearch: new simple client for communicating with elasticsearch
...
Handles minor differences of es 2, 5 and 5.6.
Implements index pattern logic.
Exposes builders for building search requests.
2018-05-23 14:59:12 +02:00
Marcus Efraimsson
77400cef08
elasticsearch: refactor and cleanup
...
Move time series query logic to specific file.
Remove model parser and move to time series query file, adds parser test.
2018-05-23 14:36:41 +02:00
Marcus Efraimsson
1324a67cbd
Merge branch 'master' into WPH95-feature/add_es_alerting
2018-05-23 14:35:45 +02:00
bergquist
c40b0ea1df
test: moves test files to testdata folder
2018-05-18 23:23:13 +02:00
Torkel Ödegaard
d0c17100cb
fix: fixed some minor startup logging issues
2018-05-18 11:17:31 +02:00
Torkel Ödegaard
6c0752473a
Sqlstore refactor ( #11908 )
...
* refactor: tracing service refactoring
* refactor: sqlstore to instance service
* refactor: sqlstore & registory priority
* refactor: sqlstore refactor wip
* sqlstore: progress on getting tests to work again
* sqlstore: progress on refactoring and getting tests working
* sqlstore: connection string fix
* fix: not sure why this test is not working and required changing expires
* fix: updated grafana-cli
2018-05-18 11:10:10 +02:00
bergquist
78e837cf39
test: increase expire time to avoid tz issues in tests
2018-05-17 14:59:50 +02:00
Alexander Zobnin
214b9af5a3
backend plugins: log an error if parsing meta field failed
2018-05-15 20:59:24 +03:00
Alexander Zobnin
4533f22871
backend plugins: expose meta field
2018-05-15 15:33:05 +03:00