RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-19 20:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,091 Commits 79 Branches 78 Tags 169 MiB
443fdb0b36
Commit Graph

2091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
masataka
443fdb0b36
fix receiver regex (#2090) 
Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>
 2020-02-18 17:24:05 +01:00
Julien Pivotto
cad963d8a8
Mark pull request as stale after 60d of inactivity (#2185) 
During the dev Summit 2019/2, there was a consensus to mark stale PR
after 60 days.

This change is adding the stale bot configuration required for this.
The stale bot has already has access to the Prometheus organization. It
does _not_ comment and does _not_ close the stale pull request. It just
adds a label 'stale'.

This is already done in the collectd_exporter repository and there it
works as expected.

https://docs.google.com/document/d/1VVxx9DzpJPDgOZpZ5TtSHBRPuG5Fr3Vr6EFh8XuUpgs/edit

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-02-17 10:54:20 +01:00
Simon Pasquier
56e966bc20
api/v2: Fix silence creation error message (#2179) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-02-13 10:07:58 +01:00
stuart nelson
a6d722de6c
remove stuart from MAINTAINERS.md (#2181) 
I've been largely inactive for the last 6 months,
and have no plans to become active again.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2020-02-13 10:05:49 +01:00
Célian GARCIA
dcc0b70c7d
[Minor][one line change] Fix an error message about start and end time validation. EOM (#2173) 
* Fix an error message about start and end time validation

Signed-off-by: Célian Garcia <celian.garcia@amadeus.com>

* Modified start and end time validation message to be affirmative

Signed-off-by: Célian Garcia <celian.garcia@amadeus.com>
 2020-02-05 15:13:46 +01:00
melchiormoulin
e37f769035
Add slack channel when logging error. (#2177) 
Signed-off-by: Melchior MOULIN <m.moulin@criteo.com>
 2020-02-05 09:17:15 +01:00
Josh Soref
0f2c65d265 Spelling (#2167) 
* spelling: inhibition

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: matchers

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: notification

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: nonexistent

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: obfuscated

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: occurred

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: relevant

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: unexpected

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: marshaled

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: marshaling

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2020-01-23 17:06:16 +01:00
Kevin Hellemun
a2aa0cb5bf [#2160] Removed default assignment of env vars. (#2161) 
Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
 2020-01-22 14:53:19 +01:00
Sho Okada
04ca507125 Inherit their parent route's grouping when "group_by: [...]" (#2154) 
Signed-off-by: Sho Okada <shokada3@gmail.com>
 2020-01-10 14:20:03 +01:00
Max Inden
b4ac213809
Merge pull request #2153 from mxinden/remove-mxinden 
MAINTAINERS.md: Remove Max Inden (mxinden)
 2020-01-06 11:01:32 +01:00
Max Inden
6b01da3a64
MAINTAINERS.md: Remove Max Inden 
Signed-off-by: Max Inden <IndenML@gmail.com>
 2020-01-02 19:02:58 +01:00
johncming
134c3c0ed9 move walkRoute to dispatch package. (#2136) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-12-20 15:27:58 +01:00
Simon Pasquier
b49ebfc683
Merge release 0.20 (#2140) 
* Revert "slack: retry 429 errors (#2112)" (#2128)

This reverts commit 26cc96a787.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Revert "config: remove support for JSON marshaling (#2086)" (#2133)

This reverts commit 918f08b66a.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* config: fix JSON unmarshaling for HostPort (#2134)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Cut 0.20.0 (#2137)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-12-12 16:35:19 +01:00
Simon Pasquier
3640bb8d55
.circleci/config.yml: publish_release requires test_frontend (#2139) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-12-11 17:06:10 +01:00
meichuntao
5cb556e4b2 api/metrics/metrics.go: Fix returning wrong counter (#2126) 
Signed-off-by: meichuntao <mei.chuntao@zte.com.cn>
 2019-12-04 11:26:13 +01:00
Simon Pasquier
89db909017
Cut 0.20.0-rc.0 (#2119) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-11-27 13:41:30 +01:00
Simon Pasquier
2a1204e667
cmd/alertmanager: add alertmanager_integrations metric (#2117) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-11-27 09:33:08 +01:00
johncming
df1f1c8d74 types: remove redundant statements. (#2116) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-11-26 10:04:38 +01:00
Simon Pasquier
324c44ccb7
cmd/alertmanager: log unused receivers + add alertmanager_receivers metric (#2114) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-11-26 10:01:56 +01:00
Simon Pasquier
4f45457b9c
dispatch: add metrics (#2113) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-11-26 09:04:56 +01:00
Sylvain Rabot
21e99dcb63 Fix TestClusterJoinAndReconnect on macos (#2110) 
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
 2019-11-21 14:17:24 +01:00
Pger-Y
f76fec1fd9 cluster: change lock from Read lock to Write Lock since function modifies the struct... (#2109) 
Signed-off-by: John Smith <megman5576@gmail.com>
 2019-11-21 14:15:58 +01:00
Julien Pivotto
26cc96a787 slack: retry 429 errors (#2112) 
Fix #2111

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2019-11-21 14:14:10 +01:00
NotAFile
4ec53566e5 add elm-* to ui/app make clean (#2098) 
Signed-off-by: NotAFile <nota@notafile.com>
 2019-11-20 10:45:46 +01:00
johncming
d965ac6393 notify: optimize length check. (#2106) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-11-19 09:00:06 +01:00
Vincent Rischmann
66a0ed21bd template: add the default template function stringSlice (#2101) 
Since it's impossible to create a string slice in a Go template by
default, add a function to work around this problem.

The use case is to make it easy to call KV.Remove with an arbitrary
slice inside a template.

Signed-off-by: Vincent Rischmann <vincent@rischmann.fr>
 2019-11-13 09:32:51 +00:00
Charles JUDITH
64acc9bdf9 README.md: Add consistency for amtool examples (#2099) 
All the examples are written with `$ amtool` except for two of them.
This change will add `$ amtool` for all of them.

Signed-off-by: Charles JUDITH <c.judith@criteo.com>
 2019-11-10 18:01:34 +01:00
Ilya Gladyshev
196c62f488 At least one non-empty silence matcher (#2081) 
* check if at least one silence matcher doesn't match empty strings

Signed-off-by: qoops <ilya.v.gladyshev@gmail.com>

* fixed grammar

Signed-off-by: qoops <ilya.v.gladyshev@gmail.com>
 2019-10-31 15:42:03 +01:00
Simon Pasquier
71b3b3d7a4
notify/pagerduty: check that PagerDuty keys aren't empty (#2085) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-29 10:46:40 +01:00
Simon Pasquier
918f08b66a
config: remove support for JSON marshaling (#2086) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-29 10:45:42 +01:00
Simon Pasquier
0630b38c4a
config: forbid nil regexp matchers (#2083) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-25 11:44:45 +02:00
n33pm
a75cd02786 Add email notify Message-Id Header (#2057) 
* add email message-id

Signed-off-by: PM <wugyresearcher@gmail.com>

* check if message-id already exists

Signed-off-by: PM <wugyresearcher@gmail.com>

* simplify mail message-id procedure

Signed-off-by: PM <wugyresearcher@gmail.com>

* Add unit test

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-23 15:49:30 +02:00
Simon Pasquier
25b32434a6
store: fix potential flaky test (#2077) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-22 09:25:31 +02:00
Max Inden
23c7a3f84c
Merge pull request #2078 from perlun/patch-1 
Add goreman link
 2019-10-21 16:08:39 +02:00
Per Lundberg
b33bd61a24 Update README.md 
Added link to goreman repo.

Signed-off-by: Per Lundberg <perlun@gmail.com>
 2019-10-21 11:58:55 +03:00
Simon Pasquier
b2100315e1
.circleci/config.yml: cache Go modules (#2076) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-18 15:23:56 +02:00
Simon Pasquier
5211fad581
ui/app: fix silences filter (#2075) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-18 11:47:26 +02:00
Simon Pasquier
ad9dcf6d5a
Bump prometheus/client_golang to v1.2.1 (#2072) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-18 10:42:00 +02:00
Simon Pasquier
cb10f277c1
Bump prometheus/client_golang to v1.2.0 (#2069) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-17 09:57:09 +02:00
Kien Nguyen-Tuan
ca3893058c Consolidate invalid address log (#2063) 
The Invalid listen address errors should be as
same as Invalid advertise address.

Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>
 2019-10-11 14:05:06 +02:00
Stephen Reddekopp
f3a2ff8b7f Disable the grammarly plugin on all textareas to prevent inserted nodes from crashing the vdom (#2061) 
Signed-off-by: Stephen Reddekopp <stephen.reddekopp@gmail.com>
 2019-10-04 11:00:22 +02:00
johncming
bad2e792ca dispatch: route group labels should contain group common label. (#2055) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-10-02 14:54:34 +02:00
johncming
5ef70697a7 api/v1: return error more clear and common. (#2050) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-09-27 10:05:09 +02:00
johncming
311650658a nflog: use errors.New instead of fmt.Errorf for no custom error msg. (#2045) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-09-25 10:31:01 +02:00
johncming
52b4cecd56 types: remove unused equal method and add test case. (#2043) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-09-24 14:34:26 +02:00
Frederic Branczyk
76f339fc97
Merge pull request #2040 from simonpasquier/dont-gc-alerts-in-aggr-groups 
dispatch: don't garbage-collect alerts from store
 2019-09-23 17:47:33 +02:00
johncming
7d21f5a5a9 notify/wechat: adjust result check sequence. (#2044) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-09-23 09:31:57 +02:00
oddlittlebird
bc6dd0dd46 Update README.md (#2032) 
* Update README.md

Minor grammar fixes. Mostly correcting capitalization.

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Update README.md

Applied edits

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Update README.md

Removed a period and deleted unnecessary lines from License section

Signed-off-by: Oddlittlebird <oddlittlebird@gmail.com>

* Reword the contributing section

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-18 14:54:46 +02:00
Simon Pasquier
4535311c34 dispatch: don't garbage-collect alerts from store 
The aggregation group is already responsible for removing the resolved
alerts. Running the garbage collection in parallel introduces a race and
eventually resolved notifications may be dropped.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-18 11:42:14 +02:00
Christoph Maser
223dd6c47b Add docs for cluster.reconnect flags (#1991) 
fixes #1820

Signed-off-by: Christoph Maser <christoph.maser+github@gmail.com>
 2019-09-17 14:30:17 +02:00