RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 16:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,067 Commits 66 Branches 77 Tags 218 MiB
d965ac6393
Commit Graph

2067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Pasquier
dea2829849
Bump golang 1.13 (#2031) 
* *: bump Go version to 1.13

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

* Fix go.mod and vendor/

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

* Update Go version for assets generation

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-16 12:22:25 +02:00
Simon Pasquier
e4437ab54f
*: remove dependency on github.com/prometheus/prometheus (#2009) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-16 10:56:29 +02:00
PrometheusBot
c07f76f0ae makefile: update Makefile.common with newer version (#2030) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-09-11 09:08:50 +02:00
Simon Pasquier
d5f6f88928
*: bump Open API dependencies (#2024) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-09 10:57:38 +02:00
Simon Pasquier
8beee36bd0
Merge release-0.19 branch to master (#2020) 
* Cut v0.19.0 (#2017)

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

* Fix CHANGELOG.md (#2018)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-05 11:08:08 +02:00
stuart nelson
f2cacf4495
Merge pull request #2016 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-08-30 13:10:17 +02:00
Simon Pasquier
5b775deb2f
Cut v0.19.0-rc.0 (#2015) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-30 12:35:05 +02:00
prombot
ccc01f0e7c makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-08-30 00:08:23 +00:00
Simon Pasquier
81ebf04e9d
*: remove mentions of Travis CI (#2014) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-29 11:43:05 +02:00
masataka
c5d41bb68e Grouping label's expand button with grouping id (#2012) 
* Expand button with id

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>

* fixed indexedMap

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>

* rebuild

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>
 2019-08-29 09:33:24 +02:00
Simon Pasquier
5fe5ea77a3
*: check Smarthost validity at config loading (#1957) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-28 15:04:40 +02:00
Carlos Eduardo
f21c04b6b1 Update x/sys and x/net modules to support Risc-V (#1984) 
* Update x/sys and x/net modules to support Risc-V

Signed-off-by: CarlosEDP <me@carlosedp.com>

* Remove go directive from go.mod

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-28 11:33:09 +02:00
Tim Reddehase
d517f786ef Allow slashes in receivers (#2011) 
* do not split receiver by slash

I'm not sure why this was originally done, because a slash seems to be perfectly
valid in a receiver definition. The only issue i encountered was that linking
from a fired alert was not working, because of the splitting performed here.

Signed-off-by: Tim Reddehase <tim.reddehase@xing.com>

* urlquery escape Receiver by default for URL

If Receiver is allowed to contain slashes and other special characters
we need to percent encode them properly.

Signed-off-by: Tim Reddehase <tim.reddehase@xing.com>

* rerun make asset/assets_vfsdata.go

Signed-off-by: Tim Reddehase <tim.reddehase@xing.com>
 2019-08-28 10:01:47 +02:00
Simon Pasquier
a1c04ee956
Fix out-of-date assets (#2013) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-27 16:41:12 +02:00
masataka
c1040d5d74 Recreate silence with previous comment. (#1927) 
* Recreate silence with previous comment.

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>

* implement newSilenceFromMatchersAndComment

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>

* Trigger

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>
 2019-08-27 12:03:57 +02:00
Simon Pasquier
9f7f4ead46
notify: don't use the global metrics registry (#1977) 
* notify: don't use the global metrics registry

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

* Address Max's comment

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-26 16:37:13 +02:00
johncming
40b3facdf6 config: use the origin field instead of local var (#1999) 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-08-26 14:01:40 +02:00
Simon Pasquier
b11dc2ebc0
Remove Travis CI (#2005) 
This change moves the continuous integration to Circle CI only as
maintaining 2 systems has a cost.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-26 11:15:28 +02:00
Ganesh Vernekar
c92047250f
Vendor prometheus 2.12.0 (#2008) 
* Vendor prometheus 2.12.0

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Update protos

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-08-22 15:35:15 +05:30
Ganesh Vernekar
3207e8b300
Vendor prometheus 2.12.0 (#2008) 
* Vendor prometheus 2.12.0

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Update protos

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-08-22 15:34:38 +05:30
Simon Pasquier
94d875f122
Bump prometheus/client_golang to v1.1.0 (#1989) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-08 14:36:10 +02:00
Simon Pasquier
f8428bfc7b
cmd/alermanager: log when repeat_interval > retention (#1993) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-07 14:58:43 +02:00
Simon Pasquier
655947d7e0
notify: refactor code to retry requests (#1974) 
* notify: refactor code to retry requests

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

* s/Process/Check/

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-02 16:17:40 +02:00
Asher Foa
f45f870d2c Add the ability to configure slack markdown field (#1967) 
* slack markdown field config

Signed-off-by: Asher Foa <asher@asherfoa.com>

* Add Test

Signed-off-by: Asher Foa <asher@asherfoa.com>

* remove empty lines

Signed-off-by: Asher Foa <asher@asherfoa.com>

* add empty line

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-31 12:04:59 +02:00