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

2807 Commits

Author SHA1 Message Date
Manuel Rüger f2f411094e Update gopkg.in/alecthomas/kingpin.v2 to github.com/alecthomas/kingpin/v2 
Upstream changed package name, see:
https://github.com/alecthomas/kingpin#overview

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
 2023-03-08 15:02:24 +01:00
Simon Rozet 41eb1213bb
support loading webhook URL from a file (#3223) 
* support loading webhook URL from a file

/cc #2498

Signed-off-by: Simon Rozet <me@simonrozet.com>

* notify/webhook: add test for reading url from file

Signed-off-by: Simon Rozet <me@simonrozet.com>

* notify/pushover: add tests for reading secrets from files

Signed-off-by: Simon Rozet <me@simonrozet.com>

---------

Signed-off-by: Simon Rozet <me@simonrozet.com>
 2023-03-03 15:31:14 +01:00
Simon Pasquier 44bb5c9bd3
Merge pull request #3272 from prometheus/dependabot/go_modules/golang.org/x/tools-0.6.0 
Bump golang.org/x/tools from 0.4.0 to 0.6.0
 2023-03-03 11:49:29 +01:00
dependabot[bot] 65fb326421
Bump golang.org/x/tools from 0.4.0 to 0.6.0 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.4.0 to 0.6.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](https://github.com/golang/tools/compare/v0.4.0...v0.6.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-03-02 16:28:40 +00:00
Simon Pasquier 60d01e287b
Merge pull request #3271 from prometheus/dependabot/go_modules/github.com/stretchr/testify-1.8.2 
Bump github.com/stretchr/testify from 1.8.1 to 1.8.2
 2023-03-02 17:27:31 +01:00
Simon Pasquier 158d4a9828
Merge pull request #3273 from prometheus/dependabot/go_modules/golang.org/x/text-0.7.0 
Bump golang.org/x/text from 0.6.0 to 0.7.0
 2023-03-02 17:27:13 +01:00
Simon Pasquier 0fc6b556e8
Merge pull request #3268 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.211 
Bump github.com/aws/aws-sdk-go from 1.44.191 to 1.44.211
 2023-03-02 17:26:56 +01:00
dependabot[bot] 3061701437
Bump github.com/go-openapi/validate from 0.22.0 to 0.22.1 (#3269) 
Bumps [github.com/go-openapi/validate](https://github.com/go-openapi/validate) from 0.22.0 to 0.22.1.
- [Release notes](https://github.com/go-openapi/validate/releases)
- [Commits](https://github.com/go-openapi/validate/compare/v0.22.0...v0.22.1)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/validate
  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-03-01 16:06:11 +00:00
dependabot[bot] 28d2baa973
Bump golang.org/x/text from 0.6.0 to 0.7.0 
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.6.0...v0.7.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-03-01 15:58:56 +00:00
dependabot[bot] 94879d9e2a
Bump github.com/stretchr/testify from 1.8.1 to 1.8.2 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.1...v1.8.2)

---
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>
 2023-03-01 15:58:44 +00:00
dependabot[bot] 3dfa9a0102
Bump github.com/aws/aws-sdk-go from 1.44.191 to 1.44.211 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.191 to 1.44.211.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.191...v1.44.211)

---
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-03-01 15:58:29 +00:00
Simon Pasquier eea788a968
Merge pull request #3261 from prometheus/fix-silences-flaky-test 
Fix silences flaky test
 2023-02-24 14:11:00 +01:00
gotjosh 5318bc3ccb
replace atomic for uber fix atomic 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-02-24 12:11:50 +00:00
gotjosh c61ca09246
Fix silences flaky test 
Today I learned that `runtime.Gosched()` doesn't do what I thought it would.
While it allows other goroutines to run it doesn't guarantee that the main goroutine will be blocked until others are run.

sadly, I had to fall back to the sleep approach.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2023-02-24 12:09:47 +00:00
Furkan Türkal 57cad0d272
Seperate the template creating functions for as-lib use (#3225) 
* Separate the template creating functions for as-lib use

Fixes #3217

Signed-off-by: Furkan <furkan.turkal@trendyol.com>
---------

Signed-off-by: Furkan <furkan.turkal@trendyol.com>
 2023-02-24 10:24:00 +00:00
chengjoey f1e7e4fe47
fix gracefully-exiting stuck due to adding one more for `WaitGroup` (#3260) 
In the main function, `WaitGroup` done twice, but add three times, so it will get stuck when exiting

Signed-off-by: joey <zchengjoey@gmail.com>
 2023-02-24 10:23:06 +00:00
PrometheusBot 6450c9ff18
Update common Prometheus files (#3257) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2023-02-23 13:26:18 +00:00
Colin Douch a66692fa56
Add `--id` flag to `amtool silence query` (#3241) 
In the Web UI, we have a UI to get information on a given silence
through its ID. This functionality is missing from amtool however,
leading to the necessity to pull _all_ the silenced, and filter with
`grep` or similar.

This commit adds in a `--id` flag to the `silence query` command, which
allows specifying an ID to match on, matching the functionality of the Web UI.

Signed-off-by: sinkingpoint <colin@quirl.co.nz>
 2023-02-22 11:50:25 +00:00
George Robinson 11d0b57c97
Implement Stringer interface for Pairs and KVs (#3256) 
This commit implements the Stringer interface for Pairs and KVs.
It changes how Pairs are printed in templates from
map[name1:value1 name2:value2] to name1=value1, name2=value2. KVs
work similar, but are first sorted into pairs before being printed.

Signed-off-by: George Robinson <george.robinson@grafana.com>
 2023-02-22 11:38:15 +00:00
Alexander Weaver fe1b045c00
Set cache control headers in V2 API to mirror V1 (#3195) 
* Set cache control headers
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
 2023-02-07 15:57:54 +00:00
Yijie Qin 7923bc5f8e
add status code label to the numTotalFailedNotifications metric (#3094) 
* add reason label to the numTotalFailedNotifications metric

Signed-off-by: Yijie Qin <qinyijie@amazon.com>
 2023-02-03 12:09:21 +00:00
Simon Rozet 8f559aad34
mark webhook URL as a secret (#3228) 
Signed-off-by: Simon Rozet <me@simonrozet.com>
 2023-02-02 16:23:51 +00:00
Simon Pasquier 01f3a474c9
Merge pull request #3234 from prometheus/dependabot/go_modules/golang.org/x/net-0.5.0 
Bump golang.org/x/net from 0.4.0 to 0.5.0
 2023-02-01 17:48:30 +01:00
Simon Pasquier c65155e3b3
Merge pull request #3236 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.191 
Bump github.com/aws/aws-sdk-go from 1.44.171 to 1.44.191
 2023-02-01 17:28:31 +01:00
dependabot[bot] 2a324339d5
Bump golang.org/x/net from 0.4.0 to 0.5.0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.4.0...v0.5.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-02-01 16:18:39 +00:00
Simon Pasquier 4175ef8eee
Merge pull request #3235 from prometheus/dependabot/go_modules/golang.org/x/text-0.6.0 
Bump golang.org/x/text from 0.5.0 to 0.6.0
 2023-02-01 17:16:40 +01:00
Simon Pasquier bde93d91b3
Merge pull request #3233 from prometheus/dependabot/go_modules/github.com/gofrs/uuid-4.4.0incompatible 
Bump github.com/gofrs/uuid from 4.3.1+incompatible to 4.4.0+incompatible
 2023-02-01 17:16:27 +01:00
Simon Pasquier 7e90a7a4ea
Merge pull request #3232 from prometheus/dependabot/go_modules/github.com/go-openapi/spec-0.20.8 
Bump github.com/go-openapi/spec from 0.20.7 to 0.20.8
 2023-02-01 17:01:11 +01:00
dependabot[bot] 5c689f76fa
Bump github.com/aws/aws-sdk-go from 1.44.171 to 1.44.191 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.171 to 1.44.191.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.171...v1.44.191)

---
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-02-01 15:05:16 +00:00
dependabot[bot] 93f2642554
Bump golang.org/x/text from 0.5.0 to 0.6.0 
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.5.0...v0.6.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-02-01 15:04:44 +00:00
dependabot[bot] 5c3f4300a3
Bump github.com/gofrs/uuid from 4.3.1+incompatible to 4.4.0+incompatible 
Bumps [github.com/gofrs/uuid](https://github.com/gofrs/uuid) from 4.3.1+incompatible to 4.4.0+incompatible.
- [Release notes](https://github.com/gofrs/uuid/releases)
- [Commits](https://github.com/gofrs/uuid/compare/v4.3.1...v4.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 15:04:26 +00:00
dependabot[bot] fcb9159782
Bump github.com/go-openapi/spec from 0.20.7 to 0.20.8 
Bumps [github.com/go-openapi/spec](https://github.com/go-openapi/spec) from 0.20.7 to 0.20.8.
- [Release notes](https://github.com/go-openapi/spec/releases)
- [Commits](https://github.com/go-openapi/spec/compare/v0.20.7...v0.20.8)

---
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-02-01 15:04:20 +00:00
Simon Pasquier 8e6ce8f90c
Merge pull request #3224 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2023-02-01 14:40:59 +01:00
prombot 5f75250cd6 Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2023-01-20 17:48:38 +00:00
gotjosh f59460bfd4
Refactor nflog configuration options to make it similar to Silences. (#3220) 
* Refactor nflog configuration options to make it similar to Silences.

The Notification Log is a similar component to Silences. They're the only two things that are shared between nodes when running in HA and they both hold some sort of internal state that needs to be cleaned up on an interval.

To simplify the code and make it a bit more understandable (among other benefits such as improved testability) - I've refactor the notification log configuration and `run` to be similar to the silences.
 2023-01-19 16:39:03 +00:00
Simon Pasquier 0f7d21fd9c
Merge pull request #3209 from rohang98/pointer-to-value-fix 
Changes receiver and inhibition rules arrays to slices of value items instead of pointer items
 2023-01-19 17:35:29 +01:00
Simon Rozet a8e4c166a8
support loading pushover secrets from files (#3200) 
* support loading pushover secrets from files

Add the user_key_file and token_file keys to the pushover config.

/cc https://github.com/prometheus/alertmanager/issues/2498

Signed-off-by: Simon Rozet <me@simonrozet.com>
 2023-01-18 23:33:42 +01:00
Simon Pasquier 9c7adc4024
Merge pull request #3203 from prometheus/improve-am-config-docs 
Multiple improvements to Alertmanager configuration docs
 2023-01-18 17:05:37 +01:00
Julius Volz 8a42cbc9b5 Multiple improvements to Alertmanager configuration docs 
* The current page outline was an unstructured and unsorted mess, so I tried to
  organize the different configuration file fields into categories.
* I also sorted receivers alphabetically.
* Corrected the Telegram receiver's "bot_token" to be a "secret", not "string".
* Other minor improvements and wording additions to the sections.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2023-01-18 16:28:49 +01:00
Rohan Gupta df1dc0d359 Changes receiver and inhibition rules arrays to slices of value items 
Signed-off-by: Rohan Gupta <rohangupta.0927@gmail.com>
 2023-01-18 10:21:51 -05:00
Simon Pasquier 0ba6441756
Merge pull request #3216 from simonpasquier/investigate-acceptance-test-failures 
test: reduce flakiness of acceptance tests
 2023-01-18 16:13:16 +01:00
Simon Pasquier 01e1f5433a test: reduce flakiness of acceptance tests 
The CI environment isn't as performant as local machines: the time
needed to fully initialize the test environment can be significant and
skew the verification. Rather than setting the "virtual" clock used to
measure alert timings at the beginning of the acceptance test, it is
better to wait for the test bed to be ready.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2023-01-13 16:10:38 +01:00
Simon Pasquier ecb66f76b0
Merge pull request #3109 from nicollet/main 
Fixup: make signal handlers a bit simpler.
 2023-01-06 15:36:37 +01:00
Simon Pasquier ebcea59acc
Merge pull request #3190 from prometheus/release-0.25 
Release 0.25
 2023-01-05 14:35:35 +01:00
Simon Pasquier ef150318b4
Merge pull request #3194 from aminvakil/telegram_default_parse_mode 
Telegram default parse_mode has been changed to HTML
 2023-01-05 11:54:40 +01:00
Simon Pasquier 9aa5974c08
Merge pull request #3201 from prometheus/document-discord-notifier 
Add missing docs for Discord notifier
 2023-01-04 14:10:34 +01:00
Julius Volz 3f27314fb5 Add missing docs for Discord notifier 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2023-01-04 13:28:54 +01:00
Simon Pasquier e9dcb6e261
Merge pull request #3197 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.171 
Bump github.com/aws/aws-sdk-go from 1.44.162 to 1.44.171
 2023-01-04 11:35:10 +01:00
Simon Pasquier 8afd462a9e
Merge pull request #3198 from prometheus/dependabot/go_modules/github.com/rs/cors-1.8.3 
Bump github.com/rs/cors from 1.8.2 to 1.8.3
 2023-01-03 15:56:55 +01:00
dependabot[bot] ad8844404c
Bump github.com/rs/cors from 1.8.2 to 1.8.3 
Bumps [github.com/rs/cors](https://github.com/rs/cors) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/rs/cors/releases)
- [Commits](https://github.com/rs/cors/compare/v1.8.2...v1.8.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-01 15:02:38 +00:00