RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-04 04:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,913 Commits 71 Branches 77 Tags 220 MiB
b4fb8a28ef
Commit Graph

1913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stuart nelson
b4fb8a28ef Collapse alert groups when initially viewing ui 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-03 16:15:07 +02:00
stuart nelson
b3972f3adc
Merge pull request #1672 from aixeshunter/master 
Unused function 'QTimeRange' and empty slice declaration via literal
 2019-05-03 14:13:04 +02:00
stuart nelson
c7551cd75c
Merge pull request #1873 from prometheus/release-0.17 
Cut v0.17.0
 2019-05-02 17:41:06 +02:00
stuart nelson
8175988acc Cut v0.17.0 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-02 15:03:19 +02:00
stuart nelson
d637ba3b6e
Merge pull request #1862 from BAESystemsAI/inhibition_icon 
added icon to show inhibited status
 2019-05-02 08:51:40 +02:00
James Ritchie
a6bdc73fa4 added icon to show inhibited status 
Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
 2019-05-01 08:22:41 +00:00
stuart nelson
c63d4b7584
Merge pull request #1864 from prometheus/default-grouping-in-ui 
Default grouping in ui
 2019-04-30 15:50:13 +02:00
stuart nelson
0a7e227549 Merge branch 'master' into default-grouping-in-ui 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-04-30 15:09:56 +02:00
stuart nelson
63bd05d8f9
Merge pull request #1869 from prometheus/stn/fix-filter-format 
Correctly construct filter query string for api
 2019-04-30 15:00:00 +02:00
stuart nelson
97e93f89c1
Merge pull request #1870 from prometheus/stn/unify-api-alert-filtering 
Move alert endpoints filter parsing to single function
 2019-04-30 12:53:17 +02:00
stuart nelson
1cc6c6f79c Move alert endpoints filter parsing to single function 
They are exactly the same, no reason to duplicate.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-04-30 10:59:17 +02:00
stuart nelson
1f41731881 Correctly construct filter query string for api 
Updating the api in
bc373f562f
resulted in the UI sending query strings for the
filter that no longer match what the backend
expects. This brings that in to line.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-04-29 16:50:56 +02:00
Simon Pasquier
f32ad1dd8b *: enable default linters (#1861) 
* *: enable default linters

* Remove direct usage of errcheck

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-29 10:54:40 +02:00
Andrey Kuzmin
287c149f92 Regenerate v2 models 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:44:12 +02:00
Andrey Kuzmin
eb8345e72f Update tests 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:31:48 +02:00
Andrey Kuzmin
461a6e5450 Update assets_vfsdata.go 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:21:53 +02:00
Andrey Kuzmin
9ddadb8c77 Support default grouping 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:14:31 +02:00
Andrey Kuzmin
1df9de3f28 Introduce a helper to render apiData 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:14:31 +02:00
Andrey Kuzmin
91d29725e0 Remove unused filter argument 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:14:31 +02:00
Andrey Kuzmin
26f3e4ef44 Generate AlertGroup decoders 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-04-27 12:14:31 +02:00
stuart nelson
d3e3585719
Merge pull request #1858 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-04-25 11:47:59 +02:00
Simon Pasquier
8dce9ac61f Add .golangci.yml 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-25 10:44:57 +02:00
prombot
f957060e63 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-04-25 00:00:31 +00:00
Max Inden
6b2abf48e0
Merge pull request #1846 from metalmatze/rungroup 
Use github.com/oklog/run not archived oklog/oklog
 2019-04-24 10:04:26 +02:00
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