stuart nelson
6bc77a1a14
Correctly render continue routing
...
Nodes with `continue: true` were being ignored,
and only the first match in the routing tree was
being highlighted.
Additionally, each node was incorrectly being set
to continue=true if nothing is received from the
API. The API sends nothing if continue=false.
2016-10-27 13:36:41 +02:00
Brian Brazil
85c4a0888f
Merge pull request #531 from chlunde/inhibitrule-race
...
inhibitrule: defer Unlock to fix race
2016-10-08 21:13:00 +01:00
Carl Henrik Lunde
2935ff84e7
inhibitrule: defer Unlock to fix race
2016-10-08 22:07:29 +02:00
Fabian Reinartz
97acef1819
Merge pull request #530 from brancz/mesh-password
...
encrypt mesh communication
2016-10-07 16:39:38 +02:00
Frederic Branczyk
8a2f93a102
*: allow use of mesh encryption through password parameter
2016-10-07 16:19:42 +02:00
Fabian Reinartz
a705ae8882
Merge pull request #527 from brancz/master
...
*: cut v0.5.0-beta.0
2016-10-06 11:54:27 +02:00
Frederic Branczyk
964f04cece
*: cut v0.5.0-beta.0
2016-10-06 11:25:01 +02:00
Fabian Reinartz
2433eebf48
Merge pull request #525 from brancz/fix-resolved-filter
...
notify: move resolved alert filtering to integration
2016-10-06 11:08:50 +02:00
Frederic Branczyk
dcf2b3afcb
notify: move resolved alert filtering to integration
...
Resolved alerts, even when filtered, have to end up in the
SetNotifiesStage, otherwise when an alert fires again it is ambiguous
whether it was resolved in between or not.
fixes #523
2016-10-05 17:45:35 +02:00
Fabian Reinartz
a84fba7762
Merge pull request #509 from prometheus/sil-metrics
...
silence: add metrics
2016-09-29 09:55:48 +02:00
Fabian Reinartz
7517453c68
silence: add metrics
2016-09-29 09:54:34 +02:00
sgissi
96a428a55e
config/notify: Add SMTP Require TLS global option ( #512 )
2016-09-27 11:00:21 +02:00
Vladimir Pouzanov
ab831348f1
Fixed the go install command ( #513 )
2016-09-25 13:34:13 +02:00
tattsun
9396976771
[ui] Save creator's e-mail address to in browser storage
2016-09-19 16:47:31 +02:00
Fabian Reinartz
503a6c0569
*: fix version
2016-09-09 16:01:32 +02:00
Fabian Reinartz
da3456e211
Merge pull request #503 from brancz/master
...
*: cut v0.4.0-alpha.0
2016-09-09 15:59:50 +02:00
Frederic Branczyk
8fd833a28a
*: cut v0.4.0-alpha.0
2016-09-09 15:59:05 +02:00
Fabian Reinartz
1734889583
Merge pull request #502 from brancz/ha-docs
...
add HA documentation to README.md
2016-09-09 15:33:00 +02:00
Frederic Branczyk
b901ea8192
add HA documentation to README.md
2016-09-09 15:28:32 +02:00
Steve Durrheimer
639f5b2cf1
Merge pull request #500 from prometheus/sdurrheimer-circle-use-base-image-for-tests
...
Use golang-builder base image for tests in CircleCI
2016-09-09 14:13:05 +02:00
Fabian Reinartz
df6599521c
Merge pull request #495 from brancz/matchercache
...
silence: add cache for silence matchers
2016-09-09 14:08:26 +02:00
Fabian Reinartz
62aa7bbd72
Merge pull request #501 from prometheus/vendor
...
vendor: remove dangling sqlite3 dependency
2016-09-09 13:51:22 +02:00
Fabian Reinartz
481b6fb0bd
vendor: remove dangling sqlite3 dependency
2016-09-09 13:40:13 +02:00
Steve Durrheimer
c8ddf8fd1e
Merge pull request #499 from prometheus/revert-496-sdurrheimer-circle-use-base-image-for-tests
...
Revert "Use golang-builder base image for tests in CircleCI"
2016-09-09 13:13:53 +02:00
Steve Durrheimer
31ecdbc388
Revert "Use golang-builder base image for tests in CircleCI"
2016-09-09 13:10:39 +02:00
Fabian Reinartz
6ba2a6a153
Merge pull request #498 from prometheus/changelog
...
changelog: add latest versions
2016-09-09 11:53:31 +02:00
Frederic Branczyk
e72e45c8f1
silence: add cache for silence matchers
...
compiling regex silence matchers on every query is expensive, therefore
caching them as soon as they are gossiped through the mesh
2016-09-09 11:41:39 +02:00
Fabian Reinartz
2d03cccf0e
changelog: add latest versions
2016-09-09 11:26:14 +02:00
Steve Durrheimer
5b4adbf9c2
Merge pull request #496 from prometheus/sdurrheimer-circle-use-base-image-for-tests
...
Use golang-builder base image for tests in CircleCI
2016-09-09 10:12:14 +02:00
Steve Durrheimer
560bfaf541
Use golang-builder base image for tests in CircleCI
2016-09-09 08:29:12 +02:00
Fabian Reinartz
8809ea2207
Merge pull request #493 from prometheus/readme
...
Update README
2016-09-07 14:44:26 +02:00
Fabian Reinartz
d0c574d318
readme: point to prometheus.io download section
2016-09-07 14:30:57 +02:00
Fabian Reinartz
4ec5208da4
Update README
...
This removes some things that no longer apply and syncs the installation intructions with the Prometheus repository
2016-09-06 17:00:52 +02:00
Fabian Reinartz
8583a2c173
Merge pull request #492 from brancz/retry-flag
...
add retry flag for notify providers
2016-09-06 16:32:25 +02:00
Frederic Branczyk
92acfbd449
add retry flag for notify providers
...
The retry flag allows an integration to specify whether a retry can
potentially be solved or if the error is likely not going to recover.
For example invalid authentication is likely a wrong configuration and
therefore a retry would not make sense, while a server error is likely
a temporary problem and can potentially be solved on the next retry.
2016-09-06 16:21:56 +02:00
Fabian Reinartz
bf6d47934e
Merge pull request #489 from prometheus/timeout
...
*: consider mesh wait in notification timeouts
2016-09-06 14:17:53 +02:00
Fabian Reinartz
b2461bb2d4
*: remove go-kit logging
2016-09-06 11:56:57 +02:00
Fabian Reinartz
50057906d0
vendor: update client lib and common
2016-09-06 11:50:13 +02:00
Fabian Reinartz
60bb55b4aa
example: fix config typo
2016-09-06 11:10:29 +02:00
Fabian Reinartz
d263b7ab9a
Merge pull request #487 from vanesa/master
...
allow CORS for api GET and OPTIONS
2016-09-05 13:26:49 +02:00
Fabian Reinartz
e9fbe62e0f
*: consider mesh wait in notification timeouts
...
This adds the peer wait duration to the standard timeout to avoid
terminating a notification prematurely while being in failover
wait status.
2016-09-05 13:21:28 +02:00
Fabian Reinartz
c01c1989a7
config: check overflow in global section
2016-09-05 11:30:07 +02:00
Fabian Reinartz
44bde96447
examples: pretty print JSON in webhook
2016-09-05 11:17:28 +02:00
Vanesa
9d766e1843
allow CORS for api GET and OPTIONS
2016-09-04 17:43:25 +02:00
Fabian Reinartz
4ac976c7e6
Merge branch 'master' of github.com:prometheus/alertmanager
2016-08-31 12:03:06 +02:00
Fabian Reinartz
dd7a9277a6
example: add HA config file
2016-08-31 12:02:16 +02:00
Fabian Reinartz
8d88d9e05b
Merge pull request #481 from prometheus/fabxc-meshsil
...
*: integrate new silence package
2016-08-30 16:53:34 +02:00
Fabian Reinartz
98101f3868
silence: fix doc strings
2016-08-30 14:19:22 +02:00
Fabian Reinartz
a4e8703567
*: integrate new silence package
2016-08-30 12:15:23 +02:00
Fabian Reinartz
3b5dfa8aba
provider: delete old silence provider
2016-08-30 12:01:24 +02:00
