RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-26 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,505 Commits 66 Branches 77 Tags 218 MiB
f8c06b4dc8
Commit Graph

2505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Giedrius Statkevičius
3962da4073
cli: add new template render command (#2538) 
* cli: add new template render command

Add a new template rendering command that allows users to test out their
templates. This is especially needed because small bugs in templates do
not surface until alertmanager actually tries to render them.

* cli: permit passing alert data via a file

Add a new parameter `--templatefile` for `amtool` so that it would be
possible to pass custom alert data. Use an example `template.Data` if
none has been passed to permit simple use-cases.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
 2021-08-04 13:58:33 +02:00
Julien Pivotto
20a1f8fd3f
Merge pull request #2433 from sylr/fix-test 
Fix test not waiting for cluster member to be ready
 2021-08-04 13:57:26 +02:00
Laurent CREPET
0c3a00ecc0
OpsGenie: refer to alert instead of incident (#2609) 
* OpsGenie provides management of both alerts and incidents.
* package opsgenie uses OpsGenie alert api, so let's refer to
  alert instead of incident in logs and doc to avoid confusion.

Signed-off-by: Laurent CREPET <l.crepet@criteo.com>
 2021-08-04 13:53:44 +02:00
Dmitry Tolstoy
12dd20ced2
Docs: target_match and source_match are DEPRECATED (#2665) 
* target_match and source_match are DEPRECATED

Signed-off-by: Dmitry Tolstoy <A-styler@ya.ru>
 2021-08-04 10:05:39 +02:00
Julien Pivotto
75932c7e40
Merge pull request #2658 from roidelapluie/updategodeps 
Update go dependencies & switch to go-kit/log
 2021-08-02 23:51:33 +02:00
Julien Pivotto
b2a4cacb95 Update go dependencies & switch to go-kit/log 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-08-02 12:43:23 +02:00
Julien Pivotto
3d86bd709d
Merge pull request #2648 from benridley/bugfix_mutetime_utc 
Ensure time interval comparisons are in UTC
 2021-07-26 13:03:22 +02:00
Julien Pivotto
010c683e4e
Merge pull request #2615 from treid314/sns-reciever 
Add AWS SNS receiver
 2021-07-26 10:30:08 +02:00
Ben Ridley
a1136942bb Fix typo in label to help debugging (again) 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-07-13 13:49:30 +10:00
Ben Ridley
01287a4b6d Fix test case not being included in mute count 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-07-13 13:48:16 +10:00
Ben Ridley
c70481f71f Fix minor timezone typo to help debugging. 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-07-13 10:33:37 +10:00
Ben Ridley
4ccbbaef20 Ensure time interval comparisons are in UTC 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-07-13 10:27:13 +10:00
Tyler Reid
a1260af1c3 Break notify into submethods to create the session then create the publish input to send. Check we populate a region for all requests. 
This reverts commit 4c2a5f156c.

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-07-09 10:53:35 -05:00
Tyler Reid
51b93681b2 Revert "Add sigv4 as a global config option" 
This reverts commit 4c2a5f156c.

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-07-09 09:33:05 -05:00
Tyler Reid
4c2a5f156c Add sigv4 as a global config option 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-07-07 18:45:58 -05:00
Tyler Reid
7ecb6bcb22 Check Error in unit test and clean up docs 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-07-06 18:17:40 -05:00
Tyler Reid
077b20dd9a Add error check when creating sns session 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-07-01 09:19:25 -05:00
Julien Pivotto
8491f81629
Merge pull request #2635 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2021-06-28 13:15:58 +02:00
Tyler Reid
1322abdc08 Remove unused checkTopicFifoAttribute function 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-27 21:02:20 -05:00
Tyler Reid
208bed6dee Update config docs to clarify fifo SNS deduplication strategy. Remove extra api call get topic attributes and use '.fifo' strategy instead 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-27 20:26:44 -05:00
prombot
779af9c4eb Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-06-27 00:01:33 +00:00
Tyler Reid
25e6d4efd9 Add common/sigv4 with the sigv4 config 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-23 10:54:32 -05:00
Björn Rabenstein
fd0929ba9f
Merge pull request #2627 from prometheus/release-0.22 
Merge release branch back into master
 2021-06-23 13:41:56 +02:00
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
Tyler Reid
bd82f70bc2 Fix spacing for client config 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-22 14:44:33 -05:00
Tyler Reid
30a83f7bf7 Use supplied user creds when creating an STS client 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-22 14:43:41 -05: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
Tyler Reid
9ff4ac3301 Create new session if needed to get STS Creds 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-21 13:41:53 -05:00
Tyler Reid
dfb4d1fba1 Fix linter error 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-21 12:32:36 -05:00
Tyler Reid
8911051770 Make API URL optional, clear up credential logic 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-21 12:29:03 -05:00
Tyler Reid
4ebcaf9c23 Merge remote-tracking branch 'upstream/master' into sns-reciever 2021-06-17 18:05:11 -05:00
Tyler Reid
63f9082ec4 Fix docs spacing 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-17 10:45:27 -05:00
Tyler Reid
b9b53f172d Code review fixes 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-17 08:55:27 -05:00