RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,540 Commits 67 Branches 77 Tags 209 MiB
Commit Graph

2540 Commits

Author SHA1 Message Date
Mac Chaffee 5e88a91be5
Remove extra parentheticals 
Signed-off-by: Mac Chaffee <me@macchaffee.com>
 2021-11-09 17:57:57 -05:00
Nik Reiman 5b825e22a4
Allow filtering silences by createdBy author (#2718) 
This commit adds a `--created-by` argument to the `amtool silence
query` command so that silences can be filtered by the author they
were created with in `amtool silence add --author=<name>`.

Signed-off-by: nre <nre@ableton.com>
 2021-11-09 13:10:19 +01:00
Mac Chaffee 78545d8abc
Document that matchers are ANDed together 
Signed-off-by: Mac Chaffee <me@macchaffee.com>
 2021-11-06 22:35:45 -04:00
csuzhang b7035556e8
Update outdated url link with slack (#2749) 
* fix outdated url link with slack

Signed-off-by: csuzhang <csuzhang@tencent.com>
 2021-11-04 22:47:07 +01:00
markoposavec 05490d8954
Dynamic opsgenie responders (#2685) 
* added option to specify multiple teams in opsgenie configuration

Signed-off-by: Marko Posavec <maposavec@infobip.com>
 2021-11-04 22:32:20 +01:00
Simon Pasquier 992cea6007
Merge pull request #2727 from PhilipGough/fixes-2693 
docs: Update default value for opsgenie_config 'message'
 2021-10-29 16:43:57 +02:00
Simon Pasquier a6b34e3450
Merge pull request #2746 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2021-10-29 16:41:38 +02:00
Philip Gough f52c11f3d1 docs: Update default value for opsgenie_config 'message'. 
Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
 2021-10-28 16:59:49 +01:00
nekketsuuu 007c93e203 chore: Let git ignore temporary files for ui/app 
Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com>
 2021-10-24 21:17:37 +09:00
prombot 7893345f3d Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-10-24 00:01:47 +00:00
Kyle Brandt 1b8afe7cb5
export ValidateMatcher for DI (#2) (#2716) 
so third parties, Grafana in particular, can over ride the validation.

Grafana wants to do this because other data sources will have label keys with things like spaces, periods, or other characters - and looking for a better integration with alert manager.

goes with grafana/grafana#38629
replaces https://github.com/prometheus/alertmanager/pull/2694

Signed-off-by: Kyle Brandt <kyle@grafana.com>
 2021-10-21 09:29:55 +02:00
Jan-Otto Kröpke 186362cef0
Implement opsgenie_api_key_file (#2728) 
Signed-off-by: Jan-Otto Kröpke <joe@adorsys.de>
 2021-10-21 09:29:03 +02:00
PrometheusBot b9ce1d1e99
Update common Prometheus files (#2708) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-10-19 01:13:02 +02:00
Yuriy Tseretyan 15f44f4a61
Close file descriptor after snapshot file was read (#2710) 
* close file if it is opened

Signed-off-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2021-10-19 01:12:02 +02:00
Bryan Boreham f5768fb193
Update xxhash to v2.1.1 and improve pooling (#2709) 
* Update xxhash to v2.1.1

This saves linking two different versions

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2021-10-19 01:09:37 +02:00
Takuma Ishikawa 789a7bd6c3
Minor fixes on docs of receiver (#2726) 
Signed-off-by: Takuma Ishikawa <nekketsuuu@users.noreply.github.com>
 2021-10-19 01:07:53 +02:00
Takuma Ishikawa 5ddf9e24ea
amtool: Fix behavior of adding silence with duration option (#2741) 
endsAt should be calculated from startsAt, not from the current time

Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com>
 2021-10-18 15:13:42 +02:00
István Gazsi 78fdd6f56b
Generalize User-Agent header in receiver requests (#2722) (#2730) 
Signed-off-by: István Gazsi <istvan.gazsi@theag3nt.com>
 2021-10-18 14:34:22 +02:00
Björn Rabenstein 523c932859
Merge pull request #2737 from prometheus/beorn7/deprecation 
Add deprecation note to pkg directory
 2021-10-13 14:42:11 +02:00
beorn7 2cc5cc4f29 Add deprecation note to pkg directory 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-10-13 14:21:52 +02:00
Julien Pivotto 70abcccedb
Merge pull request #2725 from prometheus/release-0.23 
docs: Fix default value of send_resolved for sns_configs (#2724)
 2021-10-01 11:56:08 +02:00
Takuma Ishikawa 16fa045db4
docs: Fix default value of send_resolved for sns_configs (#2724) 
Signed-off-by: Takuma Ishikawa <nekketsuuu@users.noreply.github.com>
 2021-10-01 11:27:26 +02:00
Julien Pivotto e35efbddb6
Merge pull request #2706 from pracucci/fix-sns-receiver-http-client 
Fix HTTP client options in SNS receiver
 2021-09-14 19:25:21 +02:00
Marco Pracucci 8006780ce2
Fix HTTP client options in SNS receiver 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-09-14 16:25:48 +02:00
Julien Pivotto c1b05a6085
Merge pull request #2703 from prometheus/release-0.23 
Merge back Release 0.23
 2021-09-14 15:38:29 +02:00
Julius Volz 5195460c95
Correctly call default silence maintenance function (#2701) 
https://github.com/prometheus/alertmanager/pull/2689 introduced a
regression where the default maintenance function would no longer be
called even if no override was specified. The Alertmanager now crashes
on any silence maintenance run without this fix.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-09-13 19:42:48 +05:30
Julien Pivotto 44011410d7
Merge pull request #2519 from tomasfreund/opsgenie-update-message-description 
Add the option to update message and description when sending alerts to opsgenie
 2021-09-08 17:10:59 +02:00
gotjosh 8da517524a
Enable support for custom callbacks as part of maintenance (#2689) 
* Enable support for custom callbacks as part of maintenance

This enables support for custom Maintenance callbacks as part of the periodic maintenance of silences and notification logs.
Effectively a no-op for the Alertmanager but allows downstream implementation to inject custom logic as part of it.

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Add tests

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Fix tests and remove whitespace

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Address review comments

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* run go fmt

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Fix import ordering

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2021-09-06 16:19:39 +05:30
Julien Pivotto 61046b1777
Merge pull request #2684 from roidelapluie/releasetwentythree 
Release 0.23.0
 2021-08-25 12:25:08 +02:00
Julien Pivotto 60a6e4cf76 Release 0.23.0 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-25 12:23:34 +02:00
Julien Pivotto d6e758ad37
Merge pull request #2680 from machinly/main 
Fix some typo
 2021-08-24 13:53:26 +02:00
machinly 829e884a8d Fix some typo 
Signed-off-by: machinly <machinly@acm.org>
 2021-08-16 16:34:53 +08:00
machinly fbf9bee8af Fix some typo 
Signed-off-by: machinly <machinly@acm.org>
 2021-08-16 16:34:53 +08:00
machinly c9abed28d2 Make the apostrophe uniform 
Signed-off-by: machinly <machinly@acm.org>
 2021-08-16 16:34:53 +08:00
Tomáš Freund 10e6e04376 fix imports order 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund 92e7c4b1ea fix imports 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund ecf87d15a0 add update_alerts option docs 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund 6f071959b7 change update_message and update_description options to a single update_alerts option 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
tomasfreund cafd84bedb Update docs/configuration.md 
Co-authored-by: Victor Coutellier <victor.coutellier@gmail.com>
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
tomasfreund e9f1f19611 Apply suggestions from code review 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund 09e755e1e5 fix response drain order 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund adb69554a7 fix opsgenie retry handling logic error 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Tomáš Freund 79dfb86c7b add the option to update message and description when sending alerts to opsgenie 
Signed-off-by: Tomáš Freund <tomas.freund@datamole.cz>
 2021-08-10 19:05:54 +02:00
Dustin Hooten ff85bec45b
Secure cluster traffic via mutual TLS (#2237) 
* Add TLS option to gossip cluster

Co-authored-by: Sharad Gaur <sharadgaur@gmail.com>
Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* generate new certs that expire in 100 years

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Fix tls_connection attributes

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Improve error message

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Fix tls client config docs

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Add capacity arg to message buffer

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* fix formatting

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Update version; add version validation

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* use lru cache for connection pool

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* lock reading from the connection

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* when extracting net.Conn from tlsConn, lock and throw away wrapper

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* Add mutex to connection pool to protect cache

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* fix linting

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

Co-authored-by: Sharad Gaur <sharadgaur@gmail.com>
 2021-08-09 14:58:06 -06:00
Julien Pivotto 61d4ebcef7
Merge pull request #2674 from roidelapluie/rel0230rc0 
Release 0.23.0-rc.0
 2021-08-09 14:58:54 +02:00
Julien Pivotto 30992cec55 Release 0.23.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-09 14:18:28 +02:00
Julien Pivotto f684896d85
amtool: Detect version drift and warn users (#2672) 
* amtool: Detect version drift and warn users

This change detects the alertmanager version when initiating the client.
It ignores most errors since I expect amtool to fail later.

If amtool is not compiled with proper version, we do not do anything
either.

We use MajorMinor for now as we have not reach 1.0, but we still allow
the bugfix version number (Z in x.y.Z) to differ.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Add version check

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-09 11:06:09 +02:00
nedvna c72c4d79f6
Add ability to skip TLS verification for amtool (#2663) 
* Add ability to skip TLS verification for amtool

Signed-off-by: Nikita Nedvetskii <72229464+nedvna@users.noreply.github.com>
 2021-08-06 11:12:18 +02:00
Julien Pivotto e21cdfbc52
Fix empty isEqual in amtool. (#2668) 
This is the best we can do to make amtool support old releases.

Supersedes #2634
Fix #2666

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-06 11:11:16 +02:00
Julien Pivotto 3a9808c3f7
Fix main tests (#2670) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-04 16:13:51 +02:00