Commit Graph

5717 Commits

Author SHA1 Message Date
Tobias Skarhed
6670acd082 Remove irrelevant tests and templateSrv stub 2018-07-09 12:52:56 +02:00
Tobias Skarhed
74bf80962d Add mock to test files 2018-07-04 14:32:22 +02:00
Tobias Skarhed
962340bcd1 Create new instance in beforeEach 2018-07-04 14:32:22 +02:00
Tobias Skarhed
a37a0c7be3 Remove comments 2018-07-04 14:32:22 +02:00
Tobias Skarhed
42ba0dc73f Karma to Jest: Cloudwatch datasource 2018-07-04 14:32:22 +02:00
Tobias Skarhed
d4bd52139a Karma to Jest: MySQL datasource 2018-07-04 14:30:36 +02:00
Tobias Skarhed
3bbe39c5ad Karma to Jest: postgres datasource 2018-07-04 14:30:36 +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
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
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
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
bergquist
ce88e4b927 fixes typos
closes #12453
2018-06-29 09:35:31 +02:00
Daniel Lee
8537f10285
Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option
Make colorization of prefix and postfix optional in singlestat
2018-06-28 14:42:48 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414)
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
2018-06-28 04:43:23 -07:00
Tobias Skarhed
443ff5deb4 Karma to Jest: value_select_dropdown (#12435)
* Begin Karma 2 Jest: value_select_dropdown

* Add return for Promise

* Remove Karma test
2018-06-28 03:10:36 -07:00
Marcus Efraimsson
ceba0490f8
Merge pull request #12395 from grafana/11968_variable_key_value
Set correct text in drop down when variable is present in url
2018-06-26 10:29:21 +02:00
Aman
e11f6f5cdf
Make pre/postfix coloring checkboxes inactive when gauge is active 2018-06-26 13:06:26 +05:30
Marcus Efraimsson
98a7f258af
Merge pull request #12392 from dehrax/12248-fix
Fix selecting current dashboard from search does not reload dashboard
2018-06-25 15:21:24 +02:00
Marcus Efraimsson
5280084480
set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
Tobias Skarhed
762ee203fa Fix 12248 2018-06-25 13:46:33 +02:00
rozetko
97db9ece98 Set $rootScope in DatasourceSrv 2018-06-22 16:17:02 +03:00
Aman
1dd65f7a39
Add options to colorize prefix and postfix in singlestat 2018-06-22 14:50:04 +05:30
Daniel Lee
b2187b70a7
Merge pull request #11990 from mtanda/issue_11925
fix "Cloudwatch panel does not allow arbitrary variable values in query"
2018-06-21 18:00:49 +02:00
Daniel Lee
75e378b689
Merge pull request #12367 from dehrax/12224-history-ctrl
Karma to Jest: history_ctrl
2018-06-21 14:52:01 +02: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
Daniel Lee
6871f4c14e
Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb
Conditionally select a field to return in ResponseParser for InfluxDB
2018-06-21 12:25:15 +02:00
Tobias Skarhed
4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson
051ddb245d
Merge pull request #12346 from grafana/12256_export
Make sure to process panels in collapsed rows when exporting dashboard
2018-06-20 13:17:32 +02:00
Marcus Efraimsson
296a841685
Merge pull request #12123 from alexanderzobnin/fix-11792
graph: fix legend decimals precision calculation
2018-06-20 13:08:17 +02:00
Marcus Efraimsson
4ef4a4d3a7
dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Marcus Efraimsson
41ac8d4cd5
fix regressions after save modal changes of not storing time and variables per default
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
2018-06-20 09:52:29 +02:00
Tobias Skarhed
3a9a36d6cf Karma to Jest: history_srv (#12341)
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
2018-06-19 08:05:49 -07:00
Marcus Efraimsson
a2e08dc4e8
make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303)
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
2018-06-18 09:47:23 -07:00
Tobias Skarhed
5bf72fc9f4 Karma to Jest: team_details_ctrl (#12321) 2018-06-18 07:54:56 -07:00
Marcus Efraimsson
9271e48513
Merge pull request #12317 from grafana/12278_snapshot_annotations
Copy correct annotation props when creating a snapshot
2018-06-18 11:24:04 +02:00
Marcus Efraimsson
a738347957
snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +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
f0254c201a
Merge pull request #12215 from ryantxu/use-ng-if-for-time
use ng-if for the panel timeInfo
2018-06-15 12:16:48 +02:00