Skip to content

Commit 1341d3e

Browse files
Shadibrian-brazil
authored andcommitted
Update resolve_timeout docs to indicate it is a fallback value (prometheus#1492)
* Update resolve_timeout docs to indicate it is a fallback value * Update resolve_timeout documentation about prometheus alerts Signed-off-by: Shadi Abdelfatah <shadi.abdelfatah@gmail.com>
1 parent 25940dd commit 1341d3e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

content/docs/alerting/configuration.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ sections.
5858

5959
```yaml
6060
global:
61-
# ResolveTimeout is the time after which an alert is declared resolved
62-
# if it has not been updated.
63-
[ resolve_timeout: <duration> | default = 5m ]
64-
6561
# The default SMTP From header field.
6662
[ smtp_from: <tmpl_string> ]
6763
# The default SMTP smarthost used for sending emails, including port number.
@@ -98,6 +94,11 @@ global:
9894
# The default HTTP client configuration
9995
[ http_config: <http_config> ]
10096

97+
# ResolveTimeout is the default value used by alertmanager if the alert does
98+
# not include EndsAt, after this time passes it can declare the alert as resolved if it has not been updated.
99+
# This has no impact on alerts from Prometheus, as they always include EndsAt.
100+
[ resolve_timeout: <duration> | default = 5m ]
101+
101102
# Files from which custom notification template definitions are read.
102103
# The last component may use a wildcard matcher, e.g. 'templates/*.tmpl'.
103104
templates:

0 commit comments

Comments
 (0)