RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-19 04:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,025 Commits 79 Branches 78 Tags 166 MiB
40b3facdf6
Commit Graph

2025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Pasquier
019ace3298
cluster: add more metrics (#1941) 
- alertmanager_cluster_alive_messages_total, total number of alive
messages received.
- alertmanager_cluster_peer_info, a constant metric labeled by peer name.
- alertmanager_cluster_pings_seconds, histogram of latencies for ping
messages.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-01 10:24:41 +02:00
Paul Traylor
6fbbda75ed Add Fingerprint to template data 
Signed-off-by: Paul Traylor <paul.traylor@linecorp.com>
 2019-06-28 17:35:32 +09:00
stuart nelson
c29b987ec6
Merge pull request #1943 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-06-26 13:51:08 +02:00
prombot
436a41bea4 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-06-26 00:01:11 +00:00
Simon Pasquier
add7700a8b
cmd/amtool: use base path from the configured URL (#1940) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-25 14:22:29 +02:00
bigMacro
5ff6cffa08 fix memory visibility error (#1936) 
Signed-off-by: denghuan <denghuan@actionsky.com>
 2019-06-25 10:11:45 +02:00
Simon Pasquier
9d5a7a271a
.circleci/config.yml: use prometheus/prometheus orb (#1937) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-24 15:17:24 +02:00
Simon Pasquier
7be683bcaf
.circleci/config.yml: limit the number of parallel tasks (#1932) 
If unlimited, it takes too much memory and the job is killed by the CI.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-24 14:31:59 +02:00
stuart nelson
b85f203187
Merge pull request #1935 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-06-24 12:30:49 +02:00
Simon Pasquier
02c9bb05bf
notify/pagerduty: fix images (#1931) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-24 12:19:06 +02:00
prombot
7170545057 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-06-23 00:00:44 +00:00
Max Inden
55c3b7bb22
Merge pull request #1934 from simonpasquier/cleanup-v2-acceptance-tests 
test/with_api_v2: remove calls to the v1 API
 2019-06-22 20:35:17 +02:00
Paul Gier
588e1e3f9f test/cli: add periods to comment sentences and import ordering 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-06-20 10:37:59 -05:00
Simon Pasquier
1207b90029 test/with_api_v2: remove calls to the v1 API 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-20 17:37:08 +02:00
Paul Gier
50ad3114a0 test/cli: add basic tests for amtool cli 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-06-19 17:33:35 -05:00
stuart nelson
bef850ac90
Merge pull request #1929 from simonpasquier/refactor-notify 
Split the notify package into sub packages
 2019-06-19 15:14:40 +02:00
Simon Pasquier
5f881d6d8e Run garbage collection more aggressively 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-19 11:32:41 +02:00
Simon Pasquier
0c3120efac *: split notify package 
Instead of keeping all notifiers in the notify package, it splits them
into individual sub-packages. This improves readability and
maintainability of the code.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-18 15:36:19 +02:00
stuart nelson
96d1b3300d
Merge pull request #1926 from prometheus/beorn7/modules 
Update prometheus/client_golang to v1.0.0
 2019-06-18 12:28:38 +02:00
beorn7
87ced08129 Update prometheus/client_golang to v1.0.0 
Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-17 18:12:21 +02:00
NODA, Kai
fe4760ca75 config/notifiers.go: fix opsgenieValidTypesRe (#1910) 
`^apple|banana|cherry$` finds matches to either of `^apple`, `banana`, or `cherry$`, so strings like `apple0`, `1banana2`, `3cherry` are accepted; I believe this wasn't intentional.

Signed-off-by: NODA, Kai <nodakai@gmail.com>
 2019-06-17 11:05:38 +02:00
Simon Pasquier
f1664ac870
notify: truncate description for PagerDuty v1 (#1922) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-14 14:41:36 +02:00
PrometheusBot
fa321fa4f3 makefile: update Makefile.common with newer version (#1923) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-06-14 09:33:24 +02:00
stuart nelson
9ddd923b22
Merge pull request #1921 from prometheus/beorn7/client_golang 
Add objectives to Summaries
 2019-06-12 16:40:34 +02:00
beorn7
318e006065 Mark some Summaries explicitly as having no objectives 
With the next release of client_golang, Summaries will not have
objectives by default. Interestingly, this will do the right thing for
the Summaries affected by this commit. However, right now those
summaries do get the old default objectives. They don't really make
sense because the affected Summaries receive Observations quite
infrequently (far less than once in the 10m max age currently
used). To not get surprising changes when moving on to client_golang
v1, let's explicitly set the Summaries as objective-less now.

Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-12 15:47:56 +02:00