RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-21 05:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,223 Commits 79 Branches 78 Tags 169 MiB
a3cb125e5c
Commit Graph

2223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Ridley
a3cb125e5c Move timeinterval library into locally maintained package 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
Ben Ridley
f53e7a984c Add tests for TimeMuteStage 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
d1f5e07909 Add mute time stage and pipeline 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
44d8cb43d2 Update gotime to v0.0.2 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
fe4b8399c3 Move time intervals to own section, add config validation 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
ea5b925147 Add buildah script for test container 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
1d912faab6 Add config timeinterval that allows intervals to be dumped back out on the status page of Alertmanager 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:01 +11:00
ben
cbfbf07188 Allow routes to reference time intervals 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:00 +11:00
ben
5df661653c Allow time intervals in global config 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:00 +11:00
ben
c2c0c5544d Add gotime library 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
 2021-03-01 08:30:00 +11:00
Björn Rabenstein
d57b2dcdec
Merge pull request #2471 from vladimiroff/issue-1682 
Expose negative matching in silences
 2021-02-19 18:17:42 +01:00
Kiril Vladimirov
740a97345f ui: add isEqual field to Matcher 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-19 00:14:04 +02:00
Kiril Vladimirov
84dd6ab8d7 cli/format: Use Matchers.String for extended formatting 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-18 23:43:15 +02:00
Kiril Vladimirov
217562e838 cli/format: Create labels.Matcher to format 
There is non-trivial value escaping going inside pkg/labels.

Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-18 23:43:15 +02:00
Kiril Vladimirov
f503012c0b cli: Parse properly all matcher types 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-16 14:22:59 +02:00
Kiril Vladimirov
133b5bab42 cli: Unify matcher formatting 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-16 14:22:59 +02:00
Kiril Vladimirov
2b6315f399 api/v2: Add Matcher.IsEqual to support all types 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-02-16 14:22:59 +02:00
Björn Rabenstein
a7ca7b1d29
Merge pull request #2443 from ajalab/fix-get-silence-filter-regex 
api: check silence matching by string comparison in getSilences
 2021-02-11 21:37:38 +01:00
Björn Rabenstein
023937679f
Catch unknown matcher types in gossipped silences (#2484) 
This has been discussed in #2479. Even if the conclusion there was
that we don't need this in a bugfix release, it's still better to have
this kind of robustness. So this introduces the same check into the
main branch.

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-02-10 12:02:56 +01:00
Simon Pasquier
23a7f89398
Update github.com/gogo/protobuf to v1.3.2 (#2478) 
Fix for CVE-2021-3121

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2021-02-09 16:49:07 +01:00
Simon Pasquier
45db1a1163
ui: update versions for the Elm components (#2482) 
The frontend CI job started to fail for some obscure reasons, most
probably because we use a very old version of NodeJS.

To make it work again, this change does the following:

* Bump to the latest NodeJS LTS version and use the buster variant.
* Use Yarn instead of npm to install Javascript packages.
* Bump Elm components to their latest versions.

There should be no functional change to the UI code.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2021-02-09 15:47:54 +01:00
Koki Kato
b5ddc5d638 Add test cases for silences with negative matchers 
Signed-off-by: Koki Kato <koki.kato1994@gmail.com>
 2021-02-09 23:01:21 +09:00
Koki Kato
b9aae07a73 Check silence matching with Protobuf models 
Signed-off-by: Koki Kato <koki.kato1994@gmail.com>

To support negative matchers.
 2021-02-09 22:53:00 +09:00
Koki Kato
72ce7fd71f api: add test for gettableSilenceMatchesFilterLabels 
Signed-off-by: Koki Kato <koki.kato1994@gmail.com>
 2021-02-09 22:07:15 +09:00
Koki Kato
f8c33ab47d api: check silence matching by string comparison in getSilences 
Signed-off-by: Koki Kato <koki.kato1994@gmail.com>
 2021-02-09 22:07:15 +09:00
gotjosh
e6a1bede89
Make MaxGossipPacketSize public (#2475) 
Downstream implementations might want to configure it.

Signed-off-by: gotjosh <josue@grafana.com>
 2021-02-05 18:06:47 +01:00
Gábor Lipták
f2f7a72813
Add Docker command to README (#2465) 
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
 2021-01-29 14:59:51 +01:00
Jack Baldry
bf94d58d56
fix(notify/victorops): Catch routing_key templating errors (#2467) 
* test(notify/victorops): Add test for templating errors

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* fix(notify/victorops): Catch routing_key templating errors

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
 2021-01-29 14:40:33 +01:00
treydock
e6824a3110
Fix extended printing of regex sign (#2445) 
Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
 2021-01-27 11:06:47 +01:00
Julien Pivotto
8ebd888488
Support https (#2446) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-27 10:52:08 +01:00
Björn Rabenstein
f328dc6f84
Merge pull request #2444 from mucamaca/trailing-ws 
remove trailing whitespace in docs
 2021-01-25 14:50:00 +01:00
Björn Rabenstein
165e2d012d
Merge pull request #2456 from vladimiroff/rm-types-matcher 
Replace types.Matcher(s)? with labels.Matcher(s)?
 2021-01-23 13:11:40 +01:00
Björn Rabenstein
c3c1aefbc2
Merge pull request #2463 from prometheus/beorn7/config 
Add JSON marshaling to config.Matchers
 2021-01-22 19:46:48 +01:00
beorn7
7561e7643c Add JSON marshaling to config.Matchers 
I have found out that we still need this for the v1 API (and possibly
elsewhere).

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-22 16:44:23 +01:00
Kiril Vladimirov
f85651f2c4 Marshal Matcher to JSON for API v1 compatibility 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-01-22 17:03:27 +02:00
Kiril Vladimirov
97e0c754c0 Remove NewRegexpMatcher and panic on error instead 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-01-22 17:03:24 +02:00
Kiril Vladimirov
f5382af591 silence: Add tests for Not(Equal|Regexp) matchers 
... and fix a bug in validating silences with such matchers, caught
while writing them.

Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-01-22 17:02:50 +02:00
Kiril Vladimirov
91083d6cd9 types: Fix typo in Silence.Matchers' documentation 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-01-22 17:02:50 +02:00
Kiril Vladimirov
7320d83cbc Replace types.Matcher(s)? with labels.Matcher(s)? 
Signed-off-by: Kiril Vladimirov <kiril@vladimiroff.org>
 2021-01-22 17:02:48 +02:00
Atibhi Agrawal
4ffba65ff5
Add negative matchers for inhibitors (#2460) 
Add new matchers for inhibition rules

Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2021-01-22 15:54:11 +01:00
Julien Pivotto
3f46b62d75
Merge pull request #2459 from prometheus/repo_sync 
Synchronize common files from prometheus/prometheus
 2021-01-17 02:19:50 +01:00
prombot
bca9422306 Update common Prometheus files 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2021-01-17 00:04:09 +00:00
Atibhi Agrawal
6b36afbbec
Add negative matchers for routing. (#2434) 
Add negative route matchers using label.Matcher

Signed-off-by: aSquare14 <atibhi.a@gmail.com>

Signed-off-by: beorn7 <beorn@grafana.com>

Co-authored-by: Björn Rabenstein <beorn@grafana.com>
 2021-01-15 21:11:39 +01:00
Björn Rabenstein
a715283b37
Merge pull request #2441 from prometheus/beorn7/matcher 
Improve labels.Matcher
 2021-01-15 20:12:16 +01:00
beorn7
99e4a4fbae Address code review comments 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-13 18:49:06 +01:00
beorn7
e1ab2477c0 Fix escaping for Matcher.String() 
Now the string created will correctly parse back.

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-13 13:21:30 +01:00
Bor Grošelj Simić
dd6b3afebe Remove trailing whitespace in docs 
Signed-off-by: Bor Grošelj Simić <bor.groseljsimic@telemach.net>
 2021-01-05 16:27:38 +01:00
beorn7
f7742393ae labels.Matcher: Add more test cases 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-23 23:59:25 +01:00
beorn7
3ce1d888d7 labels.ParseMatchers: Allow escaped quotes 
Previously, escaped double quotes would still be seen as ending the
quoting, potentially leading to wronk tokenization.

Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-23 22:37:12 +01:00
beorn7
9bb7ab43cd labels.Matcher: Improve regexp and allow escaping 
This addresses a number of issues:

- It was impossible to include a literal '"' or a line break in the value.
- It was impossible to include '=', '~', or '!' in the value.
- It was not validated if the label name is valid.
- It was not validated if the value is valid UTF-8.
- No whitespace was allowed around the operator.

Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-23 21:55:30 +01:00