Commit Graph

2002 Commits

Author SHA1 Message Date
Simon Pasquier
9b0ecaa0fe
notify/email: wrap all errors for easier debugging (#1953)
* notify/email: wrap all errors for easier debugging

In addition, this commit passes the current context to the TCP dialer
and it doesn't log any QUIT errors if the email delivery wasn't
successful.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Fix typo

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-10 11:24:51 +02:00
Simon Pasquier
97d979848b
Cut v0.18.0 (#1952) (#1954)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-09 21:12:41 +02:00
Simon Pasquier
bb3df011a3
Move break at the beginning fo the for loop (#1928)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-04 15:31:09 +02:00
Simon Pasquier
75d3ba991c
Cut v0.18.0-rc.0 (#1947)
* Cut v0.18.0-rc.0

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* fix typo

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Fix more small typos

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* include #1948

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Fix release date

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-03 22:03:32 +02:00
Simon Pasquier
98a604efa7
api/v2: fix alerts with multiple receivers (#1948)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-03 16:34:54 +02:00
Simon Pasquier
019ace3298
cluster: add more metrics (#1941)
- alertmanager_cluster_alive_messages_total, total number of alive
messages received.
- alertmanager_cluster_peer_info, a constant metric labeled by peer name.
- alertmanager_cluster_pings_seconds, histogram of latencies for ping
messages.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-07-01 10:24:41 +02:00
stuart nelson
c29b987ec6
Merge pull request #1943 from prometheus/makefile_common
Synchronize Makefile.common from prometheus/prometheus
2019-06-26 13:51:08 +02:00
prombot
436a41bea4 makefile: update Makefile.common with newer version
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-06-26 00:01:11 +00:00
Simon Pasquier
add7700a8b
cmd/amtool: use base path from the configured URL (#1940)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-25 14:22:29 +02:00
bigMacro
5ff6cffa08 fix memory visibility error (#1936)
Signed-off-by: denghuan <denghuan@actionsky.com>
2019-06-25 10:11:45 +02:00
Simon Pasquier
9d5a7a271a
.circleci/config.yml: use prometheus/prometheus orb (#1937)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-24 15:17:24 +02:00
Simon Pasquier
7be683bcaf
.circleci/config.yml: limit the number of parallel tasks (#1932)
If unlimited, it takes too much memory and the job is killed by the CI.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-24 14:31:59 +02:00
stuart nelson
b85f203187
Merge pull request #1935 from prometheus/makefile_common
Synchronize Makefile.common from prometheus/prometheus
2019-06-24 12:30:49 +02:00
Simon Pasquier
02c9bb05bf
notify/pagerduty: fix images (#1931)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-24 12:19:06 +02:00
prombot
7170545057 makefile: update Makefile.common with newer version
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-06-23 00:00:44 +00:00
Max Inden
55c3b7bb22
Merge pull request #1934 from simonpasquier/cleanup-v2-acceptance-tests
test/with_api_v2: remove calls to the v1 API
2019-06-22 20:35:17 +02:00
Simon Pasquier
1207b90029 test/with_api_v2: remove calls to the v1 API
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-20 17:37:08 +02:00
stuart nelson
bef850ac90
Merge pull request #1929 from simonpasquier/refactor-notify
Split the notify package into sub packages
2019-06-19 15:14:40 +02:00
Simon Pasquier
5f881d6d8e Run garbage collection more aggressively
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-19 11:32:41 +02:00
Simon Pasquier
0c3120efac *: split notify package
Instead of keeping all notifiers in the notify package, it splits them
into individual sub-packages. This improves readability and
maintainability of the code.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-06-18 15:36:19 +02:00
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