Skip to content

Commit

Permalink
Merge branch 'prometheus-community:main' into skip_install
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbra authored Mar 20, 2023
2 parents a58e203 + e21d0e2 commit 1dc594c
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Prometheus.Prometheus Release Notes
v0.3.1
======

Bugfixes
--------

- fix: Don't log config deployments (https://github.com/prometheus-community/ansible/pull/73)

v0.3.0
======

Expand Down
2 changes: 2 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,6 @@ releases:
changes:
trivial:
- 'docs: add workflow for auto generating ansible docs (https://github.com/prometheus-community/ansible/pull/69)'
bugfixes:
- "fix: Don't log config deployments (https://github.com/prometheus-community/ansible/pull/73)"
release_date: '2023-03-14'
1 change: 1 addition & 0 deletions roles/alertmanager/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
group: alertmanager
mode: 0644
validate: "{{ _alertmanager_binary_install_dir }}/amtool check-config %s"
no_log: "{{ 'false' if lookup('env', 'CI') else 'true' }}"
notify:
- restart alertmanager

Expand Down
1 change: 1 addition & 0 deletions roles/mysqld_exporter/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
owner: root
group: root
mode: 0644
no_log: "{{ 'false' if lookup('env', 'CI') else 'true' }}"
notify: restart mysqld_exporter

- name: Configure mysqld_exporter web config
Expand Down
1 change: 1 addition & 0 deletions roles/prometheus/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
group: prometheus
mode: 0640
validate: "{{ _prometheus_binary_install_dir }}/promtool check config %s"
no_log: "{{ 'false' if lookup('env', 'CI') else 'true' }}"
notify:
- reload prometheus

Expand Down
1 change: 0 additions & 1 deletion roles/snmp_exporter/molecule/alternative/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
roles:
- prometheus.prometheus.snmp_exporter
vars:
__testing_on_travis: true
snmp_exporter_web_listen_address: "127.0.0.1:9116"
snmp_exporter_config_file: snmp.yml
1 change: 0 additions & 1 deletion roles/snmp_exporter/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
roles:
- prometheus.prometheus.snmp_exporter
vars:
__testing_on_travis: true
snmp_exporter_web_listen_address: "127.0.0.1:9116"
2 changes: 1 addition & 1 deletion roles/snmp_exporter/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
owner: root
group: root
mode: 0644
no_log: "{{ 'true' if __testing_on_travis is defined else 'false' }}"
no_log: "{{ 'false' if lookup('env', 'CI') else 'true' }}"
notify:
- reload snmp exporter
when: (snmp_exporter_config_file)

0 comments on commit 1dc594c

Please sign in to comment.