d2f31a716f
remove unnecessary conversions
2018-07-04 12:16:39 +02:00
861af4cb97
Improve extensions build. ( #12461 )
...
* enable ee build on pr/master
* step1: of including group sync
* disable commit pinning for now
* fixes broken build
* enable team to ldap group sync
* avoid returning error for missing external handler
* services: allow routes to be added before http server start
* services: allows services to add their own migrations
* moves db migrations to ee code base
* build using master branch in ee
* disable enterprise build in .bra.toml
[skip ci]
* removes team sync extensions
* removes commented line
2018-07-01 07:01:43 -07:00
c4292b43f5
alerting: only log when screenshot been uploaded
2018-06-29 09:58:58 +02:00
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
132df4553c
fix: annnotation api & sql issue
2018-06-25 16:03:38 +02:00
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
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
3479cf4b39
expose functions to use sessions
2018-06-18 14:50:36 +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
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
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
09e71e00a3
sql: adds tests for InTransaction
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
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
81d34137a8
Merge pull request #11484 from manacker/master
...
alerting: fix mobile notifications for microsoft teams notifier
2018-06-14 15:56:18 +02:00
2565a8087c
#11607 corrected file cleanup test
2018-06-14 13:00:07 +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
f93d83befe
adds missing return statement
2018-06-06 22:17:19 +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
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
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
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
44f5b92fbc
provisioning: only provision if json file is newer then db
2018-05-31 11:38:29 +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
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
1411709db1
provisioning: place testfiles within testdata folder
2018-05-29 16:30:12 +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
238139fad6
alerting: refactor tests
2018-05-25 16:12:34 +02:00
Marcus Efraimsson
Carl Bergquist
bergquist
Torkel Ödegaard
Anton Sergeyev
Alexander Zobnin
Patrick O'Carroll