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,050 Commits 71 Branches 77 Tags 220 MiB
bad2e792ca
Commit Graph

2050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Pasquier
2bbfd4acb6
cmd/alertmanager: add alertmanager_cluster_enabled metric (#1973) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-29 10:48:44 +02:00
stuart nelson
a74758e4c7
Merge pull request #1830 from pgier/amtool-tests 
test/cli: add basic amtool cli tests
 2019-07-24 17:41:10 +02:00
stuart nelson
ab11da7c3a
Merge pull request #1971 from bwplotka/disable-ha-explicit 
docs/flags: Make it explicit that HA is enabled by default and how to disable it.
 2019-07-24 17:19:50 +02:00
Simon Pasquier
ab537b5b2f
dispatch: fix missing receivers in Groups() (#1964) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-24 17:12:37 +02:00
Bartek Plotka
f7f8c47d55 docs/flags: Make it explicit that HA is enabled by default and how to disable it. 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2019-07-24 10:48:28 +01:00
stuart nelson
f450720213 Add fingerprint to expected template test output (#1968) 
This was recently added and the test needs to be updated.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-07-23 09:57:24 +02:00
Simon Pasquier
bdd91d2639
notify/opsgenie: log error from OpsGenie API (#1965) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-23 09:49:15 +02:00
stuart nelson
e7275537ff
Merge pull request #1945 from kfdm/webhook-fingerprint 
Add Fingerprint to template data
 2019-07-22 17:02:29 +02:00
Simon Pasquier
78c9ebc621
cmd/alertmanager: reject invalid external URLs (#1960) 
* cmd/alertmanager: reject invalid external URLs

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

* Address Brian's comments

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

* Simplify the code according to Max's feedback

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-22 14:35:26 +02:00
PrometheusBot
ad52fe9100 makefile: update Makefile.common with newer version (#1966) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-07-22 14:34:41 +02:00
Max Inden
4706dc7e6a
Merge pull request #1963 from simonpasquier/refactor-dispatch-route 
dispatch: use strings.Builder instead of []byte
 2019-07-16 09:52:55 +02:00
Simon Pasquier
612222b693 dispatch: use strings.Builder instead of []byte 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-15 15:27:37 +02:00
Simon Pasquier
9b0ecaa0fe
notify/email: wrap all errors for easier debugging (#1953) 
* notify/email: wrap all errors for easier debugging

In addition, this commit passes the current context to the TCP dialer
and it doesn't log any QUIT errors if the email delivery wasn't
successful.

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

* Fix typo

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-10 11:24:51 +02:00
Simon Pasquier
97d979848b
Cut v0.18.0 (#1952) (#1954) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-09 21:12:41 +02:00
Simon Pasquier
bb3df011a3
Move break at the beginning fo the for loop (#1928) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-04 15:31:09 +02:00
Simon Pasquier
75d3ba991c
Cut v0.18.0-rc.0 (#1947) 
* Cut v0.18.0-rc.0

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

* fix typo

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

* Fix more small typos

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

* include #1948

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

* Fix release date

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-03 22:03:32 +02:00
Simon Pasquier
98a604efa7
api/v2: fix alerts with multiple receivers (#1948) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-03 16:34:54 +02:00