This repository was archived by the owner on Apr 7, 2024. It is now read-only.
Update alertmanager #21
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: nekketsuuu <[email protected]>
Signed-off-by: Mac Chaffee <[email protected]>
Signed-off-by: Mac Chaffee <[email protected]>
Signed-off-by: clyang82 <[email protected]>
fix lint error
Document that matchers are ANDed together
Unmarshal should validate that the root route does not contain any matchers. Prior to this change, only the deprecated match structures were checked. Signed-off-by: Philip Gough <[email protected]>
config: root route should have empty matchers
chore: Let git ignore temporary files for ui/app
correcting the logic to trucate fields instead of dropping alerts in the slack integration Signed-off-by: Prashant Balachandran <[email protected]>
Truncating fields that are sent to slack
* *: bump to Go 1.17 Signed-off-by: Simon Pasquier <[email protected]> * *: fix yamllint errors Signed-off-by: Simon Pasquier <[email protected]>
Signed-off-by: prombot <[email protected]>
* Automate CSS-inlining for default HTML email template The original HTML email template was added in `template/email.html`. It looks like the CSS was manually inlined. Most likely using the premailer.dialect.ca web form, which is mentioned in the README for the Mailgun transactional-email-templates project. The resulting HTML with inlined CSS was then copied into `template/default.tmpl`. This has resulted in `email.html` and `default.tmpl` diverging at times. This commit adds build automation to inline the CSS automatically using [juice][1]. The Go template containing the resulting HTML has been moved into its own file to avoid the script that performs the CSS inlining having to parse the `default.tmpl` file to insert it there. Fixes prometheus#1939. [1]: https://www.npmjs.com/package/juice Signed-off-by: Brad Ison <[email protected]> * Update asset/assets_vfsdata.go Signed-off-by: Brad Ison <[email protected]>
Signed-off-by: Simon Pasquier <[email protected]>
go.{mod,sum}: update Go dependencies
* Support http_config for amtool Co-authored-by: Julien Pivotto <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> Signed-off-by: clyang82 <[email protected]>
Since the TopicARN field is a template string, it's safer to check for the ".fifo" suffix in the rendered string. Signed-off-by: Simon Pasquier <[email protected]>
This change also adds unit tests for SNS configuration. Signed-off-by: Simon Pasquier <[email protected]>
notify/sns: detect FIFO topic based on the rendered value
…-sigv4-validation config: delegate Sigv4 validation to the inner type
… upto nanosecond precision but reduced to second as the UI only sends upto millisecond Signed-off-by: Prashant Balachandran <[email protected]>
The Markdown variant used on prometheus.io is different from the GitHub one and requires code blocks to be indented by four spaces to be recognized as part of a list item vs. terminating the list. Signed-off-by: Julius Volz <[email protected]>
…arkdown Fix markdown list describing Alertmanager matchers
* Changed Silences.expire(id) to not return error for already expired silence Signed-off-by: Soon-Ping Phang <[email protected]> * Added comment explaining idempotency change for Silences.expire() Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Fixed typo in comment Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Fixed another typo in comment Signed-off-by: Soon-Ping Phang <[email protected]> * Promoted comment to function-level Signed-off-by: Soon-Ping Phang <[email protected]> * Added API v2 test for DeleteSilence, PostSilence Signed-off-by: Soon-Ping Phang <[email protected]> * Fixed lint errors Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]> * Trigger build Signed-off-by: Soon-Ping Phang <[email protected]>
Synchronize common files from prometheus/prometheus
* added telegram config in notifiers Signed-off-by: timmilesdw <[email protected]> * added telegram config to config.go Signed-off-by: timmilesdw <[email protected]> * added package telegram to notify and initialization in cmd Signed-off-by: timmilesdw <[email protected]> * added telegram.default.message Signed-off-by: timmilesdw <[email protected]> * added telegram template to notifiers.go Signed-off-by: timmilesdw <[email protected]> * added message rendering from template to telegram integration Signed-off-by: timmilesdw <[email protected]> * documentation for telegram_configs Signed-off-by: timmilesdw <[email protected]> * added tests for telegram Signed-off-by: timmilesdw <[email protected]> * fixed config_test.go Signed-off-by: timmilesdw <[email protected]> * added valid parse_mode list to the error log Signed-off-by: timmilesdw <[email protected]> * made use of httpconfig, moved telegram client creation to New func, changed message truncation to 4096 chars Signed-off-by: timmilesdw <[email protected]> * changed supported values for telegram config Signed-off-by: timmilesdw <[email protected]> * added mock url for telegram tests to pass Signed-off-by: timmilesdw <[email protected]> * added api_url check to telegram config Signed-off-by: timmilesdw <[email protected]> * changed bot_token type to secret Signed-off-by: timmilesdw <[email protected]> * removed extra emptyline Signed-off-by: timmilesdw <[email protected]> * convert bot_token to string in telegram client creation Signed-off-by: timmilesdw <[email protected]> * updated configuration.md Signed-off-by: timmilesdw <[email protected]> * fixed mixed up errors Signed-off-by: timmilesdw <[email protected]> * check telegram api url without conversion to string Signed-off-by: timmilesdw <[email protected]>
Signed-off-by: prombot <[email protected]>
Synchronize common files from prometheus/prometheus
Correcting the condition for updating a silence. Earlier was checking…
…les/github.com/go-kit/log-0.2.1 Bump github.com/go-kit/log from 0.2.0 to 0.2.1
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.1.9 to 0.1.11. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.1.9...v0.1.11) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/golang.org/x/tools-0.1.11 Bump golang.org/x/tools from 0.1.9 to 0.1.11
Bumps [github.com/go-openapi/runtime](https://github.com/go-openapi/runtime) from 0.23.1 to 0.24.1. - [Release notes](https://github.com/go-openapi/runtime/releases) - [Commits](go-openapi/runtime@v0.23.1...v0.24.1) --- updated-dependencies: - dependency-name: github.com/go-openapi/runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Only build all binaries on main/release. Signed-off-by: SuperQ <[email protected]>
Speedup CI builds
…les/github.com/go-openapi/runtime-0.24.1 Bump github.com/go-openapi/runtime from 0.23.1 to 0.24.1
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/go-openapi/strfmt](https://github.com/go-openapi/strfmt) from 0.21.2 to 0.21.3. - [Release notes](https://github.com/go-openapi/strfmt/releases) - [Commits](go-openapi/strfmt@v0.21.2...v0.21.3) --- updated-dependencies: - dependency-name: github.com/go-openapi/strfmt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/stretchr/testify-1.8.0 Bump github.com/stretchr/testify from 1.7.0 to 1.8.0
…les/github.com/go-openapi/strfmt-0.21.3 Bump github.com/go-openapi/strfmt from 0.21.2 to 0.21.3
Bumps [github.com/cenkalti/backoff/v4](https://github.com/cenkalti/backoff) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/cenkalti/backoff/releases) - [Commits](cenkalti/backoff@v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: github.com/cenkalti/backoff/v4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/cenkalti/backoff/v4-4.1.3 Bump github.com/cenkalti/backoff/v4 from 4.1.2 to 4.1.3
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.32.1 to 0.37.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.32.1...v0.37.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: SuperQ <[email protected]>
…les/github.com/prometheus/common-0.37.0 Bump github.com/prometheus/common from 0.32.1 to 0.37.0
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.61 to 1.44.66. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.44.61...v1.44.66) --- 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] <[email protected]>
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.1.11 to 0.1.12. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.1.11...v0.1.12) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/hashicorp/memberlist](https://github.com/hashicorp/memberlist) from 0.3.1 to 0.3.2. - [Release notes](https://github.com/hashicorp/memberlist/releases) - [Commits](hashicorp/memberlist@v0.3.1...v0.3.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/memberlist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.1 to 1.12.2. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.12.1...v1.12.2) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/prometheus/client_golang-1.12.2 Bump github.com/prometheus/client_golang from 1.12.1 to 1.12.2
…les/golang.org/x/tools-0.1.12 Bump golang.org/x/tools from 0.1.11 to 0.1.12
…les/github.com/aws/aws-sdk-go-1.44.66 Bump github.com/aws/aws-sdk-go from 1.44.61 to 1.44.66
…les/github.com/hashicorp/memberlist-0.3.2 Bump github.com/hashicorp/memberlist from 0.3.1 to 0.3.2
Synchronize common files from prometheus/prometheus
…_change Move api error logs to debug
|
Than you for opening your PR! Reference to the YouTrack issue: ITT-1350 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.