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
13,656 Commits 5,416 Branches 554 Tags
930d00b5137c7088ecf8b57d0691a99dc8b7f794
Commit Graph

5232 Commits

Author SHA1 Message Date
flopp999
6718915a23 Changed Swedish and Icelandic currency 
Swedish krone -> Swedish krona
Icelandic krone - > Icelandic króna
 2018-03-16 19:46:20 +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
Marcus Efraimsson
91fa076fb3 folders: should be possible to browse folder using only uid 
That is, the slug part of url should be optional.
 2018-03-13 21:32:37 +01:00
Marcus Efraimsson
5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Alexander Zobnin
560aec50b3 Merge PR #8613 2018-03-13 15:36:32 +03:00
Alexander Zobnin
30d077d1d1 graph: minor refactor of histogram mode PR #8613 2018-03-13 15:25:28 +03:00
Alexander Zobnin
38a19f7c90 Merge branch 'histogram_multi' of https://github.com/mtanda/grafana into mtanda-histogram_multi 2018-03-13 13:18:55 +03:00
Carl Bergquist
6df13252bf Merge pull request #11143 from ApsOps/colorize-singlestat-prefix-postfix 
Add color to prefix and postfix in singlestat panel
 2018-03-13 10:41:40 +01:00
Yohann BARRE
a3388ef45f Second to HH:mm:ss formatter (#11105) 
* Seconds to HH:MM:SS format
 2018-03-13 09:52:41 +01:00
Carl Bergquist
bf6ff50d0b Merge pull request #11087 from alexanderzobnin/prometheus-heatmap 
Prometheus heatmap support
 2018-03-13 09:44:25 +01:00
flopp999
185aa6d47b Added concentration units and "Normal cubic metre" 
ppm, ppb, ng/m3, ng/Nm3, μg/m3, μg/Nm3, mg/m3, mg/Nm3, g/m3, g/Nm3, Nm3
ppm was moved from "Dimensionless" and "submenu" to "Concentration"
 2018-03-12 20:59:43 +01:00
Alexander Zobnin
989ba9763f prometheus: fix bug introduced by #9859 (httpMethod is undefined) 2018-03-12 19:41:07 +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
Carl Bergquist
e94d23e5ff Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter 
Cloudwatch dimension_values add dimension filter.
 2018-03-12 14:24:26 +01:00
Carl Bergquist
74602b1077 Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +01:00
Mitsuhiro Tanda
4e1501b172 set default value of httpMethod 2018-03-12 13:53:05 +09:00
Mitsuhiro Tanda
a83ede0193 support POST for query and query_range 2018-03-12 13:25:05 +09:00
Jiri Tyr
6bfed903c4 Adding Timeticks unit 2018-03-09 17:20:24 +00:00
bergquist
0ee6a5216b Merge branch 'master' of https://github.com/mayli/grafana into mayli-master 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:50:02 +01:00
Carl Bergquist
a589f701ad Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
Carl Bergquist
b1494637d1 Merge pull request #11141 from mtanda/templating_comma_join 
add comma templating format
 2018-03-07 16:49:19 +01:00
Mitsuhiro Tanda
244cbe8cbd add csv templating format 2018-03-08 00:13:58 +09:00
Alexander Zobnin
759e05d09e heatmap: add explanation of Time series buckets mode 2018-03-07 17:08:34 +03:00
Aman
a94de51e5e Add color to prefix and postfix in singlestat 2018-03-07 19:36:42 +05:30
Alexander Zobnin
5e452e445c heatmap: able to set upper/lower bucket bound manually 2018-03-07 16:57:46 +03:00
Alexander Zobnin
18a90667ba heatmap: refactor 2018-03-07 16:33:33 +03:00
Daniel Lee
4acc8f8ad7 Merge pull request #11119 from bergquist/no_row_setting_viewer 
hide row actions for viewers
 2018-03-07 14:25:39 +01:00
Alexander Zobnin
a791a92d79 heatmap: fix Y axis and tooltip decimals and units issues 2018-03-07 13:28:44 +03:00
Daniel Lee
c657fe8875 Merge pull request #11092 from grafana/11091_anonymous_sign_in 
made drop-menu into link
 2018-03-07 10:54:48 +01:00
Daniel Lee
8e81dc1e79 scrolling: faster wheelspeed 
ref #11053
 2018-03-06 20:08:00 +01:00
Carl Bergquist
08f587a0ef Merge pull request #10838 from ilgizar/7107_right_y_axis 
Thresholds for Right Y axis
 2018-03-06 15:18:24 +01:00
Alexander Zobnin
0912f61ea3 heatmap: fix tooltip count and bucket bound format 2018-03-06 15:21:37 +03:00
bergquist
d3b23b01d8 hide row actions for viewers 
closes #11112
 2018-03-06 12:32:50 +01:00
Tony Dong
96504940a8 fix typo in heatmap rendering.ts (#11101) 2018-03-06 10:36:06 +01:00
Carl Bergquist
c372716692 Merge pull request #11109 from bergquist/unsaved_changes_fix 
ignore iteration property when checking for unsaved changes
 2018-03-06 10:33:27 +01:00
Carl Bergquist
1fe8b33f65 Merge pull request #11000 from victorclaessen/master 
Added radiation units
 2018-03-06 09:38:12 +01:00
bergquist
a7d62f44d3 ignore iteration property when checking for unsaved changes 
closes #11063
 2018-03-05 22:03:26 +01:00
Patrick O'Carroll
42cd462cbf made drop-menu into link 2018-03-05 14:09:04 +01:00
Alexander Zobnin
5037f93a78 heatmap: sort series before converting to heatmap. 
This allows to use histogram series from arbitrary datasource and display it properly.
 2018-03-05 14:01:55 +03:00
Julien Pivotto
69c93e6401 Fix Prometheus 2.0 stats (#11048) 
Fixes #11016

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-03 13:40:28 +01:00
Daniel Lee
cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +01:00
Alexander Zobnin
fa8403750b Merge remote-tracking branch 'upstream/master' into prometheus-heatmap 2018-03-01 11:09:04 +03:00
Alexander Zobnin
d6087eb5f4 heatmap: hide unused Y axis controls for tsbuckets mode 2018-02-28 16:30:00 +03:00
Alexander Zobnin
76c684cc01 heatmap: format numeric tick labels in tsbuckets mode 2018-02-28 16:19:58 +03:00
Alexander Zobnin
dfe8b0a0d2 heatmap: add rendering tests for tsbuckets mode 2018-02-28 15:58:28 +03:00
Torkel Ödegaard
e67b1ebf33 Merge branch 'master' of github.com:grafana/grafana 2018-02-28 13:06:16 +01:00
Marcus Efraimsson
576deb37e8 login: hide sign up if configured so. Fixes #11041 2018-02-28 13:01:35 +01:00
Torkel Ödegaard
0c6b34e216 Merge branch 'tag-variables' of https://github.com/DanCech/grafana into DanCech-tag-variables 2018-02-28 12:39:53 +01:00