RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-11 16:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,116 Commits 71 Branches 77 Tags 220 MiB
dcccf542f1
Commit Graph

2116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ricoberger
dcccf542f1 Adjust Opsgenie config for labels propagation 
Signed-off-by: ricoberger <mail@ricoberger.de>
 2020-06-04 15:47:18 +02:00
ricoberger
117c8ba8f1 Propagate labels to Opsgenie details 
Signed-off-by: ricoberger <mail@ricoberger.de>
 2020-06-04 09:30:02 +02:00
Simon Pasquier
e0cc523893
api/v2: add path and method to API v2 logs (#2261) 
* api/v2: add path and method to API v2 logs

When an API v2 handler logged a message, the log wouldn't include the
path and method. Since different handlers perform the same validations
(e.g. matchers for alerts and silences), it isn't easy to know which
handler was invoked (though the logged filename
+ line number provides a hint).

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

* Capitalize messages + improve logs

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-06-02 16:13:31 +02:00
LucasBoisserie
97bd078441
Add redirect on / to routePrefix (#2235) 
Signed-off-by: LucasBoisserie <lucas.boisserie@gmail.com>
 2020-05-28 17:07:55 +02:00
Ben Kochie
08956d1be3
Merge pull request #2269 from simonpasquier/update-orb 
Bump Prometheus orb to 0.6.0
 2020-05-27 17:15:36 +02:00
Simon Pasquier
6fb343b289 Bump Prometheus orb to 0.6.0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-05-27 13:51:47 +02:00
PrometheusBot
3313bd6e29
makefile: update Makefile.common with newer version (#2263) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2020-05-19 09:02:46 +02:00
Fahri YARDIMCI
12db463c7f
Add cluster command to show cluster and peer statuses. (#2256) 
Signed-off-by: Fahri Yardımcı <f.yardimci06@gmail.com>

Signed-off-by: Fahri Yardımcı <f.yardimci06@gmail.com>
 2020-05-18 15:25:15 +02:00
Simon Pasquier
de80d907d1
cluster: log error on reconnect failures (#2260) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-05-18 15:00:51 +02:00
Julien Pivotto
013177e2d0
Update dependencies (#2257) 
Update membership

Update common (support HTTP/2 client)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-05-18 15:00:36 +02:00
shamilpd
d8ad30179a
Enforce 512KB event size limit for Pagerduty events (#2225) 
* Enforce 512kb event size limit for Pagerduty

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>

* Add size limit to error message

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>

* Replace MaxEventSize setting with a const.

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>

* Change to package variable

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>

* Removed recursion in encodeMessage()

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>

* Unexport maxEventSize

Signed-off-by: Shamil Ishraq <shamil@pagerduty.com>
 2020-05-15 15:15:18 +02:00
rmahroua
e7adbea594
Update README.md (#2245) 
Move the `alertmanager.url` to a new line.

Signed-off-by: Razique Mahroua <rmahroua@redhat.com>
 2020-05-15 14:39:41 +02:00
Pascal Hofmann
7efb78bce9
Improve remark on UDP/TCP for high availability (#2231) 
* Improve remark on UDP/TCP for high availability
Signed-off-by: Pascal Hofmann <mail+github@pascalhofmann.de>

* Update README.md

Co-Authored-By: Max Inden <mail@max-inden.de>
Signed-off-by: Pascal Hofmann <mail+github@pascalhofmann.de>

* Update README.md
Signed-off-by: Pascal Hofmann <mail+github@pascalhofmann.de>

Co-authored-by: Max Inden <mail@max-inden.de>
 2020-05-14 16:17:03 +02:00
Julien Pivotto
8d050daf51
Bump go version to 1.14 (#2248) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-05-06 10:59:32 +02:00
Julien Pivotto
6867a9b308
Merge pull request #2251 from simonpasquier/github-issue-typo 
.github/ISSUE_TEMPLATE.md: fix typo
 2020-05-05 23:00:28 +02:00
Simon Pasquier
66bc3a3aff .github/ISSUE_TEMPLATE.md: fix typo 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-05-05 14:18:13 +02:00
Carlos Eduardo
071818bdac
Add image build for ppc64le architecture (#2219) 
Signed-off-by: Carlos de Paula <me@carlosedp.com>
 2020-03-30 16:56:23 +02:00
Dominik-K
f8ffc2a18a
Add warning that inhibition occurs on missing equal (#2214) 
Signed-off-by: Dominik <dominik-k@mailbox.org>
 2020-03-27 16:20:19 +01:00
Jacob Lisi
0c0c6bdb01
Fix race condition in dispatcher (#2208) 
* fix dispatcher race condition

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* add test to check for race condition in dispatcher

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* return when dispatcher Stop has nil receiver

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* remove unneeded chec

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
 2020-03-19 15:32:37 +01:00
Simon Pasquier
44af3201fe
notify: add retry field to debug log (#2188) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-03-13 15:39:16 +01:00
Alan
bd53c5ac39
add shebang for test script (#2206) 
add shebang for test script
Signed-off-by: alan <zg.zhu@daocloud.io>
 2020-03-11 10:16:53 +01:00
Simon Pasquier
e347c31ab6
api/v2: return empty array of peers when disabled (#2203) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-03-10 15:47:43 +01:00
Julien Pivotto
99e5cbff40
Merge pull request #2200 from pracucci/fix-dispatcher-metrics 
Fixed dispatcher metrics registration
 2020-03-06 22:43:13 +01:00
Marco Pracucci
1f77f320a7
Fixed dispatcher metrics registration 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2020-03-06 15:09:30 +01:00
PrometheusBot
255b2073dc
makefile: update Makefile.common with newer version (#2197) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2020-02-28 10:24:50 +01:00
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