Commit Graph

15101 Commits

Author SHA1 Message Date
Torkel Ödegaard
b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard
645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Marcus Efraimsson
922371ba76
changelog: add notes about closing #12379
[skip ci]
2018-07-06 17:48:39 +02:00
Marcus Efraimsson
319488676f
Merge pull request #12521 from grafana/davkal/fix-datasource-sort
Fix datasource sorting with template variables
2018-07-06 16:18:02 +02:00
David Kaltschmidt
7ddcaf22d5 Fix datasource sorting with template variables
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
2018-07-06 15:32:08 +02:00
Marcus Efraimsson
f2980bb978
changelog: add notes about closing #12484
[skip ci]
2018-07-06 12:55:12 +02:00
Marcus Efraimsson
cbdf6ef355
changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:53:10 +02:00
Marcus Efraimsson
1db067f2ad
Merge pull request #12511 from alexanderzobnin/fix-12484
Prometheus heatmap: fix unhandled error when some points are missing
2018-07-06 12:50:04 +02:00
Marcus Efraimsson
af434df5a3
changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:35:19 +02:00
Marcus Efraimsson
926892749f
Merge pull request #12518 from grafana/12506_dash_links
Fix links not updating after changing variables
2018-07-06 12:33:19 +02:00
Marcus Efraimsson
5e4d6958d6
fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Alexander Zobnin
36f08994cc
prometheus heatmap: fix unhandled error when some points are missing 2018-07-05 16:33:52 +03:00
Marcus Efraimsson
50a522d418
fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Marcus Efraimsson
240cf63ba6
changelog: add notes about closing #11618 #11619 2018-07-04 20:07:43 +02:00
Marcus Efraimsson
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
Marcus Efraimsson
ea9964cfa1
Merge pull request #12493 from dehrax/12224-datasource-elastic
Karma to Jest: elasticsearch datasource
2018-07-04 14:03:25 +02:00
Marcus Efraimsson
e8ee1be5e4
Merge pull request #12502 from Nexucis/feature/api-doc-improve
Fix HTTP-API admin doc
2018-07-04 13:52:13 +02:00
Tobias Skarhed
d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed
8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed
80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed
69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed
bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Marcus Efraimsson
a8970a4de9
run enterprise build only on master for now 2018-07-04 13:09:42 +02:00
Augustin Husson
86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson
991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson
01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
Marcus Efraimsson
d2f31a716f
remove unnecessary conversions 2018-07-04 12:16:39 +02:00
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