RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 08:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 66 Branches 77 Tags 218 MiB
4d150b0cc4
Commit Graph

3053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Pasquier
99a464c914
Merge pull request #3169 from simonpasquier/bump-go-deps 
Bump Go dependencies
 2022-12-12 14:59:21 +01:00
Simon Pasquier
afe6923eb4 Bump Go dependencies 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-09 16:25:12 +01:00
Simon Pasquier
0afbe529ad
Merge pull request #3168 from FUSAKLA/fus-http-config-common 
feat: switch to LoadHTTPConfigFile from prometheus/common
 2022-12-09 16:23:43 +01:00
Martin Chodur
95fcc8b192 feat: switch to LoadHTTPConfigFile from common 
Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
 2022-12-09 12:01:51 +01:00
Simon Pasquier
3a7d064417
Merge pull request #3166 from simonpasquier/fix-3096 
Fix email template for resolved notifications
 2022-12-09 10:10:48 +01:00
Simon Pasquier
b29629ff13 Fix email template for resolved notifications 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-08 16:43:05 +01:00
Erki Esken
9ae611329a
Add check for templated Opsgenie receiver config (#3060) 
* Add check for templated Opsgenie receiver config

Solves #2887, where Opsgenie responder type can be templated according
to docs, but configuration logic checked for specific list of values only.

Signed-off-by: Erki Esken <erki@esken.net>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
 2022-12-07 22:13:03 +01:00
Simon Pasquier
1b202b91bf
Merge pull request #3156 from prometheus/dependabot/go_modules/github.com/cenkalti/backoff/v4-4.2.0 
Bump github.com/cenkalti/backoff/v4 from 4.1.3 to 4.2.0
 2022-12-01 16:46:17 +01:00
Simon Pasquier
414bea4da8
Merge pull request #3154 from prometheus/dependabot/go_modules/golang.org/x/mod-0.7.0 
Bump golang.org/x/mod from 0.6.0 to 0.7.0
 2022-12-01 16:16:53 +01:00
dependabot[bot]
abe5ea4b41
Bump golang.org/x/mod from 0.6.0 to 0.7.0 
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/golang/mod/releases)
- [Commits](https://github.com/golang/mod/compare/v0.6.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-01 15:12:55 +00:00
Simon Pasquier
2d47100386
Merge pull request #3158 from prometheus/dependabot/go_modules/golang.org/x/net-0.2.0 
Bump golang.org/x/net from 0.1.0 to 0.2.0
 2022-12-01 16:11:11 +01:00
Simon Pasquier
3dd1fb60d6
Merge pull request #3155 from prometheus/dependabot/go_modules/github.com/stretchr/testify-1.8.1 
Bump github.com/stretchr/testify from 1.8.0 to 1.8.1
 2022-12-01 16:10:42 +01:00
dependabot[bot]
b579ebae72
Bump golang.org/x/net from 0.1.0 to 0.2.0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.2.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.1.0...v0.2.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-01 15:07:09 +00:00
dependabot[bot]
f49863bce0
Bump github.com/cenkalti/backoff/v4 from 4.1.3 to 4.2.0 
Bumps [github.com/cenkalti/backoff/v4](https://github.com/cenkalti/backoff) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/cenkalti/backoff/releases)
- [Commits](https://github.com/cenkalti/backoff/compare/v4.1.3...v4.2.0)

---
updated-dependencies:
- dependency-name: github.com/cenkalti/backoff/v4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-01 15:06:51 +00:00
dependabot[bot]
f26b144db6
Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.0...v1.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-01 15:06:41 +00:00
Ben Kochie
c60fafa602
Merge pull request #3140 from simonpasquier/bump-toolkit-exporter 
* Bump github.com/prometheus/exporter-toolkit from 0.7.1 to 0.8.2

Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.7.1 to 0.8.2.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prometheus/exporter-toolkit/compare/v0.7.1...v0.8.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update code to match changes in exporter-toolkit

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Bump to v0.8.2

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-30 08:09:19 -08:00
Ben Kochie
432ee01c8c
Update Go to 1.19 (#3150) 
* Update Go to 1.19

* Update Go.
* Update some Go modules.
* Update Swagger to the latest for Go 1.19 compatibility.
* api/v2: regenerate
* Accommodate to the changes in the client package
* asset/assets_vfsdata.go: regenerate

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
 2022-11-30 17:06:57 +01:00