RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-17 19:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,770 Commits 79 Branches 78 Tags 166 MiB
a8e4c166a8
Commit Graph

2770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Rozet
a8e4c166a8
support loading pushover secrets from files (#3200) 
* support loading pushover secrets from files

Add the user_key_file and token_file keys to the pushover config.

/cc https://github.com/prometheus/alertmanager/issues/2498

Signed-off-by: Simon Rozet <me@simonrozet.com>
 2023-01-18 23:33:42 +01:00
Simon Pasquier
9c7adc4024
Merge pull request #3203 from prometheus/improve-am-config-docs 
Multiple improvements to Alertmanager configuration docs
 2023-01-18 17:05:37 +01:00
Julius Volz
8a42cbc9b5 Multiple improvements to Alertmanager configuration docs 
* The current page outline was an unstructured and unsorted mess, so I tried to
  organize the different configuration file fields into categories.
* I also sorted receivers alphabetically.
* Corrected the Telegram receiver's "bot_token" to be a "secret", not "string".
* Other minor improvements and wording additions to the sections.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2023-01-18 16:28:49 +01:00
Simon Pasquier
0ba6441756
Merge pull request #3216 from simonpasquier/investigate-acceptance-test-failures 
test: reduce flakiness of acceptance tests
 2023-01-18 16:13:16 +01:00
Simon Pasquier
01e1f5433a test: reduce flakiness of acceptance tests 
The CI environment isn't as performant as local machines: the time
needed to fully initialize the test environment can be significant and
skew the verification. Rather than setting the "virtual" clock used to
measure alert timings at the beginning of the acceptance test, it is
better to wait for the test bed to be ready.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-01-13 16:10:38 +01:00
Simon Pasquier
ecb66f76b0
Merge pull request #3109 from nicollet/main 
Fixup: make signal handlers a bit simpler.
 2023-01-06 15:36:37 +01:00
Simon Pasquier
ebcea59acc
Merge pull request #3190 from prometheus/release-0.25 
Release 0.25
 2023-01-05 14:35:35 +01:00
Simon Pasquier
ef150318b4
Merge pull request #3194 from aminvakil/telegram_default_parse_mode 
Telegram default parse_mode has been changed to HTML
 2023-01-05 11:54:40 +01:00
Simon Pasquier
9aa5974c08
Merge pull request #3201 from prometheus/document-discord-notifier 
Add missing docs for Discord notifier
 2023-01-04 14:10:34 +01:00
Julius Volz
3f27314fb5 Add missing docs for Discord notifier 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2023-01-04 13:28:54 +01:00
Simon Pasquier
e9dcb6e261
Merge pull request #3197 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.171 
Bump github.com/aws/aws-sdk-go from 1.44.162 to 1.44.171
 2023-01-04 11:35:10 +01:00
Simon Pasquier
8afd462a9e
Merge pull request #3198 from prometheus/dependabot/go_modules/github.com/rs/cors-1.8.3 
Bump github.com/rs/cors from 1.8.2 to 1.8.3
 2023-01-03 15:56:55 +01:00
dependabot[bot]
ad8844404c
Bump github.com/rs/cors from 1.8.2 to 1.8.3 
Bumps [github.com/rs/cors](https://github.com/rs/cors) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/rs/cors/releases)
- [Commits](https://github.com/rs/cors/compare/v1.8.2...v1.8.3)

---
updated-dependencies:
- dependency-name: github.com/rs/cors
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-01 15:02:38 +00:00
dependabot[bot]
929c27eda9
Bump github.com/aws/aws-sdk-go from 1.44.162 to 1.44.171 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.162 to 1.44.171.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.162...v1.44.171)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-01 15:02:18 +00:00
Amin Vakil
9c9ddcb6be
Telegram default parse_mode has been changed to HTML 
https://github.com/prometheus/alertmanager/pull/2981
https://github.com/prometheus/alertmanager/commit/d4c2048

Signed-off-by: Amin Vakil <info@aminvakil.com>
 2022-12-28 15:52:42 +03:30
PrometheusBot
87ad8437fc
Synchronize common files from prometheus/prometheus (#3191) 
* Update common Prometheus files

* cluster: fix formatting

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-23 10:59:32 +01:00
Simon Pasquier
258fab7cdd
Merge pull request #3187 from simonpasquier/cut-v0.25.0 
Cut v0.25.0
 2022-12-22 15:24:19 +01:00
Simon Pasquier
4f7c85f8c9 Cut v0.25.0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-22 10:31:49 +01:00
Simon Pasquier
ead47cd405
Merge pull request #3183 from simonpasquier/fix-3061 
telegram: use HTML template with HTML parse mode
 2022-12-22 10:29:24 +01:00
arukiidou
c2b2defe48
bump:hashicorp/golang-lru to v2,aws-sdk-go,prometheus/common (#3182) 
* bump:hashicorp/golang-lru to v2,aws-sdk-go,prometheus/common

Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>
 2022-12-20 17:21:12 +01:00
Simon Pasquier
aa6a929316 telegram: use HTML template with HTML parse mode 
Closes #3061

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-20 17:17:53 +01:00
Simon Pasquier
aace20a902
Merge pull request #3180 from simonpasquier/fix-build-all 
Run 'build_all' job for v0.y tags
 2022-12-19 10:39:53 +01:00
Simon Pasquier
9226eb0310 Cut v0.25.0-rc.2 
The publish_release job failed to complete when v0.25.0-rc.1 was pushed
because the binaries were not available (the build_all job didn't run on
v0.x tags).

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-19 09:45:35 +01:00
Simon Pasquier
4175aefe5b Run 'build_all' job for v0.y tags 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-16 21:53:05 +01:00
Simon Pasquier
2afee518b5
Merge pull request #3179 from simonpasquier/cut-v0.25.0-rc.1 
Cut v0.25.0-rc.1
 2022-12-16 21:39:09 +01:00
Simon Pasquier
54bd81d222 Cut v0.25.0-rc.1 
The CI automation failed to publish the vv0.25.0-rc.0 tag so we need
to spin another release candidate.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-16 16:49:40 +01:00
Simon Pasquier
8c28ce5215
Merge pull request #3178 from prometheus/release-0.25 
Release 0.25
 2022-12-16 16:38:49 +01:00
Simon Pasquier
1eb79d9a17
Merge pull request #3177 from simonpasquier/fix-remote-docker-version 
Bump Docker version for remote Docker
 2022-12-16 16:19:09 +01:00
Simon Pasquier
2eda272480 Bump Docker version for remote Docker 
It should fix the publish_main and publish_release jobs in CircleCI.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-16 16:08:06 +01:00
Martin Chodur
26cbd6bd86
feat: add template.FromGlobsWithAdditionalFuncs (#3174) 
* refactor: add Options to the template.FromGlob function to allow customizing the Template

Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
 2022-12-16 10:13:13 -04:00
Simon Pasquier
d9c847e38b
Merge pull request #3176 from simonpasquier/v0.25.0-rc.0 
Cut V0.25.0 rc.0
 2022-12-16 14:38:03 +01:00
Simon Pasquier
5bfd61d499 release: cut v0.25.0-rc.0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-16 14:26:00 +01:00
Simon Pasquier
fac8c9245d doc: update with new HTTP configuration options 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-16 10:06:03 +01:00
gotjosh
907f7d3e80
Merge pull request #3132 from prometheus/webex-notifier 
Notifier: Webex
 2022-12-15 13:57:12 -04:00
gotjosh
c3aaca8d61
Doc changes requested by review 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2022-12-15 12:08:35 -04:00
gotjosh
1ba6405bbc
Remove the dedicated field to APIURL in favour of the configuration one 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2022-12-15 11:51:45 -04:00
gotjosh
572de996b7
Remove the bot_token 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2022-12-15 11:48:01 -04:00
gotjosh
02660ba09e
Add the webex documentation 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2022-12-15 11:19:17 -04:00
gotjosh
5ebe94d325
Rename message to markwdown on the webex notifier 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2022-12-15 11:05:55 -04:00
gotjosh
217524d823
Merge pull request #3145 from alexweav/log-warn 
Emit warning-level logs when truncating messages in notifications
 2022-12-13 19:33:30 -04:00
Alex Weaver
0eee3ca9cb Rename key to max_runes 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
9b9237cef1 Fix casing in victorops log message 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
18181afb15 Fix one last log level that I missed 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
42dcba213f Also log the length that values were truncated to 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
7a420fec35 Adjust degenerate log message in telegram notifier 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
ed3cfbb124 Avoid logging the entire message after truncation 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Alex Weaver
bb5804eca9 Change truncation log level to warn 
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2022-12-13 17:28:11 -06:00
Simon Pasquier
ace5662a79
Merge pull request #3171 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2022-12-13 15:10:07 +01:00
Simon Pasquier
519f45efbd Do not build with netgo on Windows 
In prevision of upgrading to Go 1.19 which introduces a change on
Windows platforms that may break users.

See https://github.com/prometheus/prometheus/issues/11480 for details.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-13 14:48:18 +01:00
Simon Pasquier
30ae6b8038 Update common Prometheus files 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-13 14:48:18 +01:00