Commit Graph

1559 Commits

Author SHA1 Message Date
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
Frederic Branczyk
53bd897bd0
Merge pull request #1066 from josedonizetti/add_set_test
Add tests to nflog set
2017-11-02 11:23:19 +01:00
Julius Volz
b0aab04906 Fix notifications for flapping alerts (#1071)
Fixes https://github.com/prometheus/alertmanager/issues/1063
2017-11-02 11:12:12 +01:00
Frederic Branczyk
d9793cb502
Merge pull request #1072 from prometheus/cleanups
Minor code cleanups
2017-11-02 11:06:45 +01:00
Julius Volz
9b72c10134 Minor code cleanups 2017-11-01 23:08:34 +01:00
Jose Donizetti
511c6bcb6a Add nflog TestQuery (#1070) 2017-11-01 20:38:00 +01:00
Jose Donizetti
f8dc12c317 Remove not used code (#1069) 2017-11-01 16:40:46 +01:00
Julius Volz
40598d6913
Merge pull request #1067 from prometheus/clarify-var-names
Clarify variable names in Dispatcher.processAlert()
2017-11-01 14:20:51 +00:00
Julius Volz
b145c51b99 Clarify variable names in Dispatcher.processAlert()
A single entry in aggrGroups is just a single group, not plural.
2017-11-01 15:06:23 +01:00
Julius Volz
fc984941ee nflog: Fix Log() crash when gossip is nil (#1064) 2017-11-01 10:34:40 +01:00
Jose Donizetti
bf3f6de719 Add tests to nflog set 2017-11-01 06:44:27 -02:00
Jose Donizetti
359b614f5f Fix documentation (#1065) 2017-11-01 08:41:00 +00:00
Tom-Fawcett
2d1b84ff5e Upgrade OpsGenie notifier to v2 API. (#1061) 2017-10-29 16:19:17 +01:00
Jose Donizetti
1c7bf17eec Add logging to statemessage truncation (#1056) 2017-10-26 11:09:54 +02:00
Jose Donizetti
877d2780a0 Add limit to OpsGenie message (#1045) 2017-10-26 11:09:23 +02:00
Jose Donizetti
0a16b09fc1 Fix pushover limits (title, message, url) (#1055) 2017-10-25 14:44:35 +02:00
Andrey Kuzmin
0fa852217b Toggle silenced and inhibited alerts (#1049)
* Add inhibited checkbox

* Update ui/bindata.go
2017-10-23 11:00:17 +02:00
Jose Donizetti
ae73a3103a Add tests to notifiers config (#1050) 2017-10-23 10:55:34 +02:00
Julius Volz
5d1dec2790 Merge pull request #1052 from prometheus/nonglobal-loggers
Convert Alertmanager to use non-global go-kit loggers
2017-10-22 10:04:30 -07:00
Julius Volz
b1668866a8 Update vendoring for logger change 2017-10-22 00:20:40 -07:00
Julius Volz
947970af44 Convert Alertmanager to use non-global go-kit loggers
Fixes https://github.com/prometheus/alertmanager/issues/1040
2017-10-22 00:20:40 -07:00
Jose Donizetti
4369eb3244 Improve config test coverage (#1046) 2017-10-19 21:00:35 +02:00
Carlos Alexandro Becker
26489b13ef also hide inhibited alerts (#1039)
* also hide inhibited alerts

* split inhibited and silenced
2017-10-17 10:49:59 +02:00
Carlos Alexandro Becker
4a8e710691 Allow template in victorops message_type field (#1038) 2017-10-11 15:42:10 +02:00
Frederic Branczyk
ff9e5270c7 Merge pull request #1026 from brancz/marker-race
Remove .WasInhibited and .WasSilenced fields of Alert type
2017-10-10 16:49:55 +02:00
Frederic Branczyk
0ef6695055
*: Remove .WasInhibited and .WasSilenced fields of Alert type 2017-10-10 15:50:15 +02:00
stuart nelson
89200ccafd add ISSUE_TEMPLATE.md (#1036) 2017-10-10 10:51:30 +02:00
Max Inden
ac935a8ffe Rename Promtheus to Alertmanager in CONTRIBUTING.md (#1033) 2017-10-09 10:23:39 +02:00
Corentin Chary
21a2e5393f cli/silence_add: don't ingore errors when getting current user (#1031)
I had a system where amtool would segfault on startup because of
that.
2017-10-09 10:10:27 +02:00
Frederic Branczyk
de24c5b7ec Fix inhibit race (#1032)
* inhibit: restructure stop logic, to prevent race condition

* vendor oklog/oklog/pkg/group
2017-10-07 13:01:37 +02:00
Jose Donizetti
0508348fd0 Allow selectable matchers on silence view (#1030) 2017-10-07 12:54:30 +02:00
Conor Broderick
10b9d34f80 Initialise notifications_total and notifications_failed_total (#1011) 2017-10-07 11:57:53 +02:00
Frederic Branczyk
620fff4e4f add metric of alertmanager position in mesh (#1024) 2017-10-06 18:37:44 +02:00
Frederic Branczyk
d47f8b908c Merge pull request #998 from iksaif/silence-alert-counters
silence|alerts: add metrics about current silences and alerts
2017-10-05 15:16:26 +02:00
Frederic Branczyk
5328885fe9 dispatch: fix race condition in dispatch test (#1025) 2017-10-04 18:01:23 +02:00
Conor Broderick
c56d2b5d07 Sorted silences based on current status (#1015) 2017-10-02 18:42:43 +02:00
Corentin Chary
bff889b490 silence|alerts: add metrics about current silences and alerts
This adds metrics that look like this:
```
alertmanager_alerts{state="active"} 6
alertmanager_alerts{state="suppressed"} 0
alertmanager_silences{state="active"} 1
alertmanager_silences{state="expired"} 1
alertmanager_silences{state="pending"} 0
```

This can be used to monitor alertmanager's usage and validate that
alertmanagers in a mesh have a similar number of silences and alerts.
2017-10-02 13:33:29 +02:00
Jose Donizetti
fe390bc28a Improve amtool check-config use and description text (#1016) 2017-10-02 11:22:04 +02:00
stuart nelson
9f5f4b2a51 v0.9.1 (#1010) 2017-09-29 14:56:31 +02:00
stuart nelson
a7981e4693 Inconsistent use of baseUrl and apiUrl arguments (#1008)
* Inconsistent use of baseUrl and apiUrl arguments

Both are Strings, so flipping the order between
one invocation and another didn't raise any
argument from the compiler. The baseUrl argument
is actually unnecessary, and has been removed.

* Update bindata.go
2017-09-29 14:16:03 +02:00
Alin Sinpalean
4931c9206e Fix multipart email implementation: (#1009)
* Don't send parts with empty templates.
 * Add a MIME-Version: 1.0 header.
 * Place text/html part last, as parts are supposed to be in increasing preference order.
2017-09-29 11:22:38 +02:00