diff --git a/docs/variables.md b/docs/variables.md index 2a0cd3d..93db5c3 100644 --- a/docs/variables.md +++ b/docs/variables.md @@ -62,7 +62,7 @@ | prometheus_postgres_exporter_user | The user for Postgres exporter | String | "postgres" | | prometheus_postgres_exporter_password | The password for Postgres exporter | String | "changeme_" | | prometheus_postgres_exporter_port | The port for Postgres exporter | Integer | 5432 | -| prometheus_proxmox_exporter_user | Username used to contact Proxmox API | String | "" | +| prometheus_proxmox_exporter_user | Username used to contact Proxmox API | String | "" | | prometheus_proxmox_exporter_password | Password for previous username | String | "" | | prometheus_proxmox_exporter_node | Proxmox node to metrics from | String | "" | | prometheus_redis_exporter_addr | The address for Redis exporter | String | "redis://localhost:6379" | diff --git a/templates/compose/cloudflare.yml.j2 b/templates/compose/cloudflare.yml.j2 index 5f52603..1d288c8 100644 --- a/templates/compose/cloudflare.yml.j2 +++ b/templates/compose/cloudflare.yml.j2 @@ -1,5 +1,5 @@ networks: - {{ prometheus_docker_network }}: + {{ prometheus_docker_network }}: external: true services: @@ -9,12 +9,12 @@ services: restart: unless-stopped environment: - CF_API_TOKEN={{ cloudflare_api_key }} - - CF_API_EMAIL={{ cloudflare_api_email }} + - CF_API_EMAIL={{ cloudflare_api_email }} labels: com.centurylinklabs.watchtower.enable: {{ cloudflare_exporter_watchtower_enable | default('true') }} ports: - 8082:8080 networks: - - {{ prometheus_docker_network }} + - {{ prometheus_docker_network }} dns: - "{{ prometheus_cloudflare_dns }}" diff --git a/templates/compose/grafana-prometheus.yml.j2 b/templates/compose/grafana-prometheus.yml.j2 index 6cadff0..0b00364 100644 --- a/templates/compose/grafana-prometheus.yml.j2 +++ b/templates/compose/grafana-prometheus.yml.j2 @@ -1,6 +1,6 @@ networks: - {{ prometheus_docker_network }}: - name: {{ prometheus_docker_network }} + {{ prometheus_docker_network }}: + name: {{ prometheus_docker_network }} {% if grafana_traefik_enable is defined %} traefik: external: true @@ -57,7 +57,7 @@ services: GF_SMTP_ENABLED: "false" {% endif %} networks: - - {{ prometheus_docker_network }} + - {{ prometheus_docker_network }} {% if grafana_traefik_enable is defined %} - traefik {% endif %} @@ -93,7 +93,7 @@ services: - '--storage.tsdb.retention.time={{ prometheus_retention_time }}' - '--web.enable-lifecycle' networks: - - {{ prometheus_docker_network }} + - {{ prometheus_docker_network }} {% if prometheus_traefik_enable is defined %} - traefik {% endif %} @@ -150,7 +150,7 @@ services: - "{{ prometheus_port | default(8428) }}:8428" {% endif %} networks: - - {{ prometheus_docker_network }} + - {{ prometheus_docker_network }} vmagent: image: victoriametrics/vmagent @@ -165,7 +165,7 @@ services: labels: com.centurylinklabs.watchtower.enable: {{ prometheus_watchtower_enable | default('true') }} networks: - - {{ prometheus_docker_network }} + - {{ prometheus_docker_network }} {% if prometheus_nodes_ip is defined %} extra_hosts: {% for key, value in prometheus_nodes_ip.items() %} diff --git a/templates/conf/prometheus-proxmox-exporter.j2 b/templates/conf/prometheus-proxmox-exporter.j2 index cf57ca6..a9241c7 100644 --- a/templates/conf/prometheus-proxmox-exporter.j2 +++ b/templates/conf/prometheus-proxmox-exporter.j2 @@ -1,5 +1,5 @@ # {{ ansible_managed }} default: - user: {{ prometheus_proxmox_exporter_user }} - password: {{ prometheus_proxmox_exporter_password }} - verify_ssl: {{ prometheus_proxmox_exporter_verify_ssl | default('false') }} + user: {{ prometheus_proxmox_exporter_user }} + password: {{ prometheus_proxmox_exporter_password }} + verify_ssl: {{ prometheus_proxmox_exporter_verify_ssl | default('false') }}