5377ad4e96
remove unused argument in default scenario of guardian test
2018-06-19 12:34:34 +02:00
24d0b43e62
fix: fixed permission issue with api key with viewer role in dashboards with default permissions
2018-06-19 11:10:17 +02:00
764a4247f5
Merge pull request #12274 from xapon/11607-cleanup
...
#11607 Cleanup time of temporary files is now configurable
2018-06-18 13:50:05 +02:00
004142a1e4
Merge pull request #12263 from grafana/11076_current_org
...
Set current org when adding/removing user to org
2018-06-18 11:19:42 +02:00
d6f4313c2f
Merge pull request #12203 from bergquist/bus_multi_dispatch
...
bus: support multiple dispatch in one transaction
2018-06-18 10:54:05 +02:00
6d48d0a80c
set current org when adding/removing user to org
...
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
2018-06-18 09:30:01 +02:00
18167f1c18
Merge pull request #12299 from grafana/10707_whitelist
...
auth proxy: whitelist proxy ip instead of client ip
2018-06-18 09:00:41 +02:00
4c5fe68e7e
adds inTransactionCtx that calls inTransactionWithRetryCtx
2018-06-15 21:57:13 +02:00
1181e96799
merge create user handlers
2018-06-15 21:23:57 +02:00
da91b91b4b
transactions: start sessions and transactions at the same place
...
this make it possible for handler to use `withSession` when
transactions is not nedded and `inTransactionCtx` if its needed
without knowing who owns the session/transaction
2018-06-15 20:52:57 +02:00
c02dd7462a
cloudwatch: handle invalid time range
2018-06-15 15:48:25 +02:00
b418e14bd9
make sure to use real ip when validating white listed ip's
2018-06-15 15:29:43 +02:00
09e71e00a3
sql: adds tests for InTransaction
2018-06-15 12:46:20 +02:00
03dae10e79
bus: noop should still execute fn
2018-06-15 12:46:20 +02:00
a3ee778ddb
removes unused code
2018-06-15 12:46:20 +02:00
9c1758b593
bus: Dispatch now passes empty ctx if handler require it
2018-06-15 12:46:20 +02:00
9ca9a7c302
bus: dont start transaction when creating session
2018-06-15 12:46:20 +02:00
629eab0b1e
bus: dont mix ctx/classic handlers
2018-06-15 12:46:20 +02:00
e2275701d8
bus: DispatchCtx can now invoke any handler
2018-06-15 12:46:20 +02:00
5af0b924ff
refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
2018-06-15 12:46:20 +02:00
442e0e437b
refactoring: transaction manager PR #12203
2018-06-15 12:46:20 +02:00
6775a82c82
fixes typo in code
2018-06-15 12:46:20 +02:00
1bd31aa313
check if admin exists or create one in one transaction
2018-06-15 12:46:20 +02:00
263572813a
replace begin/end with wrapper function
2018-06-15 12:46:20 +02:00
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
e33d18701d
Merge pull request #12287 from bergquist/fix_12286
...
Influxdb: add mode functions
2018-06-15 12:43:47 +02:00
d5196ab322
remove internal influx ifql datasource
2018-06-14 20:42:33 +01:00
c63533f004
tests: rewrite into table tests
2018-06-14 20:33:36 +02:00
bf4ee9bcc6
influxdb: adds mode func to backend
...
closes #12286
2018-06-14 20:33:22 +02:00
81d34137a8
Merge pull request #11484 from manacker/master
...
alerting: fix mobile notifications for microsoft teams notifier
2018-06-14 15:56:18 +02:00
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
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
2565a8087c
#11607 corrected file cleanup test
2018-06-14 13:00:07 +05:00
7818578d6a
#11607 removed unnecessary conversion (from gometalinter)
2018-06-14 12:50:18 +05:00
2024cf4b56
#11607 fixed formatting
2018-06-14 12:46:29 +05:00
516839d7b2
#11607 Cleanup time of temporary files is now configurable
2018-06-14 12:35:22 +05:00
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796
...
Import dashboard to folder
2018-06-13 13:10:52 +02:00
25504e84ed
dashboard import to folder: minor fixes
2018-06-13 10:44:37 +03:00
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
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
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
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
4063ae37a4
dashboard: import to folder
2018-06-05 19:23:09 +03: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
Marcus Efraimsson
Torkel Ödegaard
Carl Bergquist
bergquist
David Kaltschmidt
Daniel Lee
Anton Sergeyev
Alexander Zobnin
Sławek Piotrowski
pari-