Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump/prometheus to 2 13 1 #101

Merged
merged 2 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ prometheus_snmp_exporter_config_dir: "{{ prometheus_config_dir }}/snmpexporter"
prometheus_blackbox_exporter_config_dir: "{{ prometheus_config_dir }}/blackboxexporter"

# Prometheus
prometheus_version: '2.13.0'
prometheus_version: '2.13.1'
prometheus_platform_architecture: 'linux-amd64'

# Node exporter
Expand All @@ -78,7 +78,7 @@ prometheus_push_gateway_version: '0.9.1'
prometheus_snmp_exporter_version: '0.15.0'

# Blackbox exporter
prometheus_blackbox_exporter_version: '0.14.0'
prometheus_blackbox_exporter_version: '0.15.1'
```

[DOCS: Prometheus variables](https://github.com/ernestas-poskus/ansible-prometheus/blob/master/docs/prometheus.md)
Expand Down
21 changes: 19 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ prometheus_snmp_exporter_config_dir: "{{ prometheus_config_dir }}/snmpexporter"
prometheus_blackbox_exporter_config_dir: "{{ prometheus_config_dir }}/blackboxexporter"

# Prometheus
prometheus_version: '2.13.0'
prometheus_version: '2.13.1'
prometheus_platform_architecture: 'linux-amd64'

# Node exporter
Expand All @@ -40,7 +40,7 @@ prometheus_push_gateway_version: '0.9.1'
prometheus_snmp_exporter_version: '0.15.0'

# Blackbox exporter
prometheus_blackbox_exporter_version: '0.14.0'
prometheus_blackbox_exporter_version: '0.15.1'

# Prometheus
# https://prometheus.io/docs/operating/configuration/
Expand Down Expand Up @@ -486,12 +486,29 @@ prometheus_black_box_config__file: "{{ prometheus_blackbox_exporter_config_dir }
prometheus_black_box_history__limit: 100
# The maximum amount of items to keep in the history.

prometheus_black_box_log__format: 'logfmt'
# Output format of log messages. One of: [logfmt, json]

prometheus_black_box_web__listen_address: ':9115'
# The address to listen on for HTTP requests.

prometheus_black_box_web__route_prefix:
# Prefix for the internal routes of web endpoints. Defaults to path of

prometheus_black_box_timeout_offset: '0.5'
# Offset to subtract from timeout in seconds.

prometheus_black_box_web__external_url:
# The URL under which Blackbox exporter is
# externally reachable (for example, if Blackbox
# exporter is served via a reverse proxy). Used
# for generating relative and absolute links back
# to Blackbox exporter itself. If the URL has a
# path portion, it will be used to prefix all
# HTTP endpoints served by Blackbox exporter. If
# omitted, relevant URL components will be
# derived automatically.

prometheus_black_box_log__level: 'info'
# Only log messages with the given severity or above. One of: [debug, info, warn, error]

Expand Down
17 changes: 17 additions & 0 deletions docs/blackbox_exporter.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,29 @@ prometheus_black_box_config__file: "{{ prometheus_blackbox_exporter_config_dir }
prometheus_black_box_history__limit: 100
# The maximum amount of items to keep in the history.

prometheus_black_box_log__format: 'logfmt'
# Output format of log messages. One of: [logfmt, json]

prometheus_black_box_web__listen_address: ':9115'
# The address to listen on for HTTP requests.

prometheus_black_box_web__route_prefix:
# Prefix for the internal routes of web endpoints. Defaults to path of

prometheus_black_box_timeout_offset: '0.5'
# Offset to subtract from timeout in seconds.

prometheus_black_box_web__external_url:
# The URL under which Blackbox exporter is
# externally reachable (for example, if Blackbox
# exporter is served via a reverse proxy). Used
# for generating relative and absolute links back
# to Blackbox exporter itself. If the URL has a
# path portion, it will be used to prefix all
# HTTP endpoints served by Blackbox exporter. If
# omitted, relevant URL components will be
# derived automatically.

prometheus_black_box_log__level: 'info'
# Only log messages with the given severity or above. One of: [debug, info, warn, error]

Expand Down
3 changes: 3 additions & 0 deletions vars/blackboxexporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
prometheus_blackbox_exporter_service_config:
- ['config.file', "{{ prometheus_black_box_config__file }}"]
- ['history.limit', "{{ prometheus_black_box_history__limit }}"]
- ['log.format', "{{ prometheus_black_box_log__format }}"]
- ['log.level', "{{ prometheus_black_box_log__level }}"]
- ['timeout-offset', "{{ prometheus_black_box_timeout_offset }}"]
- ['web.external-url', "{{ prometheus_black_box_web__external_url }}"]
- ['web.listen-address', "{{ prometheus_black_box_web__listen_address }}"]
- ['web.route-prefix', "{{ prometheus_black_box_web__route_prefix }}"]