RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-29 09:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,348 Commits 66 Branches 77 Tags 218 MiB
0394ddcac3
Commit Graph

2348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
9a2df8024f
Merge pull request #2557 from QuentinBisson/fix-flapping-acceptance-test 
Fix flapping acceptance test
 2021-04-29 12:41:04 +02:00
QuentinBisson
9c4ebab07f
Add missing EOL 
Signed-off-by: QuentinBisson <quentin@giantswarm.io>
 2021-04-29 10:44:16 +02:00
QuentinBisson
4aea4560ce
Fix flapping acceptance test 
Signed-off-by: QuentinBisson <quentin@giantswarm.io>
 2021-04-28 15:04:37 +02:00
Björn Rabenstein
88f32c5926
Merge pull request #2558 from grafana/bugfix/unlock-mutex 
Dispatch: Make sure mutex gets unlocked on call to Stop
 2021-04-27 22:40:36 +02:00
Arve Knudsen
87b1cc6637 Unlock at specific points instead of deferring 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-04-27 10:44:18 +02:00
Arve Knudsen
bd543f1345 Dispatch: Make sure mutex gets unlocked on call to Stop 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-04-27 09:25:16 +02:00
Andrey Kuzmin
194f1cfd7c
Integrate elm-review in CI (#2555) 
* Run elm-review from CI

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Use the jfmengels/elm-review-simplify rule

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Make assets

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
 2021-04-27 07:14:00 +02:00
Ben Kochie
87915dc652
Merge pull request #2551 from prometheus/superq/bump_stuff 
Update build
 2021-04-22 23:39:42 +02:00
SuperQ
99f64e944b
Update build 
* Drop /vendor.
* Update Go to 1.16.
* Update djfarrelly/maildev to 1.1.0.
* Update protoc to 3.15.8.
* Update mixin test for Go 1.16.
* Bump Go modules.

Signed-off-by: SuperQ <superq@gmail.com>
 2021-04-22 13:11:44 +02:00
Goutham Veeramachaneni
8176f78a70
Merge pull request #2543 from gotjosh/concurrent-access 
Clustering: Fix unsynchronised access
 2021-04-22 12:17:24 +02:00
Julien Pivotto
cb8a467cfc
Merge pull request #2547 from pracucci/allow-to-customize-http-client-in-receiver-integrations 
Add HTTP client options to receiver integrations
 2021-04-22 11:38:09 +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
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
Björn Rabenstein
fc8271eb9c
Merge pull request #2548 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2021-04-20 00:14:22 +02:00
aSquare14
fc42013dad fixup examples 
Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-04-18 22:18:51 +05:30
prombot
1f8aea7cee Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-04-17 00:01:26 +00:00
Björn Rabenstein
22ac6dff21
Merge pull request #2534 from julienduchesne/add-slack-url-file 
Add support to set the Slack URL in a file
 2021-04-13 17:12:36 +02:00
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
gotjosh
473cf4e8f7
Remove whitespace 
Signed-off-by: gotjosh <josue@grafana.com>
 2021-04-13 14:07:44 +01:00
gotjosh
d0406d6295
Clustering: Fix unsynchronised access 
Signed-off-by: gotjosh <josue@grafana.com>
 2021-04-13 14:03:43 +01: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
Andrey Kuzmin
54431be888
UI cleanup dead code with elm-review (#2528) 
* Add elm-review

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* elm-review --fix-all

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Update vfsdata

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
 2021-04-08 21:04:09 +02:00
Julien Pivotto
d4169dcd63
Merge pull request #2531 from roidelapluie/maintainer-aku 
Add Andrey as maintainer
 2021-04-03 17:57:19 +02:00
Julien Pivotto
eae02bdb03 Add Andrey as maintainer 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-04-03 17:56:12 +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
gotjosh
bc7b16d61a
API: Make conversion functions public (#2530) 
* API: Make conversion functions public

All types are public so it makes sense to make these functions also
public for ease of downstream consumption.

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

* Add the license header to the new file

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

* Fix tests

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

* Make two more helper functions public

Signed-off-by: gotjosh <josue@grafana.com>
 2021-03-31 13:28:06 +05:30
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
Julien Pivotto
72deec44a8
Merge pull request #2521 from roidelapluie/enable-new-build 
Enable new build
 2021-03-21 16:47:06 +01:00
Julien Pivotto
f4a5ca74a9 Enable parallel circleci build 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-21 15:21:23 +01:00