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
bergquist
ea4ef47982
prometheus: change default resolution to 1/1
...
this should make the value of the step value more
consistant for most users
ref #9705
2017-12-15 14:24:31 +01:00
Torkel Ödegaard
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
Carl Bergquist
f5d26bfcc9
Merge pull request #10050 from davkal/davkal/multi-query-table
...
Add support to render values of multiple queries in the same table
2017-12-14 15:57:07 +01:00
David Kaltschmidt
8d70f13393
Type-agnostic row merge in table transform for multiple queries
...
* moved unique value naming to datasource (credit: @bergquist)
* merge rows based on same column-values and empty values
* expanded tests
2017-12-11 12:42:53 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
bergquist
48d9d0d356
prom: enable min interval per panel
...
This commit makes it possible to set min interval per panel.
Overrides the value configured on the datasource.
ref #9705
2017-12-06 13:51:19 +01:00
Patrick O'Carroll
3aa1cb012a
added tooltip, fixes #10092 ( #10097 )
...
* added tooltip, fixes #10092
* fixed code formatting
2017-12-06 12:13:17 +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
Patrick O'Carroll
27e486d678
converted 3 .js files to .ts ( #9958 )
...
* converted files from .js to .ts
2017-11-22 10:11:50 +01:00
bergquist
0390b4187b
prom: add prom2 dashboard as bundled dashboard
2017-11-21 10:12:24 +01:00
Cody Boggs
999b1211b6
show top 5 max scrape durations by job, and fix legend format
2017-11-21 10:12:24 +01:00
Cody Boggs
9151a2468d
fix scrape duration, add rule eval iteration stats, and reorg a bit
2017-11-21 10:12:24 +01:00
Cody Boggs
29de4e7c53
fix data source var and remove node_exporter dependency
2017-11-21 10:12:24 +01:00
Cody Boggs
d5ef0403af
First draft of a Prometheus 2.0 Stats dashboard
2017-11-21 10:12:24 +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
Torkel Ödegaard
74fcb2494a
prometheus: fixed unsaved changes warning when changing time range due to step option on query model was changed in datasource.query code, fixes #9675
2017-10-26 11:46:33 +02:00
bergquist
beb203209b
prom: adds pre built grafana dashboard
2017-10-24 11:01:08 +02:00
Carl Bergquist
e8141b48d2
Merge pull request #9555 from mtanda/prometheus_46_improve_minor_fix
...
(prometheus) minor fix of auto complete
2017-10-19 10:42:34 +02: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
Carl Bergquist
e8da084baf
Merge pull request #9561 from mtanda/prometheus_46_fix_range
...
(prometheus) fix to show vector range popup
2017-10-18 13:39:57 +02:00
Torkel Ödegaard
8d68bd6bb9
fix: fixed prometheus step issue that caused browser crash, fixes #9575
2017-10-18 13:28:18 +02:00
Mitsuhiro Tanda
8a43d4e25c
fix vector range
2017-10-17 21:27:04 +09:00
Mitsuhiro Tanda
ebebbddb2d
allow ":" character for metric name
2017-10-17 19:44:59 +09:00
Mitsuhiro Tanda
c4c64365f1
remove duplicative prometheus function
2017-10-17 12:24:29 +09:00
Mitsuhiro Tanda
c51f84a12e
remove label match operator from keyword.operator
2017-10-17 12:19:56 +09:00
Mitsuhiro Tanda
8580b78ce6
remove label match operator from keyword.operator
2017-10-17 12:19:42 +09:00
Mitsuhiro Tanda
cc1e69ace3
remove extra state push
2017-10-17 11:50:33 +09: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
02d426a2d4
Merge branch 'master' into adjust_interval_variable_with_min_step
2017-10-04 15:30:38 +02:00
Alin Sinpalean
080c46f835
Address review comments.
2017-10-04 15:30:07 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +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
Mitsuhiro Tanda
1a5e786467
fix
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
56c0d91ee5
follow token name change
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
d530ccff1c
(prometheus) support label value completion
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
40b74e6664
(prometheus) support label name completion
2017-09-13 16:34:28 +09:00
Mitsuhiro Tanda
b349b3ef55
provide ace editor for external datasource plugin ( #9224 )
2017-09-13 09:29:53 +02: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
Torkel Ödegaard
f6100dd8eb
ux: success/error alerts refactoring, #9214
2017-09-12 09:05:32 +02:00
Mitsuhiro Tanda
f5a17e535b
minor fix
2017-09-11 13:11:45 +09:00
Torkel Ödegaard
2953d64429
prometheus: minor update to focus editor PR, #9201
2017-09-08 11:43:29 +02:00
Mitsuhiro Tanda
7c566a6539
fix to focus first query
2017-09-08 12:33:36 +09:00
Mitsuhiro Tanda
ce0de35a6c
set give focus in code editor
2017-09-08 11:49:41 +09: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
e98254e1e3
show only label name in label matcher ( #9167 )
2017-09-07 10:10:52 +02: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
Torkel Ödegaard
dda1cf1a88
Merge branch 'ace-editor'
2017-08-29 15:52:03 +02:00
Alin Sinpalean
bdd239e933
Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000. ( #9109 )
2017-08-29 09:57:45 +02:00
Alexander Zobnin
f7ec8e0de0
Merge branch 'master' into ace-editor
2017-08-24 12:37:18 +03:00
Torkel Ödegaard
d4dd0222fa
fix: prometheus does not have two editor modes, fixes #9025
2017-08-11 12:33:56 +02:00
Torkel Ödegaard
149e694ce6
ace: prometheus completion improvements
2017-08-10 10:08:09 +02:00
Torkel Ödegaard
0b2cc404ff
ace: working on editor completion stuff
2017-08-10 09:33:17 +02:00
Torkel Ödegaard
459a8ed695
ace: minor changes to ace directive
2017-08-09 11:43:02 +02:00
Torkel Ödegaard
80f5c914e8
ace: removed the old text areas
2017-08-09 11:06:21 +02:00
Alexander Zobnin
1c8c746956
code-editor: prometheus metrics autocomplete
2017-08-09 10:58:00 +03:00
Alexander Zobnin
aa670244f1
code-editor: initial prometheus syntax definition
2017-08-08 22:27:47 +03:00
Alexander Zobnin
e0bbb74b0c
code-editor: test editors for MySQL and prometheus
2017-08-08 18:42:26 +03:00
Kakuya Ando
bbfdfc012f
fix(prometheus) when tag value duplicate, tags not working. ( #8040 )
2017-07-21 09:51:25 +02:00
Mitsuhiro Tanda
aecc6860e3
set focus on text field when opening panel/query editor ( #8879 )
...
* (prometheus) set focus to top expression when opening editor
* (text panel) set focus to top expression when opening editor
2017-07-19 10:33:04 +02:00
Alexander Gängel
4073949af0
add templating for prometheus monitoring other promethues ( #8845 )
2017-07-18 19:52:29 +02:00
Mitsuhiro Tanda
a6920eb2ff
(prometheus) replace each by for ( #8881 )
2017-07-18 19:50:44 +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
9045be5689
fix: Prometheus & hidden queries caused no metric query to be issued, fixes #8413
2017-05-19 10:24:47 +02:00
Mitsuhiro Tanda
5e85558e9e
(prometheus) fix graph link ( #8349 )
2017-05-11 14:24:13 +02:00
Torkel Ödegaard
ed8d284715
docs: updated prometheus docs
2017-05-03 15:50:38 +02:00
Torkel Ödegaard
6ff1144abf
refactoring: prometheus PR #6140
2017-04-25 12:57:23 +02:00
Ivan Babrou
fb163450a5
Change prometheus semantics from step to min step ( #8073 )
...
Previously `Step` parameter would set a hard value for any zoom level.
Now it's renamed to `Min step` and sets the minimal value of `step` parameter
to Prometheus query. User would usually want to set it to the scraping interval
of the target metric to avoid having shap cliffs on graphs and extra load
on Prometheus. Actual `step` value is calculated as the minimum of automatically
selected step (based on zoom level) and user provided minimal step. If user
did not provide the step, then automatic value is used as is.
Example bahavior for `60s` scrape intervals:
* `5s` automatic interval, no user specified min step:
* Before: `step=5`
* After: `step=5`
* `5s` automatic interval, `1m` user specified min step:
* Before: `step=5`
* After: `step=60`
* `5m` automatic interval, `1m` user specified min step:
* Before: `step=60` (not really visible, too dense)
* After: `step=300` (automatic value is picked)
See:
* https://github.com/grafana/grafana/issues/8065
* https://github.com/prometheus/prometheus/issues/2564
2017-04-14 14:51:22 +02:00
Daniel Lee
69bec98962
chore: update all grafana.org urls to .com
2017-03-21 15:37:55 +01:00
Daniel Lee
6799b766a4
Merge pull request #7775 from hagen1778/prometheus-textarea-query
...
Make Prometheus query field a textarea #7663
2017-03-11 14:00:37 +01:00
Mitsuhiro Tanda
be123a07c5
(prometheus) adjust annotation step ( #7768 )
...
* (prometheus) adjust annotation step
* (prometheus) add step option
2017-03-09 06:53:50 +01:00
hagen1778
04d90d7139
Make Prometheus query field a textarea #7663
2017-03-08 21:30:20 +02:00
Simon Effenberg
a4318e41f8
fixing little spelling issue ( #7603 )
2017-02-18 17:21:29 +01: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
Paul Traylor
a45a487ad3
Update query for "Rule Eval Duration" ( #6294 )
...
This query was changed to use seconds in f69e668fc4
2016-10-17 08:37:59 +02:00
bergquist
0d4b00df95
feat(alerting): add template validation for influxdb
...
closes #6230
2016-10-11 16:03:00 +02:00
Mitsuhiro Tanda
593863fb9e
(prometheus) check time range ( #6137 )
2016-09-28 11:54:25 +02:00
Torkel Ödegaard
22e8885690
feat(testdata): progress on test data stuff
2016-09-27 18:36:00 +02:00
bergquist
d711c0ed35
Merge branch 'master' into alert_prometheus
2016-09-22 19:27:24 +02:00
bergquist
4c88db3e43
feat(prometheus): add support for legend formatting
2016-09-21 11:17:29 +02:00
Torkel Ödegaard
46ebae7304
feat(templating): progress on template system rewrite #6048
2016-09-16 16:50:30 +02:00
Torkel Ödegaard
83b9db51e3
feat(templating): great progress on adhoc filters, #6038
2016-09-14 17:36:28 +02:00
Torkel Ödegaard
649d9f9177
tech(lodash): upraded lodash to 4.15.0, closes #6021
2016-09-14 09:17:10 +02:00
Mitsuhiro Tanda
9d09e5bbd0
(prometheus) fix template variable expansion in legend
2016-09-09 00:46:04 +09:00
Mitsuhiro Tanda
d9fe41cc8d
(prometheus) refactor time calculation
2016-08-20 22:51:33 +09:00
Roman Vynar
d086f5d398
Align step with interval passed to Prometheus query using rate() ( #5839 )
2016-08-18 08:19:32 +02:00
Torkel Ödegaard
3ae327320a
fix(prometheus): fixed svg link in prometheus dashboard, fixes #5604
2016-07-18 16:27:02 +02:00
stuart nelson
eb35f8cb89
[prometheus] Use panelId and target.refId for requestId
...
Using these two values ties requests to a
particular query position within a panel, ensuring
that requests are canceled if:
- Duplicate requests with the same query are sent
- Requests from the same query position (but a
different query) are sent
The last point is important as it identifies
queries by a physical location in the dashboard
instead of with the query expression. If a
different query from the same position in a panel
is sent, the previous request should be canceled.
2016-07-11 14:47:14 +02:00
Torkel Ödegaard
9f9fca1e76
feat(datasource): added suggest urls for each data source, #4577
2016-06-17 13:35:29 +02:00
Torkel Ödegaard
81e9aa4de4
feat(datasource): cancel in flight data source requests, refeatoring #5321
2016-06-16 10:48:26 +02:00
stuart nelson
cc64d65c2f
Rename cacheKey to exprID/requestID
...
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
2016-06-09 12:57:55 +02:00
stuart nelson
efdb990e56
Return an error for a canceled request.
...
Allow the datasource to decide how to handle a
canceled request.
2016-06-09 12:13:17 +02:00
stuart nelson
bc7c2cd3f5
Create cacheKey at top-level
...
Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
implementation of `query`.
2016-06-09 11:36:46 +02:00
stuart nelson
18f9f6c159
Add in-flight identifier for Prometheus requests
...
Repeat Prometheus requests with the same query
will cancel preceding requests.
2016-06-08 18:05:46 +02:00
Mitsuhiro Tanda
9c672f6ec1
(prometheus) support new legend format (with backward compatibility) ( #5096 )
...
* (prometheus) support new legend format (with backward compatibility)
* (prometheus) use regex replace for legend format
* (prometheus) allow white space
2016-05-20 12:29:10 +02:00
Torkel Ödegaard
91c6ebb06c
Merge branch 'v3.0.x'
2016-05-20 09:06:39 +02:00
Torkel Ödegaard
df0ddc0b50
fix(prometheus): fixed bug in prometheus query editor, fixes #5107
2016-05-20 09:03:52 +02:00
Torkel Ödegaard
03551a5961
Merge remote-tracking branch 'origin/development'
2016-05-18 14:23:21 +02:00
Mitsuhiro Tanda
a86d218891
(prometheus) fix metric find query
2016-05-18 16:36:57 +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
Mitsuhiro Tanda
8d2f350ad1
(prometheus) fix prometheus link
2016-05-18 07:50:30 +02:00
Mitsuhiro Tanda
fc1891320e
(prometheus) fix prometheus link ( #5074 )
2016-05-18 07:49:32 +02:00
joelanford
cbefd8f8ae
Fixed legend labeling bug in Prometheus datasource ( #4858 )
2016-04-30 16:40:41 +02:00
Torkel Ödegaard
206cb51219
feat(query editors): updated prometheus editor
2016-04-27 10:50:29 +02:00
Torkel Ödegaard
329ee8d9f1
fix(prometheus): added template variable escape format to prometheus annotations queries, fixes #4656
2016-04-12 10:50:58 -04:00
Pascal Borreli
eb850ddd36
doc(plugins): typo
2016-03-31 11:43:04 +01:00
Daniel Lee
45b90972dc
feat(plugins): adds a readme for every native plugin
2016-03-30 23:33:30 +02:00
Torkel Ödegaard
82ad5a632d
tech(): fixed broken tests due to angularjs upgrade
2016-03-28 20:44:32 +02:00
Torkel Ödegaard
82eb32a71e
ux(): initial pass at new card / list design, #4364
2016-03-15 09:15:24 +01:00
Torkel Ödegaard
d575a5ce12
feat(plugins): added prometheus dashboard to prometheus data source, #4298
2016-03-12 10:40:55 +01:00
Torkel Ödegaard
8ed8bfb8bc
feat(prometheus): added special regex escape for prometheus, fixes #4234
2016-03-03 10:49:30 +01:00
Torkel Ödegaard
0da4168836
fix(prometheus): fixed templating issue with prometheus for when using variable with non regex operator, #2918
2016-03-01 21:35:55 +01:00
Torkel Ödegaard
d1bac6cde0
feat(templating): prometheus now works with new template variable formating/escaping, #2918
2016-03-01 16:11:05 +01:00
Mitsuhiro Tanda
3125177e5c
(prometheus) fix label_values() templating
2016-02-28 13:33:29 +09:00
Torkel Ödegaard
30f3b55baf
fix(prometheus): set default templating format to pipe
2016-02-25 10:26:07 +01:00
Torkel Ödegaard
22ae259cf5
ux(): varios tweaks and polish
2016-02-24 17:49:08 +01:00
bergquist
f225bb0032
ux(annotations): migrate annotations editors to new form
2016-02-22 10:07:02 +01:00
Mitsuhiro Tanda
5c7689388d
fix template url for annotation editor
2016-02-10 11:42:59 +09:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
Mitsuhiro Tanda
2cce057df1
(prometheus) add query result template query
2016-02-09 01:37:43 +09:00
Carl Bergquist
a3b6efdbfa
Merge pull request #2883 from mtanda/prometheus_annotation_support
...
Prometheus annotation support
2016-02-08 14:51:59 +01:00
Torkel Ödegaard
801129530e
feat(plugins): base clases are now in app/plugins/sdk
2016-02-05 18:08:21 +01:00
Torkel Ödegaard
273fbaac68
refactor(): minor changes
2016-02-05 10:37:14 +01:00
Mitsuhiro Tanda
20283a46f9
fix annotation editor error
2016-02-04 14:14:19 +09:00
Mitsuhiro Tanda
634699c8e2
fix prometheus datasource plugin
2016-02-04 14:10:27 +09:00
Mitsuhiro Tanda
7d97f381cf
fix tslint error
2016-02-04 14:09:59 +09:00
Mitsuhiro Tanda
7a1326ff14
follow new plugin format
2016-02-04 14:06:01 +09:00
Mitsuhiro Tanda
ee84d4371b
fix prometheus annotation, reflect API change
2016-02-04 14:05:51 +09:00
Mitsuhiro Tanda
f8b05e0f42
add prometheus annotation query
2016-02-04 14:05:44 +09:00
Torkel Ödegaard
fc829b32d9
feat(plugins): minor fixes to breaking out query editor row into reusable component
2016-02-02 16:57:05 +01:00
Torkel Ödegaard
f2700822e9
feat(plugins): extracted first plugin row to its own component
2016-02-02 16:32:36 +01:00
Torkel Ödegaard
21f6c07686
feat(plugins): more progress on plugin editors
2016-02-02 15:15:20 +01:00
Torkel Ödegaard
356f7b9db6
feat(plugins): good progress on converting query editors, graphite's query ctrl is now working as is unit tests
2016-02-02 13:07:54 +01:00
Torkel Ödegaard
822c8f1575
feat(plugins): migrating graphite query editor to new model
2016-02-02 12:52:43 +01:00
