IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,633 Commits 1,123 Branches 715 Tags
a8918047a24e084ce1bf31fc0eba3148a6e7097e
Commit Graph
13633 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist a8918047a2 Merge pull request #11238 from grafana/11155-mysql-issue 
middleware: recover and retry on session start
 2018-03-14 14:29:47 +01:00
Carl Bergquist 0ef94ea403 Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Carl Bergquist a0a57ac33a Merge pull request #11236 from grafana/alerting_collapsed_panels 
alerting: supports extracting alerts from collapsed panels
 2018-03-14 14:16:50 +01:00
Daniel Lee 5f511deefc middleware: recover and retry on session start 
Partial fix for #11155 - the Macaron session middleware
panics if mysql returns an error. This fix recovers from
the panic and retries once
 2018-03-14 12:26:59 +01:00
bergquist be7ec310b1 alerting: supports extracting alerts from collapsed panels 
collapsed rows wrap the hidden rows within itself. This caused
the extractor to miss the panel and therefore delete the alert
accosiated with the graph.

closes #11222
 2018-03-14 11:23:16 +01:00
Carl Bergquist 9cae6f05b4 Merge pull request #11225 from flopp999/patch-1 
Added icon for iOS web app
 2018-03-13 21:54:55 +01: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
flopp999 0fd75e6005 Added icon for iOS web app 
If you using Safari on a iOS device and save the page to home screen you will get the Grafana icon as icon
 2018-03-13 15:12:04 +01:00
Alexander Zobnin 0185ad5b04 changelog: add note about closing #8151 2018-03-13 15:54:58 +03:00
Alexander Zobnin 560aec50b3 Merge PR #8613 2018-03-13 15:36:32 +03:00
Leonard Gram 87bc60b9d7 alerting: adds back the link to grafana. 2018-03-13 13:29:57 +01:00
John Baublitz aba6f627c5 Fix CI 2018-03-13 13:29:57 +01:00
John Baublitz 89557dd67b Modify Grafana Pagerduty notifier to use Pagerduty API V2 2018-03-13 13:29:57 +01:00
Alexander Zobnin 30d077d1d1 graph: minor refactor of histogram mode PR #8613 2018-03-13 15:25:28 +03:00
bergquist da19000733 changelog: adds note about closing #11220 2018-03-13 11:26:30 +01:00
bergquist 061a418f0f style: dont expose func outside package 2018-03-13 11:24:10 +01: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
Daniel Lee 3f2c086e6f teams: removes quota on route 
Got added by mistake a year ago.
 2018-03-13 10:56:35 +01:00
bergquist c18c0f6db7 changelog: adds note about closing #11143 
[ci skip]
 2018-03-13 10:43:44 +01: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
bergquist b400f7ccff changelog: adds note about closing #11107 
[ci skip]
 2018-03-13 09:54:46 +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
bergquist 18638c21c9 changelog: adds note about closing #10009 
[ci skip]
 2018-03-13 09:48:22 +01:00
Carl Bergquist bf6ff50d0b Merge pull request #11087 from alexanderzobnin/prometheus-heatmap 
Prometheus heatmap support
 2018-03-13 09:44:25 +01:00
Carl Bergquist ccd11ac928 Merge pull request #11212 from flopp999/patch-1 
Added concentration units and "Normal cubic metre"
 2018-03-13 08:23:04 +01:00
Carl Bergquist a9fd3e65ea Merge pull request #11214 from kkohtaka/patch-1 
docs: fix an outdated link to Prometheus's doc
 2018-03-13 08:00:26 +01:00
Kazumasa Kohtaka fcca00c0f9 docs: fix an outdated link to Prometheus's doc 2018-03-13 10:27:18 +09: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
Carl Bergquist a9d485c1e8 Merge pull request #11205 from matrixik/patch-1 
Fix urls in plugin update_checker logs
 2018-03-12 20:40:24 +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
Dobrosław Żybort 5a368f99ec Fix urls in plugin update_checker logs 2018-03-12 14:38:37 +01:00
bergquist 1a781fcee1 changelog: adds note about closing #10029 
[ci skip]
 2018-03-12 14:26:28 +01: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
Marcus Efraimsson 34d9983da2 docs: add team api link from http api reference page 2018-03-12 13:57:32 +01:00
Carl Bergquist 74602b1077 Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +01:00
bergquist 4362a73dd2 changelog: adds note about closing #9859 2018-03-12 09:23:59 +01:00
Carl Bergquist 4edc49bfab Merge pull request #9859 from mtanda/prometheus_post 
(prometheus) support POST for query and query_range
 2018-03-12 09:21:45 +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
Marcus Efraimsson f1fc1672be docs: minor fix for dashboard http api documentation 
Reported in #11176
 2018-03-09 10:39:50 -05:00
Leonard Gram d3f54f941d build: cleanup 2018-03-09 12:19:52 +01:00
Leonard Gram f72eea186d build: removes custom work dir in deploy. 2018-03-09 11:55:56 +01:00
Leonard Gram 49de4ed28b build: upgrades build pipeline from CircleCI 1.0 -> 2.0 (#11162) 
build: upgrades build pipeline from CircleCI 1.0 -> 2.0
 2018-03-09 11:27:00 +01:00
bergquist 77cd7f34c7 github: test new issue tempalte 
My hope is that headers will make it easier to read
when people post issues.
 2018-03-09 09:33:28 +01:00
bergquist e5b9219f13 dev: update dev prometheus2 to 2.2.0 2018-03-08 23:01:03 +01:00