RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 00:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,068 Commits 66 Branches 77 Tags 218 MiB
4ec53566e5
Commit Graph

2068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diogo Nicoleti
7ab700a6c2
Merge branch 'master' into slack 2019-06-07 15:12:55 -03:00
stuart nelson
037ae5ecc6
Merge pull request #1915 from prometheus/stn/cli-filter-alerts-by-receiver 
Support filtering cli alert queries by receiver
 2019-06-07 13:44:48 +02:00
stuart nelson
20d052e22f
Merge pull request #1905 from simonpasquier/use-org-context 
Use Circle CI's org context
 2019-06-07 12:22:52 +02:00
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
0257e46f80
Merge pull request #1914 from prometheus/makefile_common 
Synchronize Makefile.common from prometheus/prometheus
 2019-06-07 10:50:25 +02:00
Simon Pasquier
2abd78cbb7
*: use persistent HTTP clients (#1904) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-07 10:37:49 +02:00
prombot
31718e5487 makefile: update Makefile.common with newer version 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-06-07 00:01:31 +00:00
Diogo Nicoleti
d8e79386cb
Refactoring to simplify slack retry function 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-06-05 17:24:39 -03:00
masataka
e33edd6f13 Create Silence from filter Bar (#1911) 
* Create Silence from filters

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>

* Get rid of unnecessary things

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>
 2019-06-05 19:01:56 +02:00
Diogo Nicoleti
70f95cfa51
Use %q instead of %s 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-06-04 18:16:01 -03:00
Diogo Nicoleti
35eb066e54
Move slack error handling to a new function 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 15:49:14 -03:00
Diogo Nicoleti
fa805a2f15
Fix lint 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 15:00:40 -03:00
Diogo Nicoleti
9ca88e3ebf
Improve slack error handling 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 14:46:52 -03:00
Diogo Nicoleti
7f4e70e0f4
Merge branch 'slack' of github.com:diogonicoleti/alertmanager into slack 2019-05-30 14:17:52 -03:00
Diogo Nicoleti
920179e5a9
fix text 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 14:16:13 -03:00
Diogo Nicoleti
c2ff8bd285
fix typo 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 14:16:13 -03:00
Diogo Nicoleti
77d073167d
Add Slack error message to the log 
Signed-off-by: Diogo Nicoleti <diogo.nicoleti@gmail.com>
 2019-05-30 14:10:54 -03:00
Simon Pasquier
e832f73c42 Use Circle CI's org context 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-29 10:04:17 +02:00
stuart nelson
b783cf8e60
Merge pull request #1901 from simonpasquier/refactor-marker-count 
types: refactor *memMarker.Count method
 2019-05-27 17:36:43 +02:00
stuart nelson
6835e70b1b
Merge pull request #1902 from simonpasquier/fix-api-alert-counter 
api: add missing metrics for API v2
 2019-05-27 17:35:53 +02:00
Simon Pasquier
adcf283d4c api: add missing metrics for API v2 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-24 14:48:45 +02:00
Simon Pasquier
27e99e9e35 types: refactor *memMarker.Count method 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-24 13:36:01 +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