diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml index 6550a8d49..81e33aa0f 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml @@ -31,11 +31,6 @@ prometheus_nginxlog_exporter_container_image_tag: "{{ 'latest' if prometheus_ngi prometheus_nginxlog_exporter_container_image_force_pull: "{{ prometheus_nginxlog_exporter_container_image.endswith(':latest') }}" prometheus_nginxlog_exporter_container_image_arch_check_enabled: true -# Controls whether prometheus-nginxlog-exporter metrics should be proxied (exposed) on a public URL -prometheus_nginxlog_exporter_metrics_proxying_enabled: false -prometheus_nginxlog_exporter_metrics_proxying_hostname: '' -prometheus_nginxlog_exporter_metrics_proxying_path_prefix: '' - # prometheus_nginxlog_exporter_dashboard_urls contains a list of URLs with Grafana dashboard definitions. # If the Grafana role is enabled, these dashboards will be downloaded. prometheus_nginxlog_exporter_dashboard_urls: [] diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml index e7e2f650c..dfdb15545 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml @@ -39,6 +39,4 @@ You need to define a required configuration setting (`{{ item.name }}`). when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0" with_items: - - {'name': 'prometheus_nginxlog_exporter_metrics_proxying_hostname', when: "{{ prometheus_nginxlog_exporter_metrics_proxying_enabled }}"} - - {'name': 'prometheus_nginxlog_exporter_metrics_proxying_path_prefix', when: "{{ prometheus_nginxlog_exporter_metrics_proxying_enabled }}"} - {'name': 'prometheus_nginxlog_exporter_container_network', when: true} diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 31ad62010..382262d70 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -100,6 +100,9 @@ - {'old': 'prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix_upstream'} - {'old': 'prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream_default', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix_upstream_default'} - {'old': 'prometheus_nginxlog_exporter_docker_image_arch_check_enabled', 'new': 'prometheus_nginxlog_exporter_container_image_arch_check_enabled'} + - {'old': 'prometheus_nginxlog_exporter_metrics_proxying_enabled', 'new': 'prometheus_nginxlog_exporter_container_labels_traefik_enabled'} + - {'old': 'prometheus_nginxlog_exporter_metrics_proxying_hostname', 'new': 'prometheus_nginxlog_exporter_container_labels_traefik_hostname'} + - {'old': 'prometheus_nginxlog_exporter_metrics_proxying_path_prefix', 'new': 'prometheus_nginxlog_exporter_container_labels_traefik_path_prefix'} - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: