RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-29 09:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,944 Commits 66 Branches 77 Tags 218 MiB
ac03e5a818
Commit Graph

1944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stuart nelson
ac03e5a818 Support filtering cli alert queries by receiver 
This was dropped accidentally in
https://github.com/prometheus/alertmanager/pull/1798

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-06-07 12:20:38 +02:00
stuart nelson
588b4dd17b
Merge pull request #1892 from govau/fix1891 
Use scheme and auth info if present from URL
 2019-05-16 10:33:19 +02:00
Adam Eijdenberg
e2d8fd1e09 Use scheme and auth info if present from URL 
Signed-off-by: Adam Eijdenberg <adam.eijdenberg@digital.gov.au>
 2019-05-16 14:29:44 +10:00
stuart nelson
d291471f1e
Merge pull request #1888 from MIBc/master 
Invalid APISecret error if only set default api_secret for wechat
 2019-05-15 14:58:28 +02:00
lvjiawei
46a59f12d5 Invalid APISecret error if only set default api_secret for wechat 
Signed-off-by: lvjiawei <lvjiawei@cmss.chinamobile.com>
 2019-05-15 02:54:03 -07:00
Simon Pasquier
c20873b1fe
test/with_api_v2: fix variable shadowing (#1889) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-15 10:49:59 +02:00
stuart nelson
935fb919a8
Merge pull request #1886 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-05-15 08:54:38 +02:00
prombot
4996c09767 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-05-15 00:00:33 +00:00
stuart nelson
890d20555e
Merge pull request #1885 from simonpasquier/bump-prometheus-common 
Bump github.com/prometheus/common to v0.4.0
 2019-05-14 17:14:33 +02:00
Simon Pasquier
6997dc5fe0 Bump github.com/prometheus/common to v0.4.0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-14 14:26:44 +02:00
Bartek Płotka
9ddc5f1348 opsgenie: Moved from deprecated, non documented teams to responders field. (#1863) 
Teams config option will fail unmarshalling as it is deprecated.

Fixes https://github.com/prometheus/alertmanager/issues/1818

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2019-05-13 14:51:26 +02:00
stuart nelson
fba4070b2d
Merge pull request #1876 from prometheus/stn/collapse-alert-groups 
Collapse alert groups when initially viewing ui
 2019-05-13 12:25:16 +02:00
Stuart Nelson
d7000fc984 Merge branch 'master' into stn/collapse-alert-groups 2019-05-13 10:03:27 +02:00
stuart nelson
33219624d9
Merge pull request #1879 from wbh1/active-filter 
Add filtering based off of "active" query param in Web UI
 2019-05-12 13:04:36 +02:00
Andrey Kuzmin
0f1df58dee Regenerate bindata 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-05-11 20:28:33 +02:00
Andrey Kuzmin
658dd3a29f Properly serialize boolean 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-05-11 20:28:33 +02:00
Andrey Kuzmin
20c336fe22 Adjust the styling 
Signed-off-by: Andrey Kuzmin <andrey.kuzmin@soundcloud.com>
 2019-05-11 20:28:33 +02:00
Will Hegedus
5a5133af7e update Tests to account for "active" param 
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>
 2019-05-10 09:57:27 -04:00
Will Hegedus
96a33e1bc6 Add filtering based off "active" query param 
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>
 2019-05-08 12:05:18 -04:00
stuart nelson
e8d1840e02 Regenerate assets 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:35 +02:00
stuart nelson
1abb1fb9bb Persist alert group expansion in local storage 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:32 +02:00
stuart nelson
f46adfe46a Support expanding multiple groups 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:29 +02:00
stuart nelson
072365a44e Show alert count behind group 
Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:26 +02:00
stuart nelson
7e0862f67c When only one alert group is present, always expand it 
Can't think of a reason to hide the alerts if
there's only a single group.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:22 +02:00
stuart nelson
759bf7b6b6 Parse alert list into alert groups when received from API 
We can simplify the view flow by parsing the list
of alerts for custom grouping as soon as they are
returned to the update function.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-07 16:08:05 +02:00
stuart nelson
6749f9faa9
Merge pull request #1871 from johncming/hotfix/dup-close 
test/with_api_v1: delete duplicate close of http body.
 2019-05-06 12:41:29 +02:00
stuart nelson
3055acd248
Merge pull request #1878 from prometheus/stn/image-url-for-slack-config 
Add image_url to example of good config
 2019-05-06 12:38:36 +02:00
stuart nelson
6a0be9eaa2 Add image_url to example of good config 
There was a report that this isn't working.
Updating the config and ensuring the parsing works
correctly indicates that the image_url is being
read into a string.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-05-06 10:51:14 +02:00
stuart nelson
a8847c6689
Merge pull request #1877 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-05-05 11:16:52 +02:00
johncming
1c38a90eeb test/with_api_v1: delete duplicate close of http body. 
Signed-off-by: johncming <johncming@yahoo.com>
 2019-05-05 08:40:18 +08:00
prombot
813a1690cd makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-05-04 00:00:49 +00:00
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