RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-18 11:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,982 Commits 79 Branches 78 Tags 166 MiB
96d1b3300d
Commit Graph

1982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
stuart nelson
d15df87fd6
Merge pull request #1918 from adamdecaf/docs-clarify-api-routes 
docs: clarify API routing (and with --web.external-url)
 2019-06-12 10:22:19 +02:00
stuart nelson
5b9618e24f
Merge pull request #1920 from simonpasquier/add-simon-to-maintainers 
Add Simon Pasquier to MAINTAINERS.md
 2019-06-12 09:49:34 +02:00
masataka
b33a9366dd Textarea with auto resize in UI (#1893) 
* textarea with auto resize

Signed-off-by: mizukoshi-m <mizukoshi@mfeed.ad.jp>

* implement resize textarea on type

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

* remove scrollHeight

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

* Add new function for textarea field

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

* remove unnecessary code

Signed-off-by: m-masataka <m.mizukoshi.wakuwaku@gmail.com>
 2019-06-12 08:54:16 +02:00
Adam Shannon
4440caa94e docs: clarify API routing (and with --web.route-prefix) 
Signed-off-by: Adam Shannon <adamkshannon@gmail.com>
 2019-06-11 12:35:57 -05:00
stuart nelson
c16e90ef6f
Merge pull request #1655 from diogonicoleti/slack 
Add Slack error string to retry error message
 2019-06-11 16:27:54 +02:00
Simon Pasquier
e47e8daefe Add Simon Pasquier to MAINTAINERS.md 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-06-11 16:18:27 +02:00
stuart nelson
678ff5cf04 [amtool] print silence id, not silence id's pointer 
fixes #1917

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2019-06-10 10:22:49 +02:00
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