Explorar el Código

Remove unused variables for exposing the service

Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
pull/4938/head
Suguru Hirahara hace 2 semanas
padre
commit
ebaa8a534d
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: E4F9743DAB4B7B75
Se han modificado 3 ficheros con 3 adiciones y 7 borrados
  1. +0
    -5
      roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml
  2. +0
    -2
      roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml
  3. +3
    -0
      roles/custom/matrix_playbook_migration/tasks/validate_config.yml

+ 0
- 5
roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml Ver fichero

@@ -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_force_pull: "{{ prometheus_nginxlog_exporter_container_image.endswith(':latest') }}"
prometheus_nginxlog_exporter_container_image_arch_check_enabled: true 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. # 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. # If the Grafana role is enabled, these dashboards will be downloaded.
prometheus_nginxlog_exporter_dashboard_urls: [] prometheus_nginxlog_exporter_dashboard_urls: []


+ 0
- 2
roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml Ver fichero

@@ -39,6 +39,4 @@
You need to define a required configuration setting (`{{ item.name }}`). You need to define a required configuration setting (`{{ item.name }}`).
when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0" when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
with_items: 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} - {'name': 'prometheus_nginxlog_exporter_container_network', when: true}

+ 3
- 0
roles/custom/matrix_playbook_migration/tasks/validate_config.yml Ver fichero

@@ -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', '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_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_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 - name: (Deprecation) Catch and report matrix_postgres variables
ansible.builtin.fail: ansible.builtin.fail:


Cargando…
Cancelar
Guardar