Skip to content

Commit

Permalink
Merge pull request #2444 from mucamaca/trailing-ws
Browse files Browse the repository at this point in the history
remove trailing whitespace in docs
  • Loading branch information
beorn7 authored Jan 25, 2021
2 parents 165e2d0 + dd6b3af commit f328dc6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions doc/examples/simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global:
smtp_auth_password: 'password'

# The directory from which notification templates are read.
templates:
templates:
- '/etc/alertmanager/template/*.tmpl'

# The root route on which each incoming alert enters.
Expand All @@ -25,7 +25,7 @@ route:
# When a new group of alerts is created by an incoming alert, wait at
# least 'group_wait' to send the initial notification.
# This way ensures that you get multiple alerts for the same group that start
# firing shortly after another are batched together on the first
# firing shortly after another are batched together on the first
# notification.
group_wait: 30s

Expand All @@ -35,12 +35,12 @@ route:

# If an alert has successfully been sent, wait 'repeat_interval' to
# resend them.
repeat_interval: 3h
repeat_interval: 3h

# A default receiver
receiver: team-X-mails

# All the above attributes are inherited by all child routes and can
# All the above attributes are inherited by all child routes and can
# overwritten on each.

# The child route trees.
Expand Down Expand Up @@ -85,16 +85,16 @@ route:

# Inhibition rules allow to mute a set of alerts given that another alert is
# firing.
# We use this to mute any warning-level notifications if the same alert is
# We use this to mute any warning-level notifications if the same alert is
# already critical.
inhibit_rules:
- source_match:
severity: 'critical'
target_match:
severity: 'warning'
# Apply inhibition if the alertname is the same.
# CAUTION:
# If all label names listed in `equal` are missing
# CAUTION:
# If all label names listed in `equal` are missing
# from both the source and target alerts,
# the inhibition rule will apply!
equal: ['alertname', 'cluster', 'service']
Expand Down
2 changes: 1 addition & 1 deletion docs/management_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ This endpoint returns 200 when Alertmanager is ready to serve traffic (i.e. resp
POST /-/reload
```

This endpoint triggers a reload of the Alertmanager configuration file.
This endpoint triggers a reload of the Alertmanager configuration file.

An alternative way to trigger a configuration reload is by sending a `SIGHUP` to the Alertmanager process.

0 comments on commit f328dc6

Please sign in to comment.