Commit Graph

1449 Commits

Author SHA1 Message Date
Evan Baker
6a3dfaff45 Add Slack additional "fields" to notifications (#1135)
* impl slack fields

* wrap title and value in tmplText
2017-12-15 12:18:05 +01:00
Jose Donizetti
d75ff37a38 Refactor inhibit stage (#1105)
* Refactor BuildPipeline to receive a muter

* Remove marker not used by InhibitStage
2017-12-14 16:22:31 +01:00
Andrey Kuzmin
50394569f5 Fix negative duration (#1132)
* Validate ends at

* Update bindata.go
2017-12-14 16:16:42 +01:00
pasquier-s
06f9a4ad1d Fix logging for the mesh component (#1145) 2017-12-14 16:05:59 +01:00
stuart nelson
7736ea0f61
Add footer field for slack messages (#1141) 2017-12-12 22:50:41 +01:00
Colin Douch
873623eec5 Added ability to query for silences that will expire soon (#1120) 2017-12-12 15:36:05 +01:00
Binh Le
dbff31dbf1 [amtool] - Add new command to update silence (#1123)
This adds a new command, update (and also its alias, extend), to update
existing silence in Alertmanager. User can use this command to update the
expiration or comment on existing silences. The API already support this
so I only expose the same functionality to amtool.

Don't allow update CreatedBy field as it is "Created" not "Updated", so
we should keep the original author.
2017-12-11 14:46:59 +01:00
Andrey Kuzmin
f9e96fce3d
Use elm reactor for dev assets (#1133)
* Serve assets from elm reactor

* Update bindata.go
2017-12-10 21:59:15 +01:00
James Turnbull
7d795d8c03 Updated README for Prometheus 2.x (#1134) 2017-12-10 15:49:31 +00:00
berlinsaint
6bab629590 Add notify support for Chinese User wechat (#1059)
* WECHAT support by ybyang2/berlinsaint

* correct the whitespace

* add some TestFile and modify some naming errors by ybyang2/berlinsaint

* modify wechat retry test expect

* template error

* add newline
Signed-off-by: yb_home <berlinsaint@126.com>

* fmt some pr code

* use the @stuartnelson3 the test-ci-wechat bingdata.go

* notify go add wechat
2017-12-09 16:20:22 +01:00
Frederic Branczyk
bfdff67138 nflog: Copy and replace gossipData instead of modifying it in place (#1121) 2017-12-09 15:22:07 +01:00
Demitri Morgan
b62cddd807 Removed incorrect end-of-support warning (#1131)
The PagerDuty Events API (v1), used by integrations with monitoring tools, will continue to be supported. There are currently no plans to deprecate, end support for or sunset it.

The end-of-support notice cited in the log message removed applies only to the *REST API* version 1, which PagerDuty will no longer support as of February 2018, but which Prometheus does not use.
2017-12-09 15:17:17 +01:00
Christopher Taylor
af63c85161 Let the browser remember the creator of a silence (#1112)
* wire default creator through Elm

* wire defaultCreator into localStorage

* add ui/bindata.go

* fix indentation

* change defaultCreator type from (Maybe String) to String

use an empty string as default value

* update ui/bindata.go
2017-12-08 12:54:44 +01:00
xginn8
266baa089c Adding check for webhook's URL formatting (#1129)
* Adding check for webhook's URL formatting
Since alertmanager will fail silently when trying to send to a schemaless URL, provide a way to check that a URL is properly formatted in alertmanager

* updating error message as requested
2017-12-07 15:01:16 +01:00
Binh Le
9b127147bd [amtool] - Add a new silence import command (#1082)
* Add a new `silence import` command to amtool

This command read silences data from a query JSON output and import to
alertmanager. It allows `amtool` to be used as a backup/restore tool for
silences, i.e. #1000

Backup / export:

```
amtool silence -o json > silences.json
```

Restore / import:

```
amtool silence import silences.json
```

* Add a WaitGroup barrier

Move error channel reading to a goroutine to prevent deadlock and thus
add a WaitGroup to synchronize.
2017-12-07 13:12:00 +01:00
stuart nelson
ee8ac8e604
package amtool in docker container (#1127) 2017-12-03 15:15:49 +01:00
stuart nelson
fe9159e6a3
Update MAINTAINERS.md 2017-11-26 13:37:51 -05:00
Frederic Branczyk
b4e2a328c6
Merge pull request #1118 from brancz/inhibit-cancel-race
inhibit: Fix race in stopping inhibitor
2017-11-24 14:27:40 +01:00
Frederic Branczyk
f4c226c7d5
inhibit: Fix race in stopping inhibitor 2017-11-24 12:05:52 +01:00
stuart nelson
3464ab4fa2
Template Source in PagerDuty alert payload (#1117)
* Template Source field in pagerduty payload

As a sane default we link to alertmanager, but
leave templating available to the user if
something suits their system better.
2017-11-22 14:51:44 -05:00
stuart nelson
55a40d1d3a Update CHANGELOG.md
A breaking change to config names for HipChat and
OpsGenie wasn't noted in the changelog.
Fortunately, these are values that users should
not be configuring.
2017-11-17 00:18:44 +01:00
stuart nelson
30dd0426c0
0.11.0 (#1109) 2017-11-16 12:39:33 -05:00
Binh Le
fa17eb4b00 amtool - fix typo in README for comment_required config (#1100)
It is 'comment_required' in code:
https://github.com/prometheus/alertmanager/blob/master/cli/silence_add.go#L118
2017-11-16 11:22:00 -05:00
Tom Fawcett
8bfbb0a1aa Fix OpsGenie Tags field (#1108) 2017-11-15 17:20:02 -05:00
Tom Fawcett
291fc5722b Fix OpsGenie Teams field (#1101)
* Fix OpsGenie Teams field

* Remove use of opsGenieTeam struct
2017-11-15 16:00:50 -05:00
Jose Donizetti
10ed60361d Fix silences negative filtering (#1095)
* Fix silence negative filtering

* Refactor extract filtering labels func
2017-11-15 14:29:06 -05:00
Jose Donizetti
e303646b80 Fix typo (#1103) 2017-11-15 14:25:46 -05:00
Jose Donizetti
4763f67e4f Add SortedPairs test (#1102) 2017-11-15 14:25:23 -05:00
Tom Fawcett
fd0ace8d88 Support OpsGenie Priority field (#1094) 2017-11-12 12:01:19 -05:00
Jose Donizetti
7151cd4bfc Clean code style - amtool errors (#1099) 2017-11-12 11:43:48 -05:00
Jose Donizetti
7168749a9f Add test to missing pagerduty routing_key (#1097) 2017-11-12 11:38:01 -05:00
Jose Donizetti
95e80d1aa8 Add tests to receiver filtering (#1098) 2017-11-12 11:35:49 -05:00
Jose Donizetti
7fbe63b94f Add tests to retries (#1084)
* Add tests to retry logic

* Extract retry logic from OpsGenie,VictorOps,PushOver
2017-11-11 15:45:11 +01:00
Jose Donizetti
20598bfd71 Remove old silence code (#1080) 2017-11-11 15:41:17 +01:00
Jose Donizetti
cf85bd84f2 Add CalcSilenceState Test (#1085) 2017-11-11 15:13:12 +01:00
Jose Donizetti
33644a85df Add tests to template package (#1086) 2017-11-11 15:12:03 +01:00
Jose Donizetti
76c15a0ef5 Fix config name inconsistency (#1087)
* Rename global config hipchat_url to hipchat_api_url

* Rename opsgenie config 'host' to 'url'
2017-11-11 15:01:21 +01:00
Binh Le
ea9a584e8d Allow 'd', 'w', 'y' to be specified at time suffix when creating silence (#1091)
The time.ParseDuration refused to parse them with the reason that a day
can be shorter or longer than 24 hours. But they are already accepted in
Prometheus range query and a custom parser is included in Prometheus
common package so there's no reason amtool cannot use that.

This will be handy in cases you need to create silence for longer periods,
which are unfortunately common.
2017-11-11 14:51:33 +01:00
Julius Volz
fdee5fcbfc Fix UI when no silences are present (#1090)
* Explicitly initialize silences list to avoid "null" JSON

* Wrap "No silences found" message in error box

* bindata fixup
2017-11-11 14:48:48 +01:00
stuart nelson
133c888ef3
Changelog for v0.10.0 (#1089) 2017-11-09 16:11:56 +01:00
Jose Donizetti
bc9b34d3db Add test to matchers (#1079)
* Add Test to Matcher and Matchers

* Move matchers string test to match_test.go
2017-11-07 11:39:22 +01:00
Jose Donizetti
74808e40f3 Refactor silence constants (#1076)
* Refactor remove dups silence state constants

* Refactor to use const instead of string
2017-11-07 11:36:30 +01:00
stuart nelson
0cbc8dff18 Rearrange some notification code 2017-11-07 11:32:37 +01:00
Alin Sinpalean
dc3c78e6ae Prevent alerts from inhibiting themselves (#1017)
* Prevent alerts from inhibiting themselves.

* Don't inhibit alerts that match the source filter.

* No-op, nudge CircleCI.
2017-11-07 11:30:14 +01:00
Steven Carvellas
5db8055bab Add support for PagerDuty API v2 (#1054) 2017-11-07 11:07:27 +01:00
Adam Smith
4ee40f97e6 Allow template in victorops routing_key field (#1083) 2017-11-07 10:38:46 +01:00
Jose Donizetti
b9597f5c7b Fix negative matchers filtering (#1077) 2017-11-04 14:38:16 +01:00
Frederic Branczyk
5473b21a6b
Merge pull request #1078 from prometheus/no-mesh-fix
Fix shutdown crash with nil mesh router
2017-11-04 09:30:44 +01:00
Julius Volz
f64a419853 Fix shutdown crash with nil mesh router 2017-11-03 23:44:05 +01:00
Frederic Branczyk
029c70d6fe Allow enabling mutex and block profiles (#1073) 2017-11-02 12:18:45 +01:00