Skip to content

Commit

Permalink
Linting
Browse files Browse the repository at this point in the history
  • Loading branch information
drmatthews committed Dec 20, 2023
1 parent e7c718b commit 18476a2
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 11 deletions.
3 changes: 2 additions & 1 deletion roles/monitoring_client/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
monitoring_client_node_exporter_version: 1.7.0

monitoring_client_node_exporter_binary: "https://github.com/prometheus/node_exporter/releases/download/v\
monitoring_client_node_exporter_binary:
"https://github.com/prometheus/node_exporter/releases/download/v\
{{ monitoring_client_node_exporter_version }}/node_exporter-\
{{ monitoring_client_node_exporter_version }}.linux-amd64.tar.gz"
monitoring_client_node_exporter_install_dir: /usr/bin/node_exporter
Expand Down
6 changes: 5 additions & 1 deletion roles/monitoring_client/tasks/install_node_exporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@

- name: Open internal node_exporter port to monitoring server
ansible.posix.firewalld:
rich_rule: "rule family=ipv4 source address={{ monitoring_client_monitoring_server_ip }}/32 port protocol=tcp port={{ monitoring_client_node_exporter_port }} accept"
rich_rule: >
"rule family=ipv4 source
address={{ monitoring_client_monitoring_server_ip }}/32
port protocol=tcp port={{ monitoring_client_node_exporter_port }}
accept"
zone: internal
permanent: true
immediate: true
Expand Down
1 change: 0 additions & 1 deletion roles/monitoring_server/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,3 @@ monitoring_server_prometheus:
config.file: /prometheus/prometheus.yml
storage.tsdb.path: /prometheus/data
web.external-url: /prometheus/

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
image: "{{ monitoring_server_alertmanager.image }}"
state: started
user: "{{ monitoring_server_uid }}:{{ monitoring_server_gid }}"
command: "{% for key in monitoring_server_alertmanager.commandline_args %}--{{ key }}={{ monitoring_server_alertmanager.commandline_args[key] }} {% endfor %}"
command: >
"{% for key in
monitoring_server_alertmanager.commandline_args
%}--{{ key }}={{ monitoring_server_alertmanager.commandline_args[key] }}
{% endfor %}"
networks:
- name: monitor-net
volumes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@
image: "{{ monitoring_server_blackbox_exporter.image }}"
state: started
user: "{{ monitoring_server_uid }}:{{ monitoring_server_gid }}"
command: "{% for key in monitoring_server_blackbox_exporter.commandline_args %}--{{ key }}={{ monitoring_server_blackbox_exporter.commandline_args[key] }} {% endfor %}"
command: >
"{% for key in
monitoring_server_blackbox_exporter.commandline_args %}--{{ key }}={{
monitoring_server_blackbox_exporter.commandline_args[key] }}
{% endfor %}"
networks:
- name: monitor-net
volumes:
- "{{ monitoring_server_blackbox_exporter.external_data_dir }}/blackbox-exporter.yml:{{ monitoring_server_blackbox_exporter.volume }}/blackbox-exporter.yml"
- "{{ monitoring_server_blackbox_exporter.external_data_dir }}/\
blackbox-exporter.yml:{{ monitoring_server_blackbox_exporter.volume }}/\
blackbox-exporter.yml"
restart_policy: always
1 change: 0 additions & 1 deletion roles/monitoring_server/tasks/install_nginx_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
state: present
when: ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version("9")


- name: Ensure nginx certs directory exists on host
ansible.builtin.file:
path: "{{ monitoring_server_nginx.certs_dir }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,3 @@ docker_service_name: docker
docker_generate_certificates: true # generate TLS certs for clients
docker_client_hostnames: "{{ monitoring_server_client_hostnames }}"
docker_tls_verify: true


Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ monitoring_server_ssl_certificate:
csr_common_name: "{{ hostvars['mserv']['hostname'] }}"
certificate_filename: "/etc/ssl/certs/{{ hostvars['mserv']['hostname'] }}.cert"
provider: selfsigned

1 change: 0 additions & 1 deletion tests/molecule/resources/monitoring/inventory/hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ all:
web:
hosts:
mclient:

0 comments on commit 18476a2

Please sign in to comment.