RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-02 19:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,452 Commits 71 Branches 77 Tags 220 MiB
cafd84bedb
Commit Graph

56 Commits

Author SHA1 Message Date
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
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
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
010c683e4e
Merge pull request #2615 from treid314/sns-reciever 
Add AWS SNS receiver
 2021-07-26 10:30:08 +02: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
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
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
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
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
8d3b1b5896 Add config docs 
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
 2021-06-15 18:03:15 -05: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
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
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
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
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
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
Levi Harrison
f4b176fa5e
Add OAuth 2.0 Config (#2560) 
* Upgraded common to v0.23.0

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Added oauth2 to configuration doc

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Fix go.sum

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-04-29 13:31:54 +02:00
Björn Rabenstein
699439b021
Merge pull request #2481 from aSquare14/docs-1 
docs for negative matchers for route, inhibition
 2021-04-20 00:28:08 +02:00
aSquare14
fc42013dad fixup examples 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-04-18 22:18:51 +05:30
Julien Duchesne
f33427c96e Updated docs. Fixed YAML newlines 
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
 2021-04-13 10:59:15 -04:00
aSquare14
b103eff7d5 add yaml 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-04-11 17:09:57 +05:30
aSquare14
74445fcb39 Add examples 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-04-11 14:13:32 +05:30
aSquare14
f194f15481 Update the docs 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-03-18 08:46:55 +05:30
aSquare14
33eda30f2b Add matchers section 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-03-15 19:32:53 +05:30
Björn Rabenstein
2d77eab99d
Merge pull request #2489 from poulinjulien/patch-1 
docs: Fix list formatting
 2021-03-10 17:44:30 +01:00
Julien Poulin
1019991cee docs: Fix list formatting 
Added an empty line before the list to make sure it is properly rendered
on the documentation website.

Signed-off-by: Julien Poulin <poulin_julien@hotmail.com>
 2021-03-09 23:55:45 +01:00
Julien Pivotto
b4e000c6c2 Update common 
- Add support for custom authorization scheme
- Add support for not following redirects in http_client

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-01 23:19:38 +01:00
machine424
3054def040 Fix a typo in docs/configuration.md 
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2021-03-01 18:11:50 +01:00
Ben Ridley
df54b4bacf Improve documentation wording and formatting in response to maintainer feedback 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
0fe51de6e3 Clarify timezone support in mute time intervals 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
7ffd4ca4f4 Change docs to reflect mute_time_intervals in routes instead of mute_times 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
70b138a17a Apply formatting suggestions from code review 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
58c1ef58a1 Clarify boundaries of ranges in docs 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
3d97ee55eb Update docs to include mute time sections 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
aSquare14
1e501c4681 newsection 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-02-20 12:10:07 +05:30
aSquare14
ad8889a687 Add deprecated, update comments 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-02-20 10:02:59 +05:30
Atibhi Agrawal
0548bb1f3c docs for negative matchers for route, inhibition 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-02-10 09:57:17 +05:30
Julien Pivotto
8ebd888488
Support https (#2446) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-27 10:52:08 +01:00
Bor Grošelj Simić
dd6b3afebe Remove trailing whitespace in docs 
Signed-off-by: Bor Grošelj Simić <bor.groseljsimic@telemach.net>
 2021-01-05 16:27:38 +01:00
Gerard Ryan
a8ed0d5850
Add some missing PagerDuty fields to docs (#2380) 
These fields are all available on the PagerdutyConfig type:
59a96579cc/config/notifiers.go (L201..L203)

I took the descriptions from the PagerDuty events-api-v2 docs:
https://developer.pagerduty.com/docs/events-api-v2/overview/

Signed-off-by: Gerard Ryan <gryan@redhat.com>
 2020-09-28 15:52:37 +02:00
Julien Pivotto
470634d49f
Update common (#2353) 
- Disable HTTP2: https://github.com/prometheus/common/pull/249
- Composite duration: https://github.com/prometheus/common/pull/246

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-08-25 15:48:59 +02:00