RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,901 Commits 67 Branches 77 Tags 209 MiB
Commit Graph

2901 Commits

Author SHA1 Message Date
Simon Pasquier 5d306d21c9
Merge pull request #3488 from prometheus/update-changelog-0.26 
Add a `[SECURITY]` to the changelog and update CVE-2023-40577
 2023-08-25 14:42:07 +02:00
gotjosh 7b9dba6afa
Add a `[SECURITY]` to the changelog and update CVE-2023-40577 
Some users have been vocal about the security fix not visible enough in the changelog, it seems like prometheus uses [SECURITY] to disclose these and I think it's a good practice.

A copy of #3487 but for the release branch of 0.26

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-25 11:20:52 +01:00
gotjosh fea2ca46b5
Cut 0.26 (#3478) 
* Cut 0.26

Release version 0.26 of the Alertmanager
---------

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-23 19:05:17 +01:00
Simon Pasquier 466b843163
Merge pull request from GHSA-v86x-5fm3-5p7j 
Check the validity of the generatorURL field
 2023-08-23 17:20:04 +02:00
Simon Pasquier 236ce26e55 Check the validity of the generatorURL field 
The Source button should only be displayed if the link starts by
'http://' or 'https://'.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-23 15:32:32 +02:00
gotjosh 0f80a72ee2
Fix year in 0.26.0-rc.0 entry (#3468) (#3475) 
Signed-off-by: Leonardo Taccari <leot@NetBSD.org>
Co-authored-by: Leonardo Taccari <iamleot@gmail.com>
 2023-08-23 14:14:20 +01:00
gotjosh 3ea2f24586
Release: fix the version formatting (#3467) 
It should be <major>.<minor>.<patch>-rc.<candidate>

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-17 16:35:19 +01:00
gotjosh 3f7401af58
Revert "Release: Fix version format (#3465)" (#3466) 
This reverts commit b3e3c89a60.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-17 16:24:42 +01:00
gotjosh b3e3c89a60
Release: Fix version format (#3465) 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-17 15:50:30 +01:00
gotjosh a0375ae9cd
Cut v0.26.0 rc.0 (#3447) 
* Cut v0.26.0 rc.0

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

* pr feedback

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

* fix the release date

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

---------

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-17 15:04:19 +01:00
George Robinson e1e59925cc
Update docs for slack_config (#3455) 
This commit updates the docs for slack_config with usage for both
Incoming webhooks and Bot tokens.

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-10 11:02:12 +01:00
Anton Tolchanov 94625df2b2
Treat error response payloads from Slack as errors (#3121) 
As described in the "More error types" section below, Slack API can return
errors with a 200 response code:
https://slack.dev/node-slack-sdk/web-api#handle-errors

This change adds parsing of API response to extract error messages.

Signed-off-by: Anton Tolchanov <anton@tailscale.com>
 2023-08-10 10:59:13 +01:00
dependabot[bot] 16cb095653
Bump github.com/benbjohnson/clock from 1.3.3 to 1.3.5 (#3434) 
Bumps [github.com/benbjohnson/clock](https://github.com/benbjohnson/clock) from 1.3.3 to 1.3.5.
- [Release notes](https://github.com/benbjohnson/clock/releases)
- [Commits](https://github.com/benbjohnson/clock/compare/v1.3.3...v1.3.5)

---
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-08 11:14:17 +01:00
dependabot[bot] 3c8e6faf1f
Bump github.com/go-openapi/errors from 0.20.3 to 0.20.4 (#3413) 
Bumps [github.com/go-openapi/errors](https://github.com/go-openapi/errors) from 0.20.3 to 0.20.4.
- [Commits](https://github.com/go-openapi/errors/compare/v0.20.3...v0.20.4)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/errors
  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 11:00:47 +01:00
dependabot[bot] 7a4ad5ba88
Bump github.com/stretchr/testify from 1.8.2 to 1.8.4 (#3414) 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.2 to 1.8.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.2...v1.8.4)

---
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-08 11:00:20 +01:00
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