RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-28 00:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,481 Commits 66 Branches 77 Tags 218 MiB
7893345f3d
Commit Graph

330 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
b9b53f172d Code review fixes 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-17 08:55:27 -05:00
Tyler Reid
d4ff90b555 Add missing template for aws region 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-16 16:42:55 -05:00
Tyler Reid
3446b35272 Code review fixes: copy attributes, truncate all the messages, fix logging, remove api_version 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-16 14:27:19 -05:00
Tyler Reid
9d37d6cc44 More gofmt fixes 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-16 09:56:55 -05:00
Tyler Reid
756cddad9c Fix for golangci-lint warning 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-16 09:38:18 -05:00
Tyler Reid
6ada9a634d Cache fifo bool in the notifier 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-16 09:31:23 -05:00
Tyler Reid
c48b54bdf8 Fix gosmpl linter issues 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 19:07:19 -05:00
Tyler Reid
889fa96439 Remove isFifoTopic test 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 18:18:19 -05:00
Tyler Reid
b509a5bdbb Add subject template for subject field. Better check for supplied creds, use GetTopicAttributes to check fifo 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 17:24:52 -05:00
Tyler Reid
68fa1bf19f Add string length check to fifo check 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 09:46:07 -05:00
Tyler Reid
af8406a920 Check error type before unpacking awserr.requestFailure 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 09:09:01 -05:00
Tyler Reid
6519c399b1 Add some tests for sns receiver 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-14 22:14:12 -05:00
Tyler Reid
72d63a5d72 Remove isFifo config option; use template strings; use retier; other code review comments 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-14 18:28:57 -05:00
Tyler Reid
009f8b17e9 Use 1024 rather than 1000 for KB size, fix target arn, handle large SMS messages correctly 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-14 10:21:33 -05:00
Tyler Reid
74d15273c0 Add support for role arn, truncation, dedupe key and env auth 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-11 16:21:15 -05:00
Tyler Reid
5dcf4f5f91 ARN Auth start 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-11 10:30:44 -05:00
Tyler Reid
19e74f9ce7 WIP - SNS receiver 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-09 21:14:07 -05:00
beorn7
e84c265196 Include pending silences for future muting decisions 
Previously, if a pending silence existed for an alert, and it later
became active without any silences getting added in the meantime, we
would miss the existence of that newly active silence.

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-05-27 22:15:57 +02:00
Marco Pracucci
04d683e880
Upgrade prometheus/common 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-04-21 12:01:34 +02:00
Marco Pracucci
37f4742922
Add HTTP client options to receiver integrations 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-04-21 11:56:20 +02:00
Julien Duchesne
59c7fd5053 Add support to set the Slack URL in a file 
- Added support for the file in both the global and the lower level
- Tried to follow configuration patterns I saw in prometheus
- The slack file is read on every request as mentioned in the prometheus issue to enable seamless switches

https://github.com/prometheus/alertmanager/issues/2498
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
 2021-04-01 21:59:49 -04:00
Ganesh Vernekar
10757eb5fb
Export newMetrics function and metrics struct (#2523) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-03-24 12:37:58 +05:30
Ben Kochie
53535551f5
Fix up golangci-lint errors. 
Signed-off-by: Ben Kochie <superq@gmail.com>
 2021-03-16 10:43:45 +01:00