Browse Source

Fix some variable typos in matrix-prometheus-nginxlog-exporter

pull/3093/head
Slavi Pantaleev 2 years ago
parent
commit
25697861d7
3 changed files with 10 additions and 1 deletions
  1. +5
    -0
      group_vars/matrix_servers
  2. +4
    -0
      roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml
  3. +1
    -1
      roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2

+ 5
- 0
group_vars/matrix_servers View File

@@ -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 }}"


+ 4
- 0
roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml View File

@@ -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.
#


+ 1
- 1
roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 View File

@@ -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 %}



Loading…
Cancel
Save