public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,668 Commits 655 Branches 650 Tags
38bdb8dfb38b0cfc42c5f28aef0dbd5f4fb0bb5a
Commit Graph

13668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Chataigner 38bdb8dfb3 Alerting: move getNewState to EvalContext 
This fix alert state update when several evaluation attempts are needed

Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2018-03-21 20:59:39 +01:00
Thibault Chataigner 5d23e7710b Alerting: Add retry mechanism and its unitests 
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2018-03-20 21:01:56 +01:00
bergquist ec007f536b docs: improve guide for high availability 2018-03-19 14:37:09 +01:00
Daniel Lee caf60dda0e Merge pull request #10376 from grafana/openTSDB-file-to-ts 
migrated file to ts
 2018-03-19 14:32:32 +01:00
Daniel Lee 8b9c44be17 Merge pull request #10369 from grafana/elastic-file-to-ts 
migrated files to ts
 2018-03-19 13:59:30 +01:00
Leonard Gram 1f7235b340 Update CHANGELOG.md 2018-03-19 11:29:23 +01:00
Leonard Gram 0fde19552f Missed thanks in changelog 2018-03-19 11:27:08 +01:00
Leonard Gram 4ca15ae71e Adds pagerduty api update to changelog. 2018-03-19 11:25:57 +01:00
Leonard Gram 148b71846f Updated roadmap for 5.1 2018-03-19 10:43:26 +01:00
Carl Bergquist 930d00b513 Merge pull request #11284 from flopp999/patch-1 
Changed Swedish and Icelandic currency
 2018-03-19 08:15:34 +01:00
Daniel Lee 72f4341305 Merge pull request #11289 from DavidLambauer/patch-1 
Minor format changes
 2018-03-19 07:56:47 +01:00
DavidLambauer b90c323e31 Minor format changes 
Just fixed some minor inconsistencies in the format of the file. There were some configurations uncommented like so: 

```
; container_name =
```

and some other like so:

```
;container_name =
```

So there is a need for a small perfection here! 

I also removed some unnecessary line breaks, bullying my eyes... 

![<3](https://media.giphy.com/media/dTJd5ygpxkzWo/giphy.gif)
 2018-03-18 10:17:48 +01:00
flopp999 6718915a23 Changed Swedish and Icelandic currency 
Swedish krone -> Swedish krona
Icelandic krone - > Icelandic króna
 2018-03-16 19:46:20 +01:00
Daniel Lee 4bf285c3d1 docs: update install docs for 5.0.3 2018-03-16 18:39:34 +01:00
Daniel Lee e7bbc6e624 changelog: 5.0.3 2018-03-16 17:42:23 +01:00
Carl Bergquist 1014f7c40a Merge pull request #11260 from iksaif/master 
alertmanager: handle resolved alerts, nodata, and execution errors + cleanups
 2018-03-16 09:11:59 +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
Corentin Chary 3d8f1a7439 alertmanager: /Creating/Sending/ 2018-03-15 13:48:58 +01:00
Corentin Chary c8da1a46c5 alertmanager: handle resolved alerts, nodata, and execution errors 
- Resolved alerts will be sent to the AM the first time they move
  from Alerting to OK
- Errors are forwarded
- NoData is not ignored anymore
- The summary annotation is set (with the alertname)
- The image annotation is set (when available)
 2018-03-15 12:02:29 +01:00
Corentin Chary d4d2b6d7da notitfiers: avoid ShouldNotify duplication 2018-03-15 10:48:29 +01:00
Corentin Chary 777c1024c9 alertmanager: if there are no alerts to send, do nothing 2018-03-15 10:08:03 +01:00
Marcus Efraimsson eef01e3703 docker: change port for prom random data scrape target 2018-03-15 09:52:53 +01:00
Carl Bergquist 18e498e0ff Update README.md 
Removes alpha 

closes https://github.com/grafana/grafana/issues/11251
 2018-03-14 21:07:55 +01:00
Marcus Efraimsson 61e1c12fee docker: fake-data-gen:latest updates 
fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block.
added big dashboard for graphite 1 and 1.1+ that can be imported to grafana
 2018-03-14 20:47:52 +01:00
bergquist 8efb39ee2b docs: more details about slack notifier 
closes #11059
 2018-03-14 18:26:05 +01:00
bergquist bdf6a75c91 docs: updates latest release for docs 2018-03-14 17:09:02 +01:00
bergquist cf67584998 changelog: improve description of closed issues 2018-03-14 16:06:03 +01:00
Carl Bergquist 105f6ff88c Merge pull request #11249 from bergquist/legacy_render_urls 
Avoid redirecting internal rendering requests
 2018-03-14 15:42:07 +01:00
bergquist 6cac7c2de9 renderer: avoid redirect render requests 
closes #11180
 2018-03-14 15:27:18 +01:00
bergquist e4cca1943c changelog: adds notes about 5.0.2 
[ci skip]
 2018-03-14 15:05:17 +01:00
Carl Bergquist 6d1e3613f7 Merge pull request #11246 from grafana/11227_import 
dashboard: fix import dashboard with alert rule(s)
 2018-03-14 14:38:29 +01:00
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
Marcus Efraimsson 87284d284e dashboard: fix import dashboard with alert rule 
Importing a dashboard with alert rule(s) should be possible without receiving invalid
alert data error. This fix reverts the import logic to how it worked before Grafana v5.0,
that is import will allow dashboard with alert rule(s) but no alerts will be created.
After an import the user will need to update the dashboard for the alerts to be created.
Fixes #11227
 2018-03-14 14:24:56 +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