RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 08:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,490 Commits 66 Branches 77 Tags 218 MiB
081fc7d982
Commit Graph

1490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Paine
081fc7d982 Update simple.yml (#1216) 
match spacing on other receiver groups
 2018-01-29 15:58:44 +01:00
Daniel Bonatto
94bef6419f Fixes prometheus/alertmanager#1211 (#1214) 
Add template to severity field for PagerDuty API v2.
 2018-01-27 11:22:41 +01:00
pasquier-s
62b957cc14 Notify only when new firing alerts are added (#1205) 
After the initial notification has been sent, AlertManager shouldn't notify the
receiver again when no new alerts have been added to the group during
group_interval.

This change also modifies the acceptance test framework to assert that no
notification has been received in a given interval.
 2018-01-23 16:52:03 +01:00
Stuart Nelson
b45c11b561 Fix tests 2018-01-21 15:38:19 +01:00
Jose Donizetti
fc9306cd7e Add expired silence validation (#1096) 
* Add expired silence validation

* Add silence end time in the past validation
 2018-01-21 15:29:51 +01:00
Jose Donizetti
2fe013bcaa Add tests to memory provider (#1104) 2018-01-21 15:27:21 +01:00
pasquier-s
63598904dc Fix pending connections never going to established (#1204) 2018-01-21 15:09:50 +01:00
pasquier-s
9b10acae68 Don't notify resolved alerts if none were firing (#1198) 
* Don't notify resolved alerts if none were firing

* Fix comments
 2018-01-18 11:12:17 +01:00
benbradley
0db01af11e amtool silence update support dwy suffixes to expire flag (#1197) 2018-01-15 19:45:46 +01:00
Stuart Nelson
d20282e1e3 Correct CHANGELOG.md 2018-01-12 14:24:40 +01:00
stuart nelson
fb713f6d82
v0.13.0 (#1194) 2018-01-12 11:29:15 +01:00
Stuart Nelson
7d36d79aba Update silence query long help 2018-01-12 10:44:38 +01:00
Thomás S. Bregolin
cdb44955cf Make --expired list only expired silences (#1176) (#1190) 
This means there's no longer a way to list both active and expired
silences at the same time. This is the desired behaviour according to
consensus at https://github.com/prometheus/alertmanager/pull/1175
 2018-01-12 10:35:06 +01:00
pasquier-s
907ac510f8 Fix flaky TestBatching acceptance test (#1193) 
This change decreases the repeat_interval parameter from 5s to 4.9s to
make sure that the alerts are effectively sent after 5 seconds.

The workflow is:
- The dispatcher flushes the alerts at t0, sends the notification and
marks the notification log at t0+epsilon.
- The dispatcher flushes the alerts at t1, t2, t3 and t4 and doesn't
send the notifications as expected.
- At t5, the dispatcher flushes the alerts because current_time - (t0+epsilon)
is less then repeat_interval.

If repeat_interval is exactly 5s, there is a little chance that it is
greater than current_time - (t0+epsilon).
 2018-01-11 22:45:59 +01:00
Colin Douch
17846f2e33 Fix updating silence comments (#1189) 
Possibly another regression introduced by #976 . We use the wrong
variable to update comments in the `amtool silence update` command
which causes us to fail silently. This fixes that.
 2018-01-10 17:05:03 +01:00
pasquier-s
a7d4e4ea7c Log snapshot sizes on maintenance (#1155) 
* Log snapshot sizes on maintenance

* Add metrics for snapshot sizes

This change adds 2 new gauges for tracking the last snapshots' sizes:

  - alertmanager_nflog_snapshot_size_bytes
  - alertmanager_silences_snapshot_size_bytes
 2018-01-10 14:53:57 +01:00
stuart nelson
7b787dab05
Re-introduce prometheus durations in amtool silence creation (#1185) 
* Fixes #1183

* Update expires comment

The default time is already output thanks to
kingpin.
 2018-01-09 10:47:41 +01:00
stuart nelson
3aa7f03b10
Template secret keys for pagerduty notifier (#1168) (#1182) 
The tmpl() call was removed when migrating to
support pd v2 events api.
 2018-01-08 13:41:10 +01:00
stuart nelson
3c61fe3fef
Return reload status from http endpoint (#1152) (#1180) 
* Return reload status from http endpoint (#1152)

* Use same reload messaging as prometheus
 2018-01-08 11:51:05 +01:00
Frederic Branczyk
0b5af7510b
Merge pull request #1159 from simonpasquier/add-healthy-probes 
Add /-/healthy endpoint
 2018-01-08 11:25:16 +01:00
Calle Pettersson
b7da058efb Switch cmd/alertmanager to kingpin (#974) 2018-01-06 11:22:26 +01:00
Conor Broderick
a1153e83ff
Merge pull request #1167 from prometheus/fix-error-message 
Fix error message
 2018-01-03 11:10:39 +00:00
Christian Hoffmann
0e63715b23 UI: Fix JavaScript error in MSIE due to endswith() usage (#1172) 
* index: avoid endswith() for MSIE compatibility

MSIE does not support endswith() [1]. substr() can
be used to work around this limitation.

[1] https://docs.microsoft.com/en-us/scripting/javascript/reference/endswith-method-string-javascript

* index: clean up comment

* ui: update bindata
 2018-01-02 14:25:54 +01:00
Andrey Kuzmin
b8d20dffca Update bindata.go 2018-01-02 12:46:24 +01:00
Andrey Kuzmin
1ccc7b1133 Dont output malformed error body 2018-01-02 12:45:36 +01:00
Andrey Kuzmin
6f8ccb031c
Fix expire buttons on the silences page (#1171) 
* Only show confirmation for the specific silence

* Update bindata.go
 2018-01-02 12:25:34 +01:00
Fabian Reinartz
92c04096a8
Merge pull request #1154 from dvrkps/patch-1 
travis: update go version
 2017-12-27 19:05:12 +01:00
pasquier-s
364979bbf8 Display connections in the Status page (#1164) 
This change shows the status of the local connections in the web UI. It
can be used to troubleshoot mesh issues.
 2017-12-22 11:39:27 +01:00
Calle Pettersson
608848390f Switch amtool to kingpin (#976) 
* Switch cmd/amtool to kingpin

* Touch-ups

* Implement long help

* Add missing short-form of --output

* Fix backwards compatibility for config file options

* Fix vendoring

* Review fixes

* Fix flag word order
 2017-12-22 11:17:13 +01:00
anthraxn8b
2a0989094b Added 2nd email address to “to“ field (#1163) 
Did this to give an example with multiple email addresses in the “to“ field.
 2017-12-22 00:14:23 +01:00
Fabian Reinartz
1fdfe9f807
Merge pull request #1162 from prometheus/fabxc-patch-2 
Fix wrong lock
 2017-12-21 17:12:47 +01:00
Fabian Reinartz
405dbb8d9c
Fix wrong lock 2017-12-21 16:55:55 +01:00
Frederic Branczyk
db8386fd68
Merge pull request #1158 from prometheus/stn/api-update-locks 
Lock around variables used in Update()
 2017-12-21 13:06:23 +01:00
Simon Pasquier
e8661f5768 Add /-/healthy endpoint 2017-12-21 12:29:38 +01:00
stuart nelson
1abe4c9a56 Lock around variables used in Update() 
Found two places where struct members being
updated in api.Update() where being accessed
elsewhere without locks.
 2017-12-21 12:08:39 +01:00
Davor Kapsa
eb2ea25ccd
travis: update go version 
1.x match latest stable go version(1.9.2 today)
 2017-12-20 15:46:00 +01:00
Frederic Branczyk
8b8642935a
Merge pull request #1151 from prometheus/stn/configurable-alert-gc 
Make alertGC interval configurable
 2017-12-19 20:30:05 +01:00
stuart nelson
69b97058f6 Fix tests 2017-12-19 15:43:23 +01:00
stuart nelson
481eab7b83 Make alertGC interval configurable 2017-12-19 15:36:38 +01:00
Andrey Kuzmin
6fa697ae17 Populate the silence form from location (#1148) 
* Populate new silence form from location

* Update bindata.go
 2017-12-18 10:18:12 +01:00
stuart nelson
fc33cc7803
version 0.12.0 (#1146) 2017-12-15 15:10:31 +01:00
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