Commit Graph

15179 Commits

Author SHA1 Message Date
Marcus Efraimsson
723a894fc5
changelog: update
[skip ci]
2018-07-03 19:59:34 +02:00
Marcus Efraimsson
634c77469d
changelog: add notes about closing #11818
[skip ci]
2018-07-03 19:58:19 +02:00
Marcus Efraimsson
faf2ab4249
changelog: add notes about closing #12460
[skip ci]
2018-07-03 19:54:09 +02:00
Marcus Efraimsson
512e7f8567
changelog: add notes about closing #8186
[skip ci]
2018-07-03 19:50:21 +02:00
Marcus Efraimsson
60792d57dd
changelog: add notes about closing #12379
[skip ci]
2018-07-03 19:44:21 +02:00
Marcus Efraimsson
27aa1cd568
changelog: add notes about closing #12362
[skip ci]
2018-07-03 19:41:34 +02:00
Torkel Ödegaard
1f97df46c1 devenv: open ldap docker block now prepopulating data with correct member groups 2018-07-03 12:58:17 +02:00
Leonard Gram
1586a42a71 ci: Only publish grafana enterprise packages tagged with enterprise. 2018-07-03 09:25:51 +02:00
Martin Packman
6046c8b4ca Make table sorting stable when null values exist (#12362)
Currently if a null appears in a table column, for instance in data
returned by postgres, sorting on that gives an arbitrary order. This
is due to null being neither greater or less than any string, which
makes the sort unstable.

Change the table sort function to compare on nullness first. Note
this is a slight behaviour change for numbers, which would otherwise
treat null and 0 as equivalent.

Signed-off-by: Martin Packman <gzlist@googlemail.com>
2018-07-02 11:14:41 -07:00
David
0d1f7c8782 Fix bar width issue in aligned prometheus queries (#12483)
* Fix bar width issue in aligned prometheus queries

This was broken because null values were filled in with unaligned times.

* use aligned times for result transformation
* add tests

An earlier version of this fix aligned the times again in the transformer, but
I think it's safe to only deal with aligned times in the response.

* Fixed prometheus heatmap tranformer test

The interval needs to be 1 to prevent step alignment.
2018-07-02 11:04:36 -07:00
zicklam
a89351e8e0 correct example (#12481)
foo.bar.com in description, but foo.bar in configuration.
Updated description, makes more sense then changing the configuration :)
2018-07-02 09:01:42 -07:00
Torkel Ödegaard
37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Leonard Gram
5e08bf5130 test: fixed usage of wrap in tests. 2018-07-02 17:13:59 +02:00
Leonard Gram
4245f0ce11 ci: typo 2018-07-02 16:10:20 +02:00
Leonard Gram
8d6797c367 ci: publishes grafana enterprise to s3. 2018-07-02 16:05:23 +02:00
Torkel Ödegaard
6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Tobias Skarhed
2941dff428 Karma to Jest: datasource_srv (#12456)
* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* alerting: only log when screenshot been uploaded

* Remove comments

* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* Remove comments

* Remove console.log

* Remove console.log

* Change sorting and add test for default data source
2018-07-02 04:18:23 -07:00
Torkel Ödegaard
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
Mitsuhiro Tanda
aa1b5959da omit extra template refresh (#12454) 2018-07-01 22:56:24 -07:00
Carl Bergquist
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
Sven Klemm
1601f6d17c [mysql] fix $__timeGroup rounding (#12469)
* fix $__timeGroup rounding for mysql

* revert accidentally commented out line
2018-07-01 06:59:05 -07:00
Sven Klemm
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
Sven Klemm
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
Will Weber
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
Carl Bergquist
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
Marcus Efraimsson
845724e8b9
update mysql/mssql query/annotation help sections 2018-06-29 20:39:06 +02:00
Marcus Efraimsson
7a4858dd11
docs: update folders api 2018-06-29 20:24:02 +02:00
Austin Winstanley
59675dc564 Changed documentation for MSSQL and MySQL to reflect macro changes 2018-06-29 13:07:48 -05:00
Marcus Efraimsson
2835acf48c
docs: update scripted dashboard for v5 2018-06-29 19:36:15 +02:00
Marcus Efraimsson
4530925b9f
docs: update scripted dashboard for v5 2018-06-29 19:30:29 +02:00
Marcus Efraimsson
cdaeb1578d
docs: update organisation http api
make the distinction clearer between /api/org and /api/orgs and that
basic auth must be used for the /api/orgs resource
2018-06-29 19:10:42 +02:00
Marcus Efraimsson
aae3b568f3
docs: upd windows installation 2018-06-29 18:21:56 +02:00
bergquist
d440b9a8d1 registry: adds more comments 2018-06-29 11:58:54 +02:00
bergquist
f0f6d0e915 registry: adds comments to interfaces 2018-06-29 11:45:32 +02:00
Marcus Efraimsson
cb706bd059
changelog: update
[skip ci]
2018-06-29 10:52:42 +02:00
Marcus Efraimsson
32793350b8
changelog: update
[skip ci]
2018-06-29 10:49:36 +02:00
Marcus Efraimsson
0dd0b65900
changelog: add notes about closing #12438
[skip ci]
2018-06-29 10:48:50 +02:00
Marcus Efraimsson
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
bergquist
c4292b43f5 alerting: only log when screenshot been uploaded 2018-06-29 09:58:58 +02:00
bergquist
ce88e4b927 fixes typos
closes #12453
2018-06-29 09:35:31 +02:00
Austin Winstanley
9823da1cc5 Reverted yarn.lock to master 2018-06-29 03:54:43 +00:00
Austin Winstanley
afee29be68 Merge branch 'master' into macros/sql 2018-06-29 03:51:05 +00:00
Austin Winstanley
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
Austin Winstanley
84af033281 Merge branch 'master' of https://github.com/grafana/grafana 2018-06-29 03:32:18 +00:00
Austin Winstanley
d663122244 Merge branch 'master' of https://github.com/grafana/grafana into macros/sql 2018-06-29 03:31:23 +00:00
Marcus Efraimsson
fb2b2c9f65
changelog: add notes about closing #12444
[skip ci]
2018-06-28 16:39:38 +02:00
Marcus Efraimsson
d226383c4e
Merge pull request #12444 from grafana/revert-12299-10707_whitelist
Revert "auth proxy: use real ip when validating white listed ip's"
2018-06-28 16:31:26 +02:00
Marcus Efraimsson
8af5da7383
Revert "auth proxy: use real ip when validating white listed ip's" 2018-06-28 15:43:33 +02:00
Daniel Lee
7a2be69abc changelog: adds note for #11892 2018-06-28 14:46:40 +02:00