RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-15 02:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,380 Commits 69 Branches 77 Tags 222 MiB
e3fb99cc2d
Commit Graph

2380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Pivotto
e3fb99cc2d
Rename default branch to main (#2501) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-06-23 10:06:52 +01:00
Bartlomiej Plotka
02346e4e49
matchers: Parse Matcher now expects consistent enclosing with quotes. (#2632) 
Fixes https://github.com/prometheus/alertmanager/issues/2630

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2021-06-23 10:05:49 +01:00
Björn Rabenstein
29fcb0b7fb
Merge pull request #2613 from fpetkovski/improve-alertmanager-members-inconsistent-alert 
Improve the AlertmanagerMembersInconsistent alert
 2021-06-22 14:47:03 +02:00
fpetkovski
b408b522bc Improve the AlertmanagerMembersInconsistent alert 
The expression alertmanager_cluster_members{job="alertmanager"}[5m]) is assumed to return
one series for each alertmanager instance in the cluster. When running inside Kubernetes,
alertmanager pods can get evicted and rescheduled. This can change the instance label and
produce a new series for that alertmanager instance.

When the same pod gets evicted several times in a row, there will be a short interval in which
Prometheus will return values from both the new series and the old series.
As a result, counting the number of series for the alertmanager_cluster_members metric
will overestimate the number of instances in the given cluster.

This commit modifies the the AlertmanagerMembersInconsistent alert to increase the for clause to 15m
in order to reduce the probability of a false positive.

Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>
 2021-06-22 08:21:02 +02:00
Björn Rabenstein
58169c1412
Merge pull request #2614 from 9er/docs-weeekday-typo 
Docs: Fixed typo 'weeekday_range'
 2021-06-14 14:48:20 +02:00
Sebastian Neuner
8c956f8d64 fixed typo 'weeekday_range' → 'weekday_range' 
Signed-off-by: Sebastian Neuner <neuner@belwue.de>
 2021-06-10 15:59:48 +02:00
Arthur Silva Sens
8598683b24
[mixins] Alertmanager Overview dashboard (#2540) 
* Implements a Grafana dashboard to the mixin.

The dashboard aims to show an overview of the overall health of Alertmanager.

Signed-off-by: ArthurSens <arthursens2005@gmail.com>
 2021-06-07 19:54:22 +02:00
Julien Pivotto
8b584eb226
Merge pull request #2607 from pstibrany/marshalling-nil-url-and-regex 
Fix mashaling of URL, Regex wrappers with nil value, and empty Matchers.
 2021-06-03 14:45:11 +02:00
Peter Štibraný
40a8035098 Remove usage of assert package. 
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
 2021-06-03 14:16:54 +02:00
Peter Štibraný
270d844008 Fix mashaling URL and Regex wrappers with nil values. 
Fix JSON marshalling of empty Matchers.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2021-06-03 10:34:04 +02:00
Julien Pivotto
aa890285ce
Merge pull request #2571 from pstibrany/dispatcher-group-limits 
Added group limit to dispatcher.
 2021-06-03 01:41:54 +02:00
Peter Štibraný
0bb65d1e4b Reduce number of dispatched alerts to avoid hitting the limit on number of alive goroutines. 
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2021-06-02 15:28:00 +02:00
Peter Štibraný
b3ea60e9bb Fix compilation errors after rebase on master. 
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2021-06-02 15:14:55 +02:00
Peter Štibraný
358645cfe2 Extract TestGroupsWithLimits, and remove limit test from TestGroups. 
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2021-06-02 12:00:31 +02:00
Peter Štibraný
0f86edcf5c Extract TestGroupsWithLimits, and remove limit test from TestGroups. 
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2021-06-02 12:00:31 +02:00
Peter Štibraný
d5ed7bfb15 Only register limit metrics when they are used. 
Limits are not used in standalone alertmanager.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
 2021-06-02 12:00:31 +02:00
Peter Štibraný
390474ffbe Added group limit to dispatcher. 
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
 2021-06-02 12:00:31 +02:00
Julien Pivotto
f686ff3be2
Merge pull request #2569 from pstibrany/store-callback 
Added possibility to pass callback to `mem.Alerts`, useful for implementing limits on alerts.
 2021-06-01 10:39:28 +02:00
Peter Štibraný
15ea220f45 Don't return error from mem.Alerts.Put. 
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
 2021-05-31 10:05:04 +02:00
Peter Štibraný
cc0b08fd7c Added possibility to pass callback to *mem.NewAlerts, useful for implementing limits on alerts. 
Update provider/mem/mem.go

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
 2021-05-31 09:56:57 +02:00
Julien Pivotto
243accb771
Merge pull request #2594 from marcel-tov/marcel-tov/fix-example-silence-query 
Fix example silence query parameter
 2021-05-27 12:36:34 +02:00
Julien Pivotto
66cfee4b3b
Merge pull request #2599 from prometheus/release-0.22 
Merge back release 0.22
 2021-05-26 01:07:21 +02:00
Julien Pivotto
b6e2e08c62
Merge pull request #2600 from roidelapluie/pushoverclone 
Add a note about Pushover ready-to-clone app
 2021-05-26 01:05:32 +02:00
Julien Pivotto
0d1b95b5ca Add a note about Pushover ready-to-clone app 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-26 00:27:42 +02:00
Julien Pivotto
5ad7a105d7
Merge pull request #2592 from roidelapluie/rel22final 
Release alertmanager 0.22
 2021-05-24 14:02:26 +02:00
Marcel Hoegel
e15ac6ca92 Fix example silence query parameter 
Signed-off-by: Marcel Hoegel <github@mclhgl.de>
 2021-05-24 11:49:06 +02:00
Julien Pivotto
0394ddcac3 Release alertmanager 0.22 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-21 12:12:49 +02:00
Julien Pivotto
cf9e9b4ffd
Merge pull request #2587 from roidelapluie/rel022rc2 
Relase 0.22.0-rc.2
 2021-05-19 10:36:28 +02:00
Julien Pivotto
a51874cb86 Relase 0.22.0-rc.2 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-17 23:50:05 +02:00
Julien Pivotto
8373b35b69
Merge pull request #2581 from roidelapluie/fixnilinapi 
API: Only pass cluster peer if empty
 2021-05-17 13:27:40 +02:00
Julien Pivotto
4d2aea63c1 API: Only pass cluster peer if empty 
Fixes #2580

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-14 18:12:46 +02:00
Julien Pivotto
7301451eb9
Merge pull request #2576 from owen-d/standardize/common 
bump common to 0.24.0
 2021-05-12 01:22:18 +02:00
Julien Pivotto
670fd98cea
Merge pull request #2563 from pracucci/fix-issue-2562 
Fix race condition causing 1st alert to not be immediately delivered when group_wait is 0s
 2021-05-11 21:09:23 +02:00
Owen Diehl
e071242db2 bump common to 0.24.0 
Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
 2021-05-11 15:02:09 -04:00
Marco Pracucci
f84af78693
Lowered number of alert groups 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-05-11 16:15:46 +02:00
Marco Pracucci
1ad22c808f
Added unit test 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-05-11 15:48:02 +02:00
Marco Pracucci
72ef6e04e1
Fix race condition causing 1st alert to not be immediately delivered when group_wait is 0s 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-05-11 15:15:53 +02:00
Julien Pivotto
4205230f70
Merge pull request #2575 from d-zalewski/docs-https-typo 
fixed small typo
 2021-05-10 23:01:38 +02:00
Dominik Zalewski
a33bc8c2d4 fixed small typo 
Signed-off-by: Dominik Zalewski <kobazik@gmail.com>
 2021-05-10 21:50:15 +01:00
Julien Pivotto
a2bbecc356
Merge pull request #2574 from roidelapluie/rel-022rc1 
Release 0.22.0-rc.1
 2021-05-10 21:57:04 +02:00
Julien Pivotto
c9667d8b08 Release 0.22.0-rc.1 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-09 21:48:38 +02:00
Julien Pivotto
caa2918039
Merge pull request #2573 from roidelapluie/rel-022-2549 
Fix panic when HA is disabled
 2021-05-07 13:40:05 +02:00
Björn Rabenstein
5e9b32d86c
Merge pull request #2572 from prometheus/beorn7/doc 
Update matcher examples
 2021-05-07 11:54:21 +02:00
Julien Pivotto
64e108c3d4 Fix panic when HA is disabled 
Fix #2549

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-07 00:26:41 +02:00
beorn7
0ed31c3311 Update matcher examples 
While the documentation for the matchers themselves was updated, we
missed the examples.

I propose to merge this into the release-0.22 branch so that it gets
included in the ongoing release.

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-05-06 19:17:59 +02:00
Julien Pivotto
fc9f728167
Merge pull request #2568 from roidelapluie/new-release-0.22-cl 
Add #2276 to release notes
 2021-05-06 10:37:38 +02:00
Julien Pivotto
edc148b068 Add #2276 to release notes 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-05 11:04:55 +02:00
Julien Pivotto
8ec96dbfeb
Merge pull request #2567 from roidelapluie/new-release-0.22 
Release 0.22.0-rc.0
 2021-05-04 21:39:29 +02:00
Julien Pivotto
4cdf949b7d Release 0.22.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-04 18:59:03 +02:00
maxbrodin
1f3796c5cc
Lift moratorium on AlertManager receivers with long-term maintenance plan (#2561) 
* Lift moratorium on AlertManager notifiers

Signed-off-by: Max Brodin <mbrodin@amazon.com>
 2021-05-04 16:59:03 +02:00