diff --git a/group_vars/all.yml b/group_vars/all.yml index e5d5003..6eed323 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -95,7 +95,7 @@ pve_exporter_token_value: "ae683c34-c539-4b08-b539-6c9b7e570411" cadvisor_enabled: true cadvisor_base_dir: "/opt/cadvisor" cadvisor_config_dir: "{{ cadvisor_base_dir }}/config" -cadvisor_internal_port: 8080 +cadvisor_port: 8080 # VictoriaMetrics & Grafana victoriametrics_retention_months: 2 diff --git a/roles/cadvisor/tasks/main.yml b/roles/cadvisor/tasks/main.yml index 975d925..bc5eb39 100644 --- a/roles/cadvisor/tasks/main.yml +++ b/roles/cadvisor/tasks/main.yml @@ -52,7 +52,7 @@ community.docker.docker_compose_v2: project_src: "{{ cadvisor_base_dir | default('/opt/cadvisor') }}" state: present - recreate: yes # ЗАМЕНИЛ restarted на recreate + recreate: always # ИСПРАВЛЕНО: always вместо yes become: yes register: cadvisor_start @@ -65,7 +65,7 @@ become: no - name: Check cAdvisor container status - shell: docker ps -f name=cadvisor --format "table {{.Names}}\\t{{.Status}}" + shell: docker ps -f name=cadvisor --format "table {{.Names}}\t{{.Status}}" register: container_info become: yes diff --git a/roles/cadvisor/templates/docker-compose.yml.j2 b/roles/cadvisor/templates/docker-compose.yml.j2 index 9d1bd42..a5e11f8 100644 --- a/roles/cadvisor/templates/docker-compose.yml.j2 +++ b/roles/cadvisor/templates/docker-compose.yml.j2 @@ -16,7 +16,7 @@ services: - /dev/disk/:/dev/disk:ro - /cgroup:/cgroup:ro ports: - - "8080:8080" + - "{{ cadvisor_port }}:8080" command: - --housekeeping_interval=30s - --docker_only=true