RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-19 12:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,278 Commits 66 Branches 0 Tags 217 MiB
406ddd200a
Commit Graph

2278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ben Ridley
24804e6b09 Improve comment fomatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
5d4231b001 Use consistent naming for mute time intervals 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
5152a2fbba Ensure mute time intervals are unique in config, add associated test 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
ae116cfc26 Fix comment formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
c34003ffdb Pre-allocate mute time config slice 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
fa2fab64de Simplify logging on time mute 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
8e03268af9 Add additional test cases from code review 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
1cc736c4c8 Return from errors earlier 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
11b643dd23 Remove superfluous test case 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
fb60329aad Add fullstops to comments 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
70b138a17a Apply formatting suggestions from code review 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
2c5c17a16a Update timeinterval/timeinterval.go 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
1957e3c80e Add some more complete test cases, test for broken clamping 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
2c86b696c9 Prevent clamping dates that start after the end of the month 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:02 +11:00
Ben Ridley
adf94c3168 Correct errors, test for specific error messages, improve formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
4c881ef5fb Tidy up error message formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
dd7a35e2b8 Add tests for configuration of mute times 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
ad385c275f Add check for undefined name in a mute time interval 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
44e9aa9762 Change undefined route to use quoted string formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
3ece40664b Remove unused test function 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
e052540c92 Add license header 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
0e9838c8f3 Fix formatting 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
58c1ef58a1 Clarify boundaries of ranges in docs 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
3d97ee55eb Update docs to include mute time sections 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
11c24d4ae6 Correct case from renaming 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
c51e598f91 Remove container testing script 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00