Torkel Ödegaard
7a7c6f8fab
fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
2018-06-28 04:38:23 -07:00
Dan Cech
3056d9a80e
support passing api token in Basic auth password ( #12416 )
2018-06-28 03:08:32 -07:00
bergquist
8ff538be07
notifier: handle known error first
2018-06-26 14:13:45 +02:00
Augustin
ef0bf9f701
ensure that if the dasboardID is negative, it will not bypass the checking of the right ( #12398 )
2018-06-26 05:12:20 -07:00
bergquist
f83306bb5b
removes unused return object
2018-06-26 09:22:31 +02:00
Dan Cech
583df47c2f
handle "dn" ldap attribute more gracefully ( #12385 )
...
* handle "dn" ldap attribute more gracefully
* use strings.ToLower
2018-06-26 00:14:55 -07:00
Austin Winstanley
c35c1d7270
Merge branch 'master' of https://github.com/grafana/grafana into macros/sql
2018-06-25 20:13:34 +00:00
Austin Winstanley
105b3d6804
Switched MySQL and MSSQL macros for timeFilter and related to use BETWEEN and calculate UNIX time server side instead of database side. Fixes #11618 #11619
2018-06-25 20:11:58 +00:00
Carl Bergquist
175e95abb0
Merge pull request #12396 from bergquist/routing
...
routing: allows routes to be added to existing groups
2018-06-25 17:17:14 +02:00
bergquist
4a46dd886b
routing: raise panic if duplicate routes are added
2018-06-25 16:58:49 +02:00
bergquist
dbfafa1cb5
routing: allows routes to be added to existing groups
...
this enables services to add routing to ex /api
without causing conflicts.
2018-06-25 16:50:27 +02:00
Marcus Efraimsson
f106de0efd
enhance error message if phantomjs executable is not found
...
if arm build, explain that phantomjs is not included by default in arm
builds. If not explain that phantom js isn't installed correctly
2018-06-25 16:06:52 +02:00
Torkel Ödegaard
132df4553c
fix: annnotation api & sql issue
2018-06-25 16:03:38 +02:00
Augustin
eb4d860fcb
Light improve of massive delete annotation api ( #12390 )
...
* fix delete annotations
* fix self assignment
* add right unit test using admin role
2018-06-25 04:58:49 -07:00
Austin Winstanley
defb0396b7
Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313
2018-06-22 21:15:36 -05:00
Carl Bergquist
828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth
...
Pass configured/auth headers to a Datasource.
2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c
Pass configured/auth headers to a Datasource.
...
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
2018-06-21 14:58:05 +03:00
bergquist
503c8cd8ef
tech: adds comments about route register code
2018-06-20 16:55:42 +02:00
Carl Bergquist
578a8e8f55
Merge pull request #12322 from bergquist/sqlstore_refactoring
...
expose session and transaction helpers to other services
2018-06-20 10:22:06 +02:00
Marcus Efraimsson
b1cf1acb71
Merge pull request #10970 from mmolnar/master
...
ldap: allow use of DN in group_search_filter_user_attribute and member_of
2018-06-19 14:40:05 +02:00
Marcus Efraimsson
5377ad4e96
remove unused argument in default scenario of guardian test
2018-06-19 12:34:34 +02:00
Torkel Ödegaard
24d0b43e62
fix: fixed permission issue with api key with viewer role in dashboards with default permissions
2018-06-19 11:10:17 +02:00
bergquist
3479cf4b39
expose functions to use sessions
2018-06-18 14:50:36 +02:00
Carl Bergquist
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
bergquist
ffda5efc66
Merge branch 'master' into alerting_reminder
...
* master:
changelog: add notes about closing #11076
snapshot: copy correct props when creating a snapshot
set current org when adding/removing user to org
changelog: add notes about closing #10707
Include the vendor directory when copying source in to Docker (#12305 )
changelog: adds note about closing #12199
adds inTransactionCtx that calls inTransactionWithRetryCtx
merge create user handlers
transactions: start sessions and transactions at the same place
cloudwatch: handle invalid time range
make sure to use real ip when validating white listed ip's
changelog: adds note about closing #12286
2018-06-18 11:26:31 +02:00
Marcus Efraimsson
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
Carl Bergquist
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
Marcus Efraimsson
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
Marcus Efraimsson
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
bergquist
83a12afc07
adds tests for journaling sql operations
2018-06-16 11:27:04 +02:00
bergquist
c21938d4c4
use epoch to compare timestamp
2018-06-16 00:03:13 +02:00
bergquist
4c5fe68e7e
adds inTransactionCtx that calls inTransactionWithRetryCtx
2018-06-15 21:57:13 +02:00
bergquist
1181e96799
merge create user handlers
2018-06-15 21:23:57 +02:00
bergquist
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
bergquist
12bf5c225a
tests for defaultShouldNotify
2018-06-15 16:27:20 +02:00
Marcus Efraimsson
c02dd7462a
cloudwatch: handle invalid time range
2018-06-15 15:48:25 +02:00
bergquist
f4b089d551
notifications: make journaling ctx aware
2018-06-15 15:30:17 +02:00
Marcus Efraimsson
b418e14bd9
make sure to use real ip when validating white listed ip's
2018-06-15 15:29:43 +02:00
Francisco Guimarães
acdc2bf100
Adding Cloudwatch AWS/AppSync metrics and dimensions
2018-06-15 10:11:32 -03:00
bergquist
7632983c62
notifications: gather actions in one transaction
2018-06-15 14:27:16 +02:00
bergquist
0cfdebf0a2
Merge remote-tracking branch 'fork/bus_multi_dispatch' into alerting_reminder
...
* fork/bus_multi_dispatch:
sql: adds tests for InTransaction
bus: noop should still execute fn
removes unused code
bus: Dispatch now passes empty ctx if handler require it
bus: dont start transaction when creating session
bus: dont mix ctx/classic handlers
bus: DispatchCtx can now invoke any handler
refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
refactoring: transaction manager PR #12203
fixes typo in code
check if admin exists or create one in one transaction
replace begin/end with wrapper function
bus: support multiple dispatch in one transaction
2018-06-15 13:17:24 +02:00
bergquist
09e71e00a3
sql: adds tests for InTransaction
2018-06-15 12:46:20 +02:00
bergquist
03dae10e79
bus: noop should still execute fn
2018-06-15 12:46:20 +02:00
bergquist
a3ee778ddb
removes unused code
2018-06-15 12:46:20 +02:00
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
Torkel Ödegaard
Dan Cech
bergquist
Augustin
Austin Winstanley
Carl Bergquist
Marcus Efraimsson
mrsiano
Francisco Guimarães