RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-21 13:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,939 Commits 79 Branches 78 Tags 169 MiB
c20873b1fe
Commit Graph

1939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stuart nelson
96e23f770b
Merge pull request #1853 from simonpasquier/update-dockerignore 
.dockerignore: add more exceptions
 2019-04-23 16:53:12 +02:00
Simon Pasquier
4ee42fcbac .dockerignore: add more exceptions 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-23 16:15:57 +02:00
stuart nelson
de71239aef
Merge pull request #1852 from simonpasquier/fix-circleci-config 
.circleci: fix build job
 2019-04-23 15:26:31 +02:00
Simon Pasquier
cdd985eae9 .circleci: fix build job 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-23 14:48:05 +02:00
stuart nelson
f4231cf6e7
Merge pull request #1848 from simonpasquier/fix-flaky-dispatch-tests 
dispatch: fix flaky test
 2019-04-23 13:21:34 +02:00
stuart nelson
e08a001b67
Merge pull request #1838 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-04-23 13:20:09 +02:00
Simon Pasquier
2ccb4707f1 dispatch: fix flaky test 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-23 11:16:48 +02:00
Matthias Loibl
c7f1eb7553
Use github.com/oklog/run not archived oklog/oklog 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2019-04-22 15:11:40 +02:00
stuart nelson
1d9a35257f
Merge pull request #1843 from simonpasquier/fix-dropped-alerts 
Alerts might be dropped
 2019-04-20 10:33:16 +02:00
stuart nelson
a12252cd4f
Merge pull request #1844 from simonpasquier/refactor-cluster 
cluster: reduce code duplication
 2019-04-20 10:26:10 +02:00
Simon Pasquier
c78b449f4a provider/mem: fix dropped alerts 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-19 15:35:21 +02:00
Simon Pasquier
510cb2936f provider/mem: add test detecting dropped alerts 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-19 14:00:58 +02:00
Simon Pasquier
6592692907 cluster: reduce code duplication 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-17 16:20:41 +02:00
stuart nelson
b694eef820
Merge pull request #1791 from prometheus/stn+gs/alert-groups-endpoint 
re-add alert groups endpoint
 2019-04-17 12:24:47 +02:00
stuart nelson
2fa210d0e3 add groups endpoint to v2 api 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-04-17 11:32:21 +02:00
Simon Pasquier
9f5447bf46 Build container images for ARM32v7 and ARM64v8 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-16 14:41:18 +02:00
prombot
edd68d7e00 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-04-16 00:00:32 +00:00
stuart nelson
eb09caeea9
Merge pull request #1836 from simonpasquier/assets-without-gopath 
asset: fix when outside of $GOPATH
 2019-04-15 12:40:59 +02:00
Simon Pasquier
badb5c51aa asset: fix when outside of $GOPATH 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-15 11:41:50 +02:00
stuart nelson
2bff86249e
Merge pull request #1833 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-04-12 11:12:52 +02:00
prombot
702dd33416 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-04-12 00:00:29 +00:00
Max Inden
36ffb6ee71
Merge pull request #1811 from simonpasquier/dependabot/go_modules/github.com/hashicorp/go-sockaddr-1.0.2 
Dependabot/go modules/GitHub.com/hashicorp/go sockaddr 1.0.2
 2019-04-11 18:41:56 +02:00
Simon Pasquier
1c0b8e4139 notify: redact more secret data from logs (#1825) 
Follow-up of #1822

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-04 18:27:13 +02:00
stuart nelson
e2baff8d6e
Merge pull request #1822 from simonpasquier/redact-slack-url 
notify: redact Slack webhook URL from logs
 2019-04-03 18:33:05 +02:00
Simon Pasquier
0edf8bef44 notify: redact Slack webhook URL from logs 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-03 17:44:32 +02:00
stuart nelson
6ede51d921
Merge pull request #1821 from simonpasquier/distinct-log-levels-on-cancel 
*: log at debug level when context is canceled
 2019-04-03 17:23:55 +02:00
Simon Pasquier
a5e26cc721 *: log at debug level when context is canceled 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-03 16:41:03 +02:00
Max Inden
a36bc1bb8d
Merge pull request #1817 from mxinden/disable-caching 
ui/web: Set HTTP headers to prevent asset caching
 2019-04-03 14:00:26 +02:00
stuart nelson
fa92908942
Merge pull request #1798 from pgier/amtool-cli-apiv2 
cli: update amtool to use apiv2
 2019-04-03 10:16:29 +02:00
Paul Gier
fab3d1e89f cli: remove duplicate import 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-04-02 09:58:01 -05:00
Paul Gier
e31cfbf365 cli: minor style improvements 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-04-01 10:50:38 -05:00
Paul Gier
3b9629e294 cli: check for NotFound error during silence import 
Check the error type when there is a non-existent silence
instead of comparing the text of the error message.

Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 10:02:39 -05:00
Paul Gier
52f78c5b88 cli: add note to changelog related to amtool update 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 09:11:09 -05:00
Paul Gier
ab4784b112 cli: style improvement and fix filter handling 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 09:11:09 -05:00
Paul Gier
6561774f9e cli: fix some command output formatting 
- remove brackets around silence ID when adding new silence
- fix simple formatting of show config

Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 09:11:09 -05:00
Paul Gier
2d483fac88 minor godoc improvements 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 09:11:09 -05:00
Paul Gier
74fa2236f7 cli: update amtool to use apiv2 
Includes godoc improvements

Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 09:11:09 -05:00
Paul Gier
89b0ff0574 api/v2: Respond with 404 when silence ID is not found (#1816) 
When the client attempts to update a silence with a non-existent
ID, respond with a 404 (Not Found) instead of a 400 (Bad Request).

Signed-off-by: Paul Gier <pgier@redhat.com>
 2019-03-29 12:29:00 +01:00
Simon Pasquier
0f754cdef3 config: fix Wechat global parameters (#1813) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-29 12:21:59 +01:00
Max Leonard Inden
b1f05ce988
ui/web: Set HTTP headers to prevent asset caching 
This patch adds HTTP headers to each web asset response, disabling
caching for the payload. This prevents users running an old version of
the UI against a new version of Alertmanager once they updated. On the
down-side it increases page load size on subsequent page loads.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
 2019-03-29 09:33:20 +01:00
Max Inden
19ab388d93
Merge pull request #1800 from metalmatze/sort-peers 
Sort peers before returning via API
 2019-03-29 08:54:16 +01:00
stuart nelson
a94088406a
Merge pull request #1812 from simonpasquier/refactor-pg-error 
notify: rework handling of PagerDuty responses
 2019-03-26 13:50:17 +01:00
Simon Pasquier
f0763e2047 notify: rework handling of PagerDuty responses 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-26 11:49:43 +01:00
stuart nelson
c88121f0ae
Merge pull request #1799 from yasongxu/fix-golint 
fix golint error
 2019-03-25 17:07:26 +01:00
stuart nelson
5b09060431
Merge pull request #1802 from simonpasquier/remove-bzr 
Makefile: remove bzr check
 2019-03-25 16:18:30 +01:00
Simon Pasquier
bf43f5b7c2 Update vendor/ 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-22 17:09:56 +01:00
Simon Pasquier
ad71e1c0f3 Makefile: remove bzr check 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-18 09:55:12 +01:00
Matthias Loibl
70dde48f5c
Sort peers before returning via API 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2019-03-15 14:58:14 +01:00
xuyasong
60c9bf49c2 fix golint error 
Signed-off-by: xuyasong <1154564309@qq.com>
 2019-03-15 18:10:36 +08:00
Panayiotis
f40ecee773 api/v1: Add POST as an allowed CORS request method (#1796) 
Signed-off-by: xdrop <xdrop.me@gmail.com>
 2019-03-14 12:14:22 +01:00