diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 28bdf94b2..5dd610e2d 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -4214,6 +4214,11 @@ matrix_prometheus_nginxlog_exporter_hostname: "{{ matrix_server_fqn_matrix }}" matrix_prometheus_nginxlog_exporter_container_network: "{{ matrix_monitoring_container_network }}" +matrix_prometheus_nginxlog_exporter_container_additional_networks_auto: |- + {{ + ([matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_playbook_reverse_proxyable_services_additional_network and matrix_prometheus_nginxlog_exporter_container_labels_traefik_enabled) else []) + }} + matrix_prometheus_nginxlog_exporter_container_labels_traefik_enabled: "{{ matrix_metrics_exposure_enabled }}" matrix_prometheus_nginxlog_exporter_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" matrix_prometheus_nginxlog_exporter_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml index ea1cbe13f..409f70b80 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml @@ -37,6 +37,10 @@ matrix_prometheus_nginxlog_exporter_config_path: "{{ matrix_prometheus_nginxlog_ matrix_prometheus_nginxlog_exporter_container_network: "{{ matrix_prometheus_nginxlog_exporter_identifier }}" +matrix_prometheus_nginxlog_exporter_container_additional_networks: "{{ matrix_prometheus_nginxlog_exporter_container_additional_networks_auto + matrix_prometheus_nginxlog_exporter_container_additional_networks_custom }}" +matrix_prometheus_nginxlog_exporter_container_additional_networks_auto: [] +matrix_prometheus_nginxlog_exporter_container_additional_networks_custom: [] + # matrix_prometheus_nginxlog_exporter_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container. # See `../templates/labels.j2` for details. # diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 b/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 index 71cb564b9..63ea4f1ef 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 @@ -38,7 +38,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_prometheus_nginxlog_exporter_docker_image }} \ -config-file /etc/prometheus-nginxlog-exporter/prometheus-nginxlog-exporter.yaml -{% for network in matrix_mautrix_facebook_container_additional_networks %} +{% for network in matrix_prometheus_nginxlog_exporter_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_prometheus_nginxlog_exporter_identifier }} {% endfor %}