Skip to content

Commit

Permalink
Merge pull request #13 from ernestas-poskus/features/bump_alert_manag…
Browse files Browse the repository at this point in the history
…er_version

Bump alertmanager to 0.5.0
  • Loading branch information
ernestas-poskus authored Nov 17, 2016
2 parents 5cf37c3 + f52b478 commit e069d98
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 7 deletions.
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,19 +312,29 @@ prometheus_alert_manager_config_receivers:

prometheus_alert_manager_config__file: "{{ prometheus_alert_manager_config_dir }}/alertmanager.yml"
# Alertmanager configuration file name. (default "alertmanager.yml")
prometheus_alert_manager_dev:
# serve live instead of embedded assets
prometheus_alert_manager_data__retention: '120h0m0s'
# How long to keep data for. (default 120h0m0s)
prometheus_alert_manager_log__format:
# If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
prometheus_alert_manager_log__level: 'info'
# Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]. (default info)
prometheus_alert_manager_mesh__hardware_address:
# MAC address, i.e. mesh peer ID (default "ca:ca:ce:ca:ca:ee")
prometheus_alert_manager_mesh__listen_address: '0.0.0.0:6783'
# mesh listen address (default "0.0.0.0:6783")
prometheus_alert_manager_mesh__nickname:
# peer nickname (default "$HOSTNAME")
prometheus_alert_manager_mesh__password:
# password to join the peer network (empty password disables encryption)
prometheus_alert_manager_mesh__peer:
# initial peers (may be repeated)
prometheus_alert_manager_storage__path: "{{ prometheus_alert_manager_data_dir }}"
# Base path for data storage. (default "data/")
prometheus_alert_manager_web__external_url:
# The URL under which Alertmanager is externally reachable
# (for example, if Alertmanager is served via a reverse proxy).
# Used for generating relative and absolute links back to Alertmanager itself.
# If the URL has a path portion, it will be used to prefix all HTTP endpoints served by Alertmanager.
# If the URL has a path portion, it will be used to prefix all HTTP endpoints served by Alertmanager.
# If omitted, relevant URL components will be derived automatically.
prometheus_alert_manager_web__listen_address: ':9093'
# Address to listen on for the web:erface and API. (default ":9093")
Expand Down
16 changes: 13 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ prometheus_platform_architecture: 'linux-amd64'
prometheus_node_exporter_version: '0.12.0'

# Alert manager
prometheus_alert_manager_version: '0.4.2'
prometheus_alert_manager_version: '0.5.0'

# Prometheus
# https://prometheus.io/docs/operating/configuration/
Expand Down Expand Up @@ -284,12 +284,22 @@ prometheus_alert_manager_config_receivers:

prometheus_alert_manager_config__file: "{{ prometheus_alert_manager_config_dir }}/alertmanager.yml"
# Alertmanager configuration file name. (default "alertmanager.yml")
prometheus_alert_manager_dev:
# serve live instead of embedded assets
prometheus_alert_manager_data__retention: '120h0m0s'
# How long to keep data for. (default 120h0m0s)
prometheus_alert_manager_log__format:
# If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
prometheus_alert_manager_log__level: 'info'
# Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]. (default info)
prometheus_alert_manager_mesh__hardware_address:
# MAC address, i.e. mesh peer ID (default "ca:ca:ce:ca:ca:ee")
prometheus_alert_manager_mesh__listen_address: '0.0.0.0:6783'
# mesh listen address (default "0.0.0.0:6783")
prometheus_alert_manager_mesh__nickname:
# peer nickname (default "$HOSTNAME")
prometheus_alert_manager_mesh__password:
# password to join the peer network (empty password disables encryption)
prometheus_alert_manager_mesh__peer:
# initial peers (may be repeated)
prometheus_alert_manager_storage__path: "{{ prometheus_alert_manager_data_dir }}"
# Base path for data storage. (default "data/")
prometheus_alert_manager_web__external_url:
Expand Down
7 changes: 6 additions & 1 deletion vars/alertmanager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
############################################################
prometheus_alert_manager_service_config:
config.file: "{{ prometheus_alert_manager_config__file }}"
dev: "{{ prometheus_alert_manager_dev }}"
data.retention: "{{ prometheus_alert_manager_data__retention }}"
log.format: "{{ prometheus_alert_manager_log__format }}"
log.level: "{{ prometheus_alert_manager_log__level }}"
mesh.hardware-address: "{{ prometheus_alert_manager_mesh__hardware_address }}"
mesh.listen-address: "{{ prometheus_alert_manager_mesh__listen_address }}"
mesh.nickname: "{{ prometheus_alert_manager_mesh__nickname }}"
mesh.password: "{{ prometheus_alert_manager_mesh__password }}"
mesh.peer: "{{ prometheus_alert_manager_mesh__peer }}"
storage.path: "{{ prometheus_alert_manager_storage__path }}"
web.external-url: "{{ prometheus_alert_manager_web__external_url }}"
web.listen-address: "{{ prometheus_alert_manager_web__listen_address }}"

0 comments on commit e069d98

Please sign in to comment.