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

2942 Commits

Author SHA1 Message Date
George Robinson 5a462df83a
Support UTF-8 label matchers: Add more acceptance tests for braces when using amtool (#3523) 
* Add tests for PromQL braces when using amtool alert

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

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-09-21 13:57:11 +01:00
George Robinson 5ba9b9c7c3
Add test for PromQL braces when parsing lists of matchers (#3507) 
* Add test for PromQL braces when parsing lists of matchers

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

* Use acceptance tests

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

* Add test creating silence with braces

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

---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-09-12 17:00:18 +01:00
Simon Pasquier aa3e345017
Merge pull request #3516 from prometheus/remove-duplicate-msteams-integration 
Remove duplicate integration from metrics
 2023-09-08 17:01:13 +02:00
xenofree 5906dbc193
docs: fix typo regarding http_proxy for proxy_from_environment (#3514) 
* docs: fix typo regarding http_proxy for proxy_from_environment

Signed-off-by: xenofree <35098906+xenofree@users.noreply.github.com>

* docs: add NO_PROXY environment

Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: xenofree <35098906+xenofree@users.noreply.github.com>

---------

Signed-off-by: xenofree <35098906+xenofree@users.noreply.github.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
 2023-09-08 16:45:33 +02:00
gotjosh eef3708925
Remove duplicate integration from metrics 
This is harmless as the vector won't be duplicated but let's remove it anyways.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-09-08 15:26:36 +01:00
Colin Douch cfe4411deb
Add the receiver name to notification metrics (#3045) 
* Add receiver name as a label to notify metrics

This commit adds in a second label to the notify family of metrics
(e.g. numTotalFailedNotifications) - the receiver name. This allows
disambiguating which receiver is failing when one has many receivers
with the same integration type

Signed-off-by: sinkingpoint <colin@quirl.co.nz>

* Gate receiver names behind a feature flag

Signed-off-by: sinkingpoint <colin@quirl.co.nz>

---------

Signed-off-by: sinkingpoint <colin@quirl.co.nz>
Signed-off-by: gotjosh <josue.abreu@gmail.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2023-09-06 13:42:55 +01:00
George Robinson 6ce841ca22
Fix scheme required for webhook url in amtool (#3509) 
* Fix scheme required for webhook url in amtool

This commit fixes issue #3505 where amtool would fail with
"error: scheme required for webhook url" when using amtool
with --alertmanager.url.

The issue here is that UnmarshalYaml for WebhookConfig checks
if the scheme is present when c.URL is non-nil. However,
UnmarshalYaml for SecretURL returns a non-nil, default value
url.URL{} if the response from api/v2/status contains <secret>
as the webhook URL.

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

* Add test for config routes test

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

---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-09-05 17:53:24 +01:00
Simon Pasquier 0ac174aa0f
Merge pull request #3511 from simonpasquier/merge-release-0.26 
Merge release 0.26
 2023-09-05 17:02:55 +02:00
Simon Pasquier 8090c43d27 Merge remote-tracking branch 'origin/release-0.26' into merge-release-0.26 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-09-05 16:30:25 +02:00
Simon Pasquier 474c1c2f22
Merge pull request #3291 from simonpasquier/bump-prometheus-orbs 
.circleci/config.yml: bump to latest Prometheus orb
 2023-09-05 15:30:31 +02:00
Simon Pasquier 87f69c4d58 .circleci/config.yml: bump to latest Prometheus orb 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-09-05 15:23:18 +02:00
gotjosh 0d7e127bc7
Define a `RELEASE.MD` for the Alertmanager Project (#3445) 
* 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>

---------

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-09-05 14:09:34 +01:00
George Robinson 353c0a1304
Support UTF-8 label matchers: Add new parser (#3453) 
* Add label matchers parser

This commit adds the new label matchers parser as proposed in #3353.
Included is a number of compliance tests comparing the grammar
supported in the new parser with the existing parser in pkg/labels.

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

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-09-05 11:32:58 +01:00
Ben Kochie 87d3ee7554
Cleanup golangci-lint errcheck (#3502) 
Move the errcheck excludes list from an external file to inline in the
golangci-lint config file.

Signed-off-by: SuperQ <superq@gmail.com>
 2023-09-04 09:40:11 +01:00
Simon Pasquier 314205b5e6
Merge pull request #3501 from prometheus/dependabot/go_modules/github.com/xlab/treeprint-1.2.0 
Bump github.com/xlab/treeprint from 1.1.0 to 1.2.0
 2023-09-04 10:33:45 +02:00
Simon Pasquier 2c6495d31a
Merge pull request #3497 from prometheus/dependabot/go_modules/github.com/prometheus/client_golang-1.16.0 
Bump github.com/prometheus/client_golang from 1.15.1 to 1.16.0
 2023-09-04 10:30:01 +02:00
dependabot[bot] 229e17d19f
Bump github.com/xlab/treeprint from 1.1.0 to 1.2.0 
Bumps [github.com/xlab/treeprint](https://github.com/xlab/treeprint) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/xlab/treeprint/releases)
- [Commits](https://github.com/xlab/treeprint/compare/v1.1.0...v1.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 08:23:17 +00:00
dependabot[bot] 57f0965707
Bump github.com/prometheus/client_golang from 1.15.1 to 1.16.0 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.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.15.1...v1.16.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-09-04 08:22:48 +00:00
Simon Pasquier c5ea42b458
Merge pull request #3500 from prometheus/dependabot/go_modules/github.com/go-openapi/spec-0.20.9 
Bump github.com/go-openapi/spec from 0.20.8 to 0.20.9
 2023-09-04 10:22:07 +02:00
Simon Pasquier 6a1db02f8b
Merge pull request #3499 from prometheus/dependabot/go_modules/golang.org/x/tools-0.12.0 
Bump golang.org/x/tools from 0.7.0 to 0.12.0
 2023-09-04 10:21:04 +02:00
dependabot[bot] e55b9272ec
Bump github.com/go-openapi/spec from 0.20.8 to 0.20.9 
Bumps [github.com/go-openapi/spec](https://github.com/go-openapi/spec) from 0.20.8 to 0.20.9.
- [Commits](https://github.com/go-openapi/spec/compare/v0.20.8...v0.20.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-01 15:40:39 +00:00
dependabot[bot] 979fcb1f18
Bump golang.org/x/tools from 0.7.0 to 0.12.0 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.7.0 to 0.12.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](https://github.com/golang/tools/compare/v0.7.0...v0.12.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-09-01 15:40:35 +00:00
Jack 2a83643cdf
update msteams configs (#3495) 
Signed-off-by: Jack Zhang <jack4zhang@gmail.com>
 2023-09-01 15:03:47 +01:00
Hélia Barroso ba303644e6
Add missing ttl in pushhover (#3474) 
---------

Signed-off-by: Hélia Barroso <helia.barroso@farfetch.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
 2023-08-31 17:35:04 +02:00
Julius Volz 6cbe2eb21f
Merge pull request #3262 from prometheus/nexucis/react-app 
Initiate the React application with Status page
 2023-08-28 18:02:27 +02:00
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
George Robinson 4f1f020fe5
Docs: Update docs on inheritance for time intervals (#3472) 
This commit updates the docs on inheritance for group_wait,
group_interval and repeat_interval.

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-08-24 21:21:14 +01:00
Rita Canavarro 9063957924
[FEAT] Add missing integrations to notify metrics (#3480) 
Signed-off-by: rita.canavarro <rita.canavarro@farfetch.com>
 2023-08-24 21:20:42 +01:00
Simon Pasquier d7b4f0c732
Merge pull request #3479 from prometheus/cut-0.26-main 
Cut 0.26 main
 2023-08-24 09:32:03 +02: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
gotjosh c238d88b71
Fast Forward the `main` branch to align with 0.26 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-08-23 16:44:07 +01:00
Simon Pasquier b8f60392f4
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 16:42:24 +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
Leonardo Taccari 6fe1a24df0
Fix year in 0.26.0-rc.0 entry (#3468) 
Signed-off-by: Leonardo Taccari <leot@NetBSD.org>
 2023-08-18 10:50:32 +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
Augustin Husson fc3974518b sort import according to the config 
Signed-off-by: Augustin Husson <augustin.husson@amadeus.com>
 2023-08-16 09:53:05 +02:00
Augustin Husson f334232b85 override lint makefile directive 
Signed-off-by: Augustin Husson <augustin.husson@amadeus.com>
 2023-08-16 09:37:10 +02:00
Augustin Husson 4b86e08028 Merge branch 'main' into nexucis/react-app 2023-08-16 09:20:52 +02: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