IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
18,512 Commits 5,416 Branches 554 Tags
a9e98feea0c49c0ca476764f59125f128df7d3ec
Commit Graph

38 Commits

Author SHA1 Message Date
Torkel Ödegaard
8497c854f6 Adding mixed query 2018-12-12 08:54:12 +01: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
Sven Klemm
00524e6827 prevent angular from evaluating {{hostname}} in tooltip (#11514) 2018-04-09 12:51:17 +02: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
Carl Bergquist
da3aea5e0a Merge pull request #9186 from mtanda/prometehus_instant_query2 
(prometheus) instant query support
 2017-09-26 14:37:10 +02:00
Mitsuhiro Tanda
b349b3ef55 provide ace editor for external datasource plugin (#9224) 2017-09-13 09:29:53 +02: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
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
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
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
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
hagen1778
04d90d7139 Make Prometheus query field a textarea #7663 2017-03-08 21:30:20 +02:00
Mitsuhiro Tanda
d018d2a23f (prometheus) table support 2016-11-23 17:18:37 +09:00
Torkel Ödegaard
206cb51219 feat(query editors): updated prometheus editor 2016-04-27 10:50:29 +02: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
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
efdd4a6682 feat(plugins): more work on plugin editors,prometheus query editor is working 2016-02-02 10:19:15 +01:00
Torkel Ödegaard
eaaf9246b7 feat(plugins): more work on refining datasource editors 2016-02-02 09:12:58 +01:00
Torkel Ödegaard
b1bfd35968 feat(datasources): last fixes for data sources 2016-02-01 17:06:44 +01:00
Mitsuhiro Tanda
c1d592b72c fix, call linkToPrometheus() directly 2015-10-23 09:58:42 +09:00
Mitsuhiro Tanda
fcaecf4782 revert prometheus link 2015-10-23 01:35:34 +09:00
Torkel Ödegaard
f11785001c docs: minor fix 2015-10-06 17:51:22 +02:00
Torkel Ödegaard
106fe4854f Merge branch 'prometheus' of github.com:grafana/grafana 
Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js
 2015-10-06 16:36:58 +02:00
Torkel Ödegaard
44d377b810 feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code 2015-10-06 14:34:44 +02:00
Mitsuhiro Tanda
d0b744387b fix unmatched tag 2015-10-01 01:33:13 +09:00
Jimmi Dyson
bf98cfeadc Add prometheus datasource 2015-09-28 23:15:33 +01:00