RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-05 21:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,886 Commits 79 Branches 78 Tags 166 MiB
e31c1a7532
Commit Graph

2886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
e31c1a7532
Bump github.com/aws/aws-sdk-go from 1.44.234 to 1.44.317 (#3448) 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.234 to 1.44.317.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.234...v1.44.317)

---
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-08 10:59:46 +01:00
rongyi
b22dc1d5e0
if 9093/9094 port is in use, test case will fail (#3320) 
* Update test

Signed-off-by: rongyi <rongyi@onchain.com>

* Change port to uint16

Signed-off-by: rongyi <rongyi@onchain.com>

* Update testcase

Signed-off-by: rongyi <rongyi@onchain.com>

* make testcase pass

Signed-off-by: rongyi <rongyi@onchain.com>

---------

Signed-off-by: rongyi <rongyi@onchain.com>
 2023-08-07 12:31:05 +01:00
George Robinson
638f41c215
Log the GroupKey and alerts in retry (#3438) 
This commit updates notify.go to log the GroupKey and fingerprints
of an alert at the debug level, and just the GroupKey at the
warning level should the notify attempt fail.

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-07 11:31:28 +01:00
Simon Pasquier
5626bd4a94
Merge pull request #3443 from simonpasquier/fix-panic 
cluster: fix panic when `tls_client_config` is empty
 2023-08-07 11:21:48 +02:00
Simon Pasquier
84f8f4e620
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-04 14:42:18 +01:00
Simon Pasquier
aea6204d58 cluster: fix panic when tls_client_config is empty 
Closes #3403

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-04 14:29:06 +02:00
Simon Pasquier
130b8b6761
Merge pull request #3439 from prometheus/fix-mixin 
CI: Pin the mixtool version in CircleCI and update the golang CircleCI orb
 2023-08-04 09:17:26 +02:00
Simon Pasquier
e5771e2c93
Merge pull request #3405 from grobinson-grafana/grobinson/fix-docs 
Fix example matchers in docs
 2023-08-03 17:55:36 +02:00
gotjosh
4c9bc820e2
update the circleCI go orb 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-03 16:40:44 +01:00
gotjosh
07b89eb117
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-03 16:15:26 +01:00
Alvin Lin
7411e5436a
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-03 09:33:32 +01:00
Simon Pasquier
487db1383b
Merge pull request #3412 from prometheus/dependabot/go_modules/github.com/prometheus/common-0.44.0 
Bump github.com/prometheus/common from 0.42.0 to 0.44.0
 2023-07-03 15:47:43 +02:00
dependabot[bot]
68349af5e7
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-07-01 15:37:45 +00:00
Simon Pasquier
11e0edb1d2
Merge pull request #3411 from kellinm/build-with-go-1-20 
Build with Go 1.20
 2023-06-30 11:04:05 +02:00
Kellin
0bc3fd69df 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-06-29 17:50:47 -04:00
George Robinson
eaac8b7b2e Fix example matchers in docs 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-06-22 10:52:25 +01:00
Simon Pasquier
a85979e19d
Merge pull request #3398 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2023-06-19 11:26:16 +02:00
prombot
0c40862059 Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2023-06-17 17:49:02 +00:00
Simon Pasquier
90a8acd276
Merge pull request #3247 from maheshvidhyadharan/fix-pagerduty-image-config-field-name 
fixing the field name for pagerduty image_config
 2023-06-09 15:30:32 +02:00
Mahesh Vidhyadharan
2f3a4b0f10 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-06-09 15:24:33 +02:00
George Robinson
229ecb7e9a
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-06-08 22:58:24 +02:00
Jack
d10f21f38c
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-06-08 11:27:56 -04:00
George Robinson
9f683fc4e7
Document difference between tab and newline in tests (#3383) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-06-07 13:32:48 -04:00
Simon Pasquier
83304da507
Merge pull request #3374 from prometheus/dependabot/go_modules/github.com/prometheus/exporter-toolkit-0.10.0 
Bump github.com/prometheus/exporter-toolkit from 0.9.1 to 0.10.0
 2023-06-02 11:29:33 +02:00
dependabot[bot]
d366342edc
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-06-02 09:20:21 +00:00
Simon Pasquier
a4575b2c01
Merge pull request #3375 from prometheus/dependabot/go_modules/github.com/prometheus/client_golang-1.15.1 
Bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1
 2023-06-02 11:19:38 +02:00
Simon Pasquier
2a02f60357
Merge pull request #3377 from prometheus/dependabot/go_modules/github.com/go-openapi/runtime-0.26.0 
Bump github.com/go-openapi/runtime from 0.25.0 to 0.26.0
 2023-06-02 11:19:25 +02:00
Simon Pasquier
ecba72cbb1
Merge pull request #3376 from prometheus/dependabot/go_modules/go.uber.org/atomic-1.11.0 
Bump go.uber.org/atomic from 1.10.0 to 1.11.0
 2023-06-02 11:10:26 +02:00
Simon Pasquier
56f3e83e51
Merge pull request #3378 from prometheus/dependabot/go_modules/github.com/cenkalti/backoff/v4-4.2.1 
Bump github.com/cenkalti/backoff/v4 from 4.2.0 to 4.2.1
 2023-06-02 11:05:40 +02:00
Simon Pasquier
d61fcf7b44
Merge pull request #3373 from prometheus/dependabot/go_modules/golang.org/x/net-0.10.0 
Bump golang.org/x/net from 0.8.0 to 0.10.0
 2023-06-02 11:05:22 +02:00
dependabot[bot]
a60ef9dd40
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-06-01 15:58:36 +00:00
dependabot[bot]
6d2c5726b6
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-06-01 15:58:32 +00:00
dependabot[bot]
bdf8fc6b75
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-06-01 15:58:26 +00:00
dependabot[bot]
1b976820a1
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-06-01 15:58:20 +00:00
dependabot[bot]
f856cf01cd
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-06-01 15:58:10 +00:00
Simon Pasquier
5adc7369c8
Merge pull request #3363 from b1zzu/webhook-url-file-trim-space 
Trim space from webhook url_file content
 2023-05-16 14:58:26 +02:00
Davide Bizzarri
140c3d683f notify/webhook: trim space from url_file content 
Signed-off-by: Davide Bizzarri <davide.bizzarri@neoom.com>
 2023-05-16 13:30:06 +02:00
George Robinson
93797c3c9d
Add more tests to TestMatchers (#3362) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-05-16 09:41:25 +01:00
George Robinson
f67d03fe28
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-05-12 10:32:45 +01:00
Jean-Philippe Quéméner
9de8ef3675
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-05-05 17:26:22 +01:00
Emmanuel Lodovice
263ca5c943
api/v2: Delete silence respond with 404 when silence is not found (#3352) 
Signed-off-by: Emmanuel Lodovice <lodovice@amazon.com>
 2023-05-05 14:06:26 +01:00
Simon Pasquier
fe287e504e
Merge pull request #3306 from simonpasquier/update-http-config-doc 
docs: document the new proxy-related settings
 2023-05-05 14:29:57 +02:00
Alec
3b9cd0408e
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-05-05 13:04:47 +01:00
gotjosh
0f3ab929fa
Slack Notifier: Only return an error when it actually occurs (#3350) 2023-05-02 17:59:37 +01:00
Simon Pasquier
0f14383b61
Merge pull request #3346 from prometheus/dependabot/go_modules/github.com/rs/cors-1.9.0 
Bump github.com/rs/cors from 1.8.3 to 1.9.0
 2023-05-02 11:57:23 +02:00
Simon Pasquier
a4cb0f02f2
Merge pull request #3347 from prometheus/dependabot/go_modules/github.com/benbjohnson/clock-1.3.3 
Bump github.com/benbjohnson/clock from 1.3.0 to 1.3.3
 2023-05-02 11:48:55 +02:00
Simon Pasquier
9ee7fa211c
Merge pull request #3348 from prometheus/dependabot/go_modules/github.com/prometheus/client_golang-1.15.0 
Bump github.com/prometheus/client_golang from 1.14.0 to 1.15.0
 2023-05-02 11:28:19 +02:00
Simon Pasquier
6655b197f0
Merge pull request #3349 from prometheus/dependabot/go_modules/golang.org/x/text-0.9.0 
Bump golang.org/x/text from 0.8.0 to 0.9.0
 2023-05-02 11:24:59 +02:00
Simon Pasquier
91ec55ea65
Merge pull request #3345 from prometheus/dependabot/go_modules/gopkg.in/telebot.v3-3.1.3 
Bump gopkg.in/telebot.v3 from 3.1.2 to 3.1.3
 2023-05-02 11:24:30 +02:00
dependabot[bot]
c5b12567e6
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-05-01 15:58:26 +00:00