RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-19 20:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,867 Commits 79 Branches 78 Tags 169 MiB
release-schedule-am2
Commit Graph

2867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gotjosh
735239a3b0
Update release dates 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:39 +01:00
Simon Pasquier
e64a92355f
cluster: fix panic when tls_client_config is empty 
Closes #3403

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-07 10:45:39 +01:00
Simon Pasquier
e2e6dc56d2
Update email assets after #3420 (#3440) 
* Add template/email.tmpl to the clean target

The change ensures that all assets can be regenerated from scratch in
the CI.

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

* Update email assets after #3420

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

---------

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-07 10:45:39 +01:00
gotjosh
004585a031
update the circleCI go orb 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:39 +01:00
gotjosh
e75bb340d1
Mixin: Pin the mixtool version in CircleCI 
In mixtool, the tip of master broke for our mixin - I have managed to trace it down and opened a PR (see https://github.com/grafana/dashboard-linter/pull/143) but for now, let's pin the version to make sure our CI is not affected.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:39 +01:00
George Robinson
df826c136b
Fix example matchers in docs 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-07 10:45:39 +01:00
Alvin Lin
1e0af4de12
Update email.html to use "https://schema.org" instead of "https://schema.org" (#3420) 
According to schema.org's faq both https and http are fine, but https is preferred going forward: https://schema.org/docs/faq.html#19

Why am I making this change? To make some security code scanner happy :)

Signed-off-by: Alvin Lin <alvinlin123@gmail.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
8e2ef2cc43
Bump github.com/prometheus/common from 0.42.0 to 0.44.0 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.42.0 to 0.44.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.42.0...v0.44.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:39 +01:00
Kellin
444772fb3d
Build with Go 1.20 
- Start using Go 1.20 toolchain to build
- Remove deprecated reference to updating .travis.yml

Signed-off-by: Kellin <kellin@retromud.org>
 2023-08-07 10:45:39 +01:00
prombot
a8d3f2f4de
Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2023-08-07 10:45:39 +01:00
Mahesh Vidhyadharan
5c330a9f5e
fixing the field name for pagerduty image_config as per code https://pkg.go.dev/github.com/prometheus/alertmanager/config\#PagerdutyImage 
Signed-off-by: Mahesh Vidhyadharan <mahesh.vidhyadharan@steel-eye.com>
 2023-08-07 10:45:39 +01:00
George Robinson
402ab5a2f4
Log a warning when repeat_interval is less than group_interval (#3389) 
* Log a warning when repeat_interval is less than group_interval

This commit updates Alertmanager to log a warning when
repeat_interval is less than group_interval for an individual route.

When repeat_interval is less than group_interval, the earliest
a notification can be sent again is the next time the aggregation
group is flushed, and this happens at each group_interval.

Signed-off-by: George Robinson <george.robinson@grafana.com>
---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:39 +01:00
Jack
a8c3cfb395
Add msteams (#3324) 
* Add msteams

Signed-off-by: Jack Zhang <jack4zhang@gmail.com>
---------
Signed-off-by: Jack Zhang <jack4zhang@gmail.com>
Signed-off-by: Jack <jack4zhang@gmail.com>
 2023-08-07 10:45:39 +01:00
George Robinson
7f9bd330dc
Document difference between tab and newline in tests (#3383) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
49351805d5
Bump github.com/prometheus/exporter-toolkit from 0.9.1 to 0.10.0 
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.9.1 to 0.10.0.
- [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.9.1...v0.10.0)

---
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>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
850cdc808c
Bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.15.0...v1.15.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
74f2ede812
Bump github.com/go-openapi/runtime from 0.25.0 to 0.26.0 
Bumps [github.com/go-openapi/runtime](https://github.com/go-openapi/runtime) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/go-openapi/runtime/releases)
- [Commits](https://github.com/go-openapi/runtime/compare/v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
90f63fb305
Bump go.uber.org/atomic from 1.10.0 to 1.11.0 
Bumps [go.uber.org/atomic](https://github.com/uber-go/atomic) from 1.10.0 to 1.11.0.
- [Release notes](https://github.com/uber-go/atomic/releases)
- [Changelog](https://github.com/uber-go/atomic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber-go/atomic/compare/v1.10.0...v1.11.0)

---
updated-dependencies:
- dependency-name: go.uber.org/atomic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
d292d75eb0
Bump github.com/cenkalti/backoff/v4 from 4.2.0 to 4.2.1 
Bumps [github.com/cenkalti/backoff/v4](https://github.com/cenkalti/backoff) from 4.2.0 to 4.2.1.
- [Commits](https://github.com/cenkalti/backoff/compare/v4.2.0...v4.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:39 +01:00
dependabot[bot]
33d8f0baaa
Bump golang.org/x/net from 0.8.0 to 0.10.0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.8.0 to 0.10.0.
- [Commits](https://github.com/golang/net/compare/v0.8.0...v0.10.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>
 2023-08-07 10:45:39 +01:00
Davide Bizzarri
6b3dbc1e38
notify/webhook: trim space from url_file content 
Signed-off-by: Davide Bizzarri <davide.bizzarri@neoom.com>
 2023-08-07 10:45:39 +01:00
George Robinson
80cbee0f58
Add more tests to TestMatchers (#3362) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-07 10:45:39 +01:00
George Robinson
08371b6c43
Add tests to TestMatchers (#3357) 
* Add tests to TestMatchers

This commit adds a number of tests to TestMatchers that asserts
some of the more nuanced behavior when parsing label matchers.

Signed-off-by: George Robinson <george.robinson@grafana.com>

---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-07 10:45:39 +01:00
Jean-Philippe Quéméner
60b04166e2
Cluster: Add memberlist label configuration option (#3354) 
* Cluster: Add memberlist label configuration option

Signed-off-by: Jean-Philippe Quémémer <jeanphilippe.quemener@grafana.com>

---------

Signed-off-by: Jean-Philippe Quémémer <jeanphilippe.quemener@grafana.com>
Signed-off-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:38 +01:00
Emmanuel Lodovice
0d4533acbf
api/v2: Delete silence respond with 404 when silence is not found (#3352) 
Signed-off-by: Emmanuel Lodovice <lodovice@amazon.com>
 2023-08-07 10:45:38 +01:00
Simon Pasquier
4dee088e06
docs: document the new proxy-related settings 
The version of `github.com/prometheus/common` imported by Alertmanager
adds several fields to the `http_config` and `oauth2` structs for
setting proxy parameters:
* `no_proxy`
* `proxy_from_environment`
* `proxy_connect_header`

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-07 10:45:38 +01:00
Alec
3d0739f347
Add support for pushover devices (#3318) 
* Add support for pushover devices

Signed-off-by: Alec Pinson <30310787+alec-pinson@users.noreply.github.com>

* update docs

Signed-off-by: Alec Pinson <30310787+alec-pinson@users.noreply.github.com>

---------

Signed-off-by: Alec Pinson <30310787+alec-pinson@users.noreply.github.com>
 2023-08-07 10:45:38 +01:00
gotjosh
4de7524d9f
Slack Notifier: Only return an error when it actually occurs (#3350) 2023-08-07 10:45:38 +01:00
dependabot[bot]
597baefd8c
Bump github.com/rs/cors from 1.8.3 to 1.9.0 
Bumps [github.com/rs/cors](https://github.com/rs/cors) from 1.8.3 to 1.9.0.
- [Release notes](https://github.com/rs/cors/releases)
- [Commits](https://github.com/rs/cors/compare/v1.8.3...v1.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:38 +01:00
dependabot[bot]
df4273482e
Bump github.com/benbjohnson/clock from 1.3.0 to 1.3.3 
Bumps [github.com/benbjohnson/clock](https://github.com/benbjohnson/clock) from 1.3.0 to 1.3.3.
- [Release notes](https://github.com/benbjohnson/clock/releases)
- [Commits](https://github.com/benbjohnson/clock/compare/v1.3.0...v1.3.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:38 +01:00
dependabot[bot]
74fd523714
Bump github.com/prometheus/client_golang from 1.14.0 to 1.15.0 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:38 +01:00
dependabot[bot]
d433ed5b32
Bump golang.org/x/text from 0.8.0 to 0.9.0 
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.8.0...v0.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:38 +01:00
dependabot[bot]
cf11f5d82a
Bump gopkg.in/telebot.v3 from 3.1.2 to 3.1.3 
Bumps gopkg.in/telebot.v3 from 3.1.2 to 3.1.3.

---
updated-dependencies:
- dependency-name: gopkg.in/telebot.v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-07 10:45:38 +01:00
Francois Gouteroux
7773f0648e
fix: change receiver model pointer to value (#3338) 
* fix: change receiver pointer to value and add test

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
---------

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
 2023-08-07 10:45:38 +01:00
gotjosh
2d22f2fd78
add reason code to slack notifier (#3252) 
* add reason code to slack notifier
this uses the new error with reason to determine based on status code what the reason is for the slack integration

partial #3231

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

* Add some tests

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

* Handle the error

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

---------

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:38 +01:00
r0nn
6bfc224814
fix wechat notifier response field name (#3330) 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-07 10:45:38 +01:00
gotjosh
b6ae7331b9
refer back to the prometheus release.md 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-04-28 14:16:49 +01:00
gotjosh
b861489da1
bump cadence to 3 months 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-04-28 13:35:58 +01:00
gotjosh
eb3ca5af31
Define a RELEASE.MD for the Alertmanager Project 
Will helps us get to a more regular cadance of releases.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-04-28 13:32:56 +01:00
Yijie Qin
9a8d1f976e
add reason code to notifiers (#3307) 
* add reason code to notifiers

Signed-off-by: Yijie Qin <qinyijie@amazon.com>
 2023-04-07 17:05:17 +02:00
Simon Pasquier
bb1c123b7f
Merge pull request #3226 from an5t/telegram-token-file 
Support loading Telegram bot token from file
 2023-04-06 17:15:17 +02:00
Simon Pasquier
2888649b47
Merge pull request #3314 from prometheus/dependabot/go_modules/github.com/go-openapi/strfmt-0.21.7 
Bump github.com/go-openapi/strfmt from 0.21.3 to 0.21.7
 2023-04-03 12:00:30 +02:00
Simon Pasquier
fb7ce70f90
Merge pull request #3316 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.234 
Bump github.com/aws/aws-sdk-go from 1.44.211 to 1.44.234
 2023-04-03 11:46:29 +02:00
Simon Pasquier
74df564cba
Merge pull request #3313 from prometheus/dependabot/go_modules/github.com/hashicorp/golang-lru/v2-2.0.2 
Bump github.com/hashicorp/golang-lru/v2 from 2.0.1 to 2.0.2
 2023-04-03 11:30:50 +02:00
Simon Pasquier
4676fca5a5
Merge pull request #3312 from prometheus/dependabot/go_modules/golang.org/x/tools-0.7.0 
Bump golang.org/x/tools from 0.6.0 to 0.7.0
 2023-04-03 11:29:45 +02:00
dependabot[bot]
372afd3091
Bump github.com/aws/aws-sdk-go from 1.44.211 to 1.44.234 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.211 to 1.44.234.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.211...v1.44.234)

---
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-04-01 15:59:23 +00:00
dependabot[bot]
beadc540d5
Bump github.com/go-openapi/strfmt from 0.21.3 to 0.21.7 
Bumps [github.com/go-openapi/strfmt](https://github.com/go-openapi/strfmt) from 0.21.3 to 0.21.7.
- [Release notes](https://github.com/go-openapi/strfmt/releases)
- [Commits](https://github.com/go-openapi/strfmt/compare/v0.21.3...v0.21.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-01 15:58:45 +00:00
dependabot[bot]
4390cffda6
Bump github.com/hashicorp/golang-lru/v2 from 2.0.1 to 2.0.2 
Bumps [github.com/hashicorp/golang-lru/v2](https://github.com/hashicorp/golang-lru) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/hashicorp/golang-lru/releases)
- [Commits](https://github.com/hashicorp/golang-lru/compare/v2.0.1...v2.0.2)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/golang-lru/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-01 15:58:33 +00:00
dependabot[bot]
4f9e921ef3
Bump golang.org/x/tools from 0.6.0 to 0.7.0 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](https://github.com/golang/tools/compare/v0.6.0...v0.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-01 15:58:17 +00:00
Simon Pasquier
747430cd42
Merge pull request #3303 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2023-03-22 18:35:46 +01:00