Torkel Ödegaard
6c0752473a
Sqlstore refactor ( #11908 )
...
* refactor: tracing service refactoring
* refactor: sqlstore to instance service
* refactor: sqlstore & registory priority
* refactor: sqlstore refactor wip
* sqlstore: progress on getting tests to work again
* sqlstore: progress on refactoring and getting tests working
* sqlstore: connection string fix
* fix: not sure why this test is not working and required changing expires
* fix: updated grafana-cli
2018-05-18 11:10:10 +02:00
David Kaltschmidt
e731c248d7
Prometheus step alignment: shift interval only on jitter
...
* only increase interval by step if jitter happened
* shift both start and end
* simplified tests by using low epoch numbers
2018-05-14 12:08:30 +02:00
David
06aca5e8b5
Merge branch 'master' into prometheus_align_queries
2018-05-08 12:22:55 +02:00
Mitsuhiro Tanda
253b2cc081
add test for prometheus table column title
2018-05-01 05:00:56 +09:00
Marcus Efraimsson
f112e38266
prometheus: convert metric find query tests to jest
2018-04-25 15:37:58 +02:00
David Kaltschmidt
707700ac7d
force GET for metadataRequests, w/ test
2018-04-24 16:26:46 +02:00
Julien Pivotto
1f1719c498
Fix #10555 #6888 Better escape for Prometheus variables
...
Prior this commit, C:\bar was escaped C:\\\bar. Should be C:\\\\bar.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu >
2018-03-29 09:49:15 +02:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
Mitsuhiro Tanda
c6fa0b90a7
prometheus editor: variable autocomplete support (PR #9988 )
...
* prometheus ace editor, template variable support
* minor fix
* support [[var]] notation
* don't remove last ] if token type is string
* Revert "don't remove last ] if token type is string"
This reverts commit bce5b2d56e .
* Revert "support [[var]] notation"
This reverts commit 10012f8ffe .
* fix token type and regex
2018-03-15 20:17:51 +03:00
Alexander Zobnin
46d2067af2
prometheus: add tests for heatmap mode
2018-03-12 17:37:21 +03:00
Alexander Zobnin
94cf560304
Merge remote-tracking branch 'upstream/master' into prometheus-heatmap
2018-03-12 17:16:02 +03:00
Alexander Zobnin
479209f483
prometheus: datasource refactor
2018-03-12 17:13:05 +03:00
Mitsuhiro Tanda
a83ede0193
support POST for query and query_range
2018-03-12 13:25:05 +09:00
Alexander Zobnin
e361a31a2a
prometheus: tests for heatmap format
2018-02-21 20:22:46 +03:00
Carl Bergquist
89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by
...
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
2018-01-22 10:42:20 +01:00
Craig Miskell
2e86985d44
Remove silly noise
2018-01-05 16:22:49 +13:00
Craig Miskell
f9fb315dbd
Update tests to match new reality, and rejig the implementation a bit to truly work as desired
2018-01-05 16:20:54 +13:00
bergquist
1f9e2ef6ec
prom: fixes broken test
2017-12-28 16:43:48 +01:00
Mitsuhiro Tanda
e3274d6765
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
2017-12-26 01:57:10 +09:00
Torkel Ödegaard
3a1f52d8a2
prettier: ran on all files again, sorry. now settings are defined in package.json
2017-12-21 08:39:31 +01:00
Torkel Ödegaard
fadfc665e4
tech: ran pretttier on all typescript files
2017-12-19 16:06:54 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Mitsuhiro Tanda
e8a6af7b22
fix templating undefined error ( #10004 )
2017-12-02 17:21:21 +01:00
Carl Bergquist
af5ced0e18
Revert "prometheus nested query support"
2017-11-30 15:06:02 +01:00
Carl Bergquist
98f0305e68
Merge pull request #9983 from mtanda/prometheus_nested
...
prometheus nested query support
2017-11-30 14:57:34 +01:00
Mitsuhiro Tanda
98bb8bf761
prometheus nested query support
2017-11-29 18:34:44 +09:00
Torkel Ödegaard
e98af1b3fa
updated libs and fixed new typescript errors
2017-11-27 12:14:57 +01:00
Carl Bergquist
5d6ed6c45f
prom: add support for default step param ( #9866 )
...
Alerting for prometheus have been depending on the step parameter from each query.
In https://github.com/grafana/grafana/pull/9226 we changed the behavior for step in the
frontend which caused problems for alerting. This commit fixes that by introducing a default
min interval value so alerting always have something to depend on.
closes #9777
2017-11-15 11:22:00 +01:00
bergquist
c2c5f529f3
prometheus: add builtin template variable as range vectors
...
add $__interval and $__interval_ms as range vectors to
prometheus editor
2017-10-18 14:03:23 +02:00
Torkel Ödegaard
8d68bd6bb9
fix: fixed prometheus step issue that caused browser crash, fixes #9575
2017-10-18 13:28:18 +02:00
Torkel Ödegaard
b228c23dbe
testing: fixing tests
2017-10-07 22:05:31 +02:00
Carl Bergquist
8e4efeeece
Merge pull request #9208 from mtanda/prometheus_ace_complete_improve_label_name_complete
...
(prometheus) support label name/value completion
2017-10-05 14:54:07 +02:00
Alin Sinpalean
9cf7a2d2ed
Remove apparently unnecessary .flush() calls.
2017-10-04 16:23:24 +02:00
Alin Sinpalean
bb8849785a
Have include intervalFactor in its calculation, so always equal to the step query parameter.
2017-09-27 14:20:51 +02:00
Alin Sinpalean
f25aeadf21
Resolve merge conflicts with remote/master.
2017-09-26 17:55:30 +02:00
Carl Bergquist
da3aea5e0a
Merge pull request #9186 from mtanda/prometehus_instant_query2
...
(prometheus) instant query support
2017-09-26 14:37:10 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Mitsuhiro Tanda
5bdd554671
check args for query
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
6bf8144793
add test for completer
2017-09-13 16:34:28 +09:00
Alin Sinpalean
2a62374a61
Prometheus: Rework the interaction between auto interval (computed based on graph resolution), min interval (where specified, per query) and intervalFactor (AKA resolution, where specified, per query).
...
As a bonus, have and reflect the actual interval (not the auto interval), taking into account min interval and Prometheus' 11k data points limit.
2017-09-12 16:36:27 +02:00
Torkel Ödegaard
3c16230158
prometheus: added completer unit test, #9208
2017-09-12 11:05:32 +02:00
Mitsuhiro Tanda
6f8110956d
(prometheus) support instant query for table format, use checkbox to switch query type
2017-09-08 01:15:07 +09:00
Mitsuhiro Tanda
56cb16ff5b
(prometheus) instant query support
2017-09-07 18:03:53 +09:00
Mitsuhiro Tanda
4446e95155
(prometheus) cache metric suggest query result ( #9182 )
...
* (prometheus) cache metric suggest query result
* add test
2017-09-07 10:09:59 +02:00
Alin Sinpalean
5bffdfe9a4
When converting Prometheus results to table, handle the case where the returned series have non-uniform sets of labels. ( #8826 )
2017-07-12 06:52:59 +02:00
Torkel Ödegaard
6ff1144abf
refactoring: prometheus PR #6140
2017-04-25 12:57:23 +02:00
Torkel Ödegaard
49fe74228b
fix(browser history): fixes and enhancements to browser history, it now works properly again AND it can restore previous time ranges in dashboards, closes #7259
2017-01-13 17:37:53 +01:00
Mitsuhiro Tanda
d018d2a23f
(prometheus) table support
2016-11-23 17:18:37 +09:00
Mitsuhiro Tanda
66bcae353c
(prometheus) pass dashboard time range to template query ( #5007 )
...
* (prometheus) pass dashboard time range to template query
* (prometheus) add passing time test of templating
2016-05-18 07:56:23 +02:00
Torkel Ödegaard
82ad5a632d
tech(): fixed broken tests due to angularjs upgrade
2016-03-28 20:44:32 +02:00