677117fb03
fix diff and percent_diff ( #12515 )
...
* make diff and percent_diff tests more realistic
* fix diff and percent_diff
* include @marefr's additional tests
2018-07-08 21:58:34 -07:00
77220456b6
improve error message
2018-07-09 13:11:50 +09:00
40ed235b3b
support GetMetricData
2018-07-09 13:11:50 +09:00
d90d4ce55d
Merge pull request #12402 from AustinWinstanley/macros/sql
...
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros
The $__timeFilter macro now uses a BETWEEN with timestamps instead of
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format
YYYY-MM-DDThh:mm:ssZ instead of epoch
2018-07-04 20:01:43 +02:00
d2f31a716f
remove unnecessary conversions
2018-07-04 12:16:39 +02:00
1f97df46c1
devenv: open ldap docker block now prepopulating data with correct member groups
2018-07-03 12:58:17 +02:00
5e08bf5130
test: fixed usage of wrap in tests.
2018-07-02 17:13:59 +02:00
6286c31d4b
refactoring: making api wrap public
2018-07-02 14:13:18 +02:00
b8724ae0c4
refactoring: enterprise build/hooks refactorings ( #12478 )
2018-07-02 04:33:39 -07:00
10e86eda69
fix : #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated ( #12474 )
2018-07-01 23:35:50 -07: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
1601f6d17c
[mysql] fix $__timeGroup rounding ( #12469 )
...
* fix $__timeGroup rounding for mysql
* revert accidentally commented out line
2018-07-01 06:59:05 -07:00
f017c04a65
[mssql] fix $__timeGroup rounding ( #12470 )
...
* fix $__timeGroup rounding for mssql
* revert enabling of mssql integration tests
2018-07-01 06:57:02 -07:00
c2c22c142b
[postgres] fix timeGroup macro rounding ( #12468 )
...
* fix timeGroup tests to check for correct grouping
* do explicit floor rounding in $__timeGroup macro
* fix typo in comments
2018-07-01 06:55:46 -07:00
c03d527d25
pkg/social/github: Allow changing of userinfo data ( #12471 )
...
Experienced a problem where a user whose email changed was no longer
able to login. By using the ID as a primary identifier, we can avoid
conflicts of this variety within the github OAuth provider.
2018-07-01 05:56:16 -07:00
66c56e7bbe
notifications: dont return error if one notifer failed
2018-06-30 23:14:18 +02:00
88783d6e0a
avoid calling os.Exit outside main.go ( #12459 )
...
I don't think we should call os.Exit outside main.go. Calling
os.Exit breaks the application control flow.
2018-06-29 22:48:26 -07:00
e91e3ea771
notifications: send notifications synchronous
2018-06-29 16:16:09 +02:00
d31c7bc6a4
Merge branch 'master' into alerting_reminder
...
* master: (95 commits)
registry: adds more comments
registry: adds comments to interfaces
changelog: update
changelog: update
changelog: add notes about closing #12438
alerting: only log when screenshot been uploaded
fixes typos
changelog: add notes about closing #12444
Revert "auth proxy: use real ip when validating white listed ip's"
changelog: adds note for #11892
changelog: add notes about closing #12430
fix footer css issue
Karma to Jest: 3 test files (#12414 )
fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
Karma to Jest: value_select_dropdown (#12435 )
support passing api token in Basic auth password (#12416 )
Add disabled styles for checked checkbox (#12422 )
changelog: add notes about closing #11920
changelog: add notes about closing #11920
changelog: update
...
2018-06-29 15:44:20 +02:00
396f8e6464
notifications: read without tran, write with tran
2018-06-29 15:15:31 +02:00
d440b9a8d1
registry: adds more comments
2018-06-29 11:58:54 +02:00
f0f6d0e915
registry: adds comments to interfaces
2018-06-29 11:45:32 +02:00
59756863df
Merge pull request #12439 from grafana/fix-log-close-too-early
...
Fix: Log close (ie flush) was done too early, before final shutdown log
2018-06-29 10:45:14 +02:00
c4292b43f5
alerting: only log when screenshot been uploaded
2018-06-29 09:58:58 +02:00
a0e8437f8f
Used PostgreSQL TSDB as a model the set up the __timeFilter, __timeFrom, and __timeTo macros for Microsoft SQL and MySQL
2018-06-29 03:48:14 +00:00
d663122244
Merge branch 'master' of https://github.com/grafana/grafana into macros/sql
2018-06-29 03:31:23 +00:00
8af5da7383
Revert "auth proxy: use real ip when validating white listed ip's"
2018-06-28 15:43:33 +02:00
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
3056d9a80e
support passing api token in Basic auth password ( #12416 )
2018-06-28 03:08:32 -07:00
8ff538be07
notifier: handle known error first
2018-06-26 14:13:45 +02:00
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
f83306bb5b
removes unused return object
2018-06-26 09:22:31 +02:00
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
c35c1d7270
Merge branch 'master' of https://github.com/grafana/grafana into macros/sql
2018-06-25 20:13:34 +00:00
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
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
4a46dd886b
routing: raise panic if duplicate routes are added
2018-06-25 16:58:49 +02:00
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
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
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
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
828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth
...
Pass configured/auth headers to a Datasource.
2018-06-21 14:21:59 +02:00
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
503c8cd8ef
tech: adds comments about route register code
2018-06-20 16:55:42 +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
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
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
Jesse Tane
Mitsuhiro Tanda
Marcus Efraimsson
Torkel Ödegaard
Leonard Gram
Carl Bergquist
Sven Klemm
Will Weber
bergquist
Austin Winstanley
Dan Cech
Augustin
mrsiano