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

2304 Commits

Author SHA1 Message Date
prombot 1f8aea7cee Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-04-17 00:01:26 +00:00
Björn Rabenstein 22ac6dff21
Merge pull request #2534 from julienduchesne/add-slack-url-file 
Add support to set the Slack URL in a file
 2021-04-13 17:12:36 +02:00
Julien Duchesne f33427c96e Updated docs. Fixed YAML newlines 
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
 2021-04-13 10:59:15 -04:00
Andrey Kuzmin 54431be888
UI cleanup dead code with elm-review (#2528) 
* Add elm-review

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* elm-review --fix-all

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Update vfsdata

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
 2021-04-08 21:04:09 +02:00
Julien Pivotto d4169dcd63
Merge pull request #2531 from roidelapluie/maintainer-aku 
Add Andrey as maintainer
 2021-04-03 17:57:19 +02:00
Julien Pivotto eae02bdb03 Add Andrey as maintainer 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-04-03 17:56:12 +02:00
Julien Duchesne 59c7fd5053 Add support to set the Slack URL in a file 
- Added support for the file in both the global and the lower level
- Tried to follow configuration patterns I saw in prometheus
- The slack file is read on every request as mentioned in the prometheus issue to enable seamless switches

https://github.com/prometheus/alertmanager/issues/2498
Signed-off-by: Julien Duchesne <julien.duchesne@grafana.com>
 2021-04-01 21:59:49 -04:00
gotjosh bc7b16d61a
API: Make conversion functions public (#2530) 
* API: Make conversion functions public

All types are public so it makes sense to make these functions also
public for ease of downstream consumption.

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

* Add the license header to the new file

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

* Fix tests

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

* Make two more helper functions public

Signed-off-by: gotjosh <josue@grafana.com>
 2021-03-31 13:28:06 +05:30
Ganesh Vernekar 10757eb5fb
Export newMetrics function and metrics struct (#2523) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-03-24 12:37:58 +05:30
Julien Pivotto 72deec44a8
Merge pull request #2521 from roidelapluie/enable-new-build 
Enable new build
 2021-03-21 16:47:06 +01:00
Julien Pivotto f4a5ca74a9 Enable parallel circleci build 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-21 15:21:23 +01:00
prombot 7652f32104 Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-03-20 00:01:20 +00:00
Björn Rabenstein 319c8a918e
Merge pull request #2511 from codesome/upgrad-uuid 
Replace satori/go.uuid with gofrs/uuid
 2021-03-16 22:55:44 +01:00
Goutham Veeramachaneni b0975cb528
Merge pull request #2516 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2021-03-16 22:27:39 +01:00
Ben Kochie 53535551f5
Fix up golangci-lint errors. 
Signed-off-by: Ben Kochie <superq@gmail.com>
 2021-03-16 10:43:45 +01:00
prombot 8be6fd79d9
Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-03-16 09:08:28 +01:00
Ganesh Vernekar bf9c43b57d
Merge remote-tracking branch 'upstream/master' into upgrad-uuid 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-03-15 19:41:18 +05:30
Ganesh Vernekar 1f946f8a7d
Replace satori/go.uuid with gofrs/uuid 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-03-15 19:39:15 +05:30
Goutham Veeramachaneni 50d14f3da1
Merge pull request #2512 from gouthamve/update-go-openapi 
Update go-openapi to latest
 2021-03-15 12:57:17 +01:00
Goutham Veeramachaneni cead102e63
Remove indirect vendoring 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2021-03-15 11:17:52 +01:00
Goutham Veeramachaneni df77f87194
Recompile frontend 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2021-03-10 19:17:00 +01:00
Goutham Veeramachaneni e26425473c
Update go-openapi to latest 
go-swagger 0.25.0+ are failing though :/

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2021-03-10 19:00:22 +01:00
Björn Rabenstein 2d77eab99d
Merge pull request #2489 from poulinjulien/patch-1 
docs: Fix list formatting
 2021-03-10 17:44:30 +01:00
Goutham Veeramachaneni 0f9cab6991
Merge pull request #2509 from stevesg/wait-ready 
Clustering: Change WaitReady to accept a Context.
 2021-03-10 10:30:10 +01:00
Ganesh Vernekar 406ddd200a
Upgrade github.com/satori/go.uuid 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-03-10 14:49:07 +05:30
Steve Simpson 1711e72d1b Clustering: Change WaitReady to accept a Context. 
WaitReady is a blocking call and so should accept a Context in order to
be responsive to cancellation of the notification pipeline for any reason.

Signed-off-by: Steve Simpson <steve.simpson@grafana.com>
 2021-03-10 09:18:39 +01:00
Julien Poulin 1019991cee docs: Fix list formatting 
Added an empty line before the list to make sure it is properly rendered
on the documentation website.

Signed-off-by: Julien Poulin <poulin_julien@hotmail.com>
 2021-03-09 23:55:45 +01:00
Julien Pivotto 0fef08028b
Merge pull request #2505 from ArthurSens/master 
Amtool and Alertmanager binaries print to stdout
 2021-03-05 23:36:56 +01:00
ArthurSens 74d388e3f4 Amtool and Alertmanager binaries print to stdout 
Signed-off-by: ArthurSens <arthursens2005@gmail.com>
 2021-03-04 15:31:17 +00:00
Goutham Veeramachaneni 7866b9bb09
Merge pull request #2487 from gotjosh/alertmanager-clustering-interfaces 
Clustering: Interface for Peers in other packages
 2021-03-03 16:44:52 +01:00
gotjosh bbd01285b3
Address review feedback 
Signed-off-by: gotjosh <josue@grafana.com>
 2021-03-03 15:00:03 +00:00
Julien Pivotto fe39595143
Merge pull request #2502 from roidelapluie/set-directory 
Call SetDirectory for HTTP clients
 2021-03-03 15:29:23 +01:00
Julien Pivotto e5d2e1b268 Call SetDirectory for HTTP clients 
fix #2500

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-02 22:56:06 +01:00
gotjosh 6341b9fe0d
Use a private attribute for the memberlist.Node 
Signed-off-by: gotjosh <josue@grafana.com>
 2021-03-02 15:50:53 +00:00
Julien Pivotto b54f77998d
Merge pull request #2499 from roidelapluie/update-common 
Update common
 2021-03-02 06:35:58 +01:00
Julien Pivotto b4e000c6c2 Update common 
- Add support for custom authorization scheme
- Add support for not following redirects in http_client

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-01 23:19:38 +01:00
Björn Rabenstein b9b082e6a0
Merge pull request #2497 from machine424/typ 
Fix a typo in docs/configuration.md
 2021-03-01 19:16:30 +01:00
machine424 3054def040 Fix a typo in docs/configuration.md 
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2021-03-01 18:11:50 +01:00
Björn Rabenstein e66c8033ec
Merge pull request #2393 from benridley/dev_time_interval 
Add time-based muting to routing tree
 2021-03-01 17:42:54 +01:00
Andrey Kuzmin b0083ec55d
Negative matchers on the Silence form page (#2488) 
* Support negative matchers in silence form

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Extract url manipulation from filterBar

This is needed for silence form, where we don't have to
manipulate the url.

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Only show the silence button in the alert list

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Validate matchers

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Improve silence form layout

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Fix for editing existing silence

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Fix for resetting the form

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>

* Update assets_vfsdata.go

Signed-off-by: Andrey Kuzmin <unsoundscapes@gmail.com>
 2021-03-01 16:40:32 +01:00
Ben Ridley df54b4bacf Improve documentation wording and formatting in response to maintainer feedback 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley 3a5f4e5043 Fix formatting after merge conflict in config.go 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley d0217a80b0 Add JSON marshalling and unmarshalling support for time intervals 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley d9d7511ad0 Revert unwanted formatting change 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley bcab6aa8c3 Change wording in root route mute time interval error to align with other error message wording 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley 253e28abde Remove unnecessary json tag in MuteTimeInterval 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley 5983d2078d Fix formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley d177471822 Improve comment formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley 0fe51de6e3 Clarify timezone support in mute time intervals 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley 7ffd4ca4f4 Change docs to reflect mute_time_intervals in routes instead of mute_times 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00