From 9ae423aa954c9bd0ec941aa6e54ef5e28ad189eb Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_a84168@example.com>
Date: Wed, 19 Nov 2025 17:13:50 +0000
Subject: [PATCH] Update 4 files

- /roles/cadvisor/templates/docker-compose.yml.j2
- /roles/cadvisor/tasks/main.yml
- /roles/grafana/files/vmagent.yaml
- /group_vars/all.yml
---
 group_vars/all.yml                            |  2 +-
 roles/cadvisor/tasks/main.yml                 |  4 ++--
 .../cadvisor/templates/docker-compose.yml.j2  |  3 +--
 roles/grafana/files/vmagent.yaml              | 21 ++++++++-----------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 521a53e..4482f63 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -35,7 +35,7 @@ monitoring_groups:
 # ------------ Порты для сервисов мониторинга ------------
 monitoring_ports:
   node_exporter: 9100
-  cadvisor: 45133
+  cadvisor: 8080
   proxmox_exporter: 9223
   vmagent: 8429
   victoriametrics: 8428
diff --git a/roles/cadvisor/tasks/main.yml b/roles/cadvisor/tasks/main.yml
index 87bafb5..e8097b0 100644
--- a/roles/cadvisor/tasks/main.yml
+++ b/roles/cadvisor/tasks/main.yml
@@ -35,14 +35,14 @@
     - name: Wait for cAdvisor to start
       wait_for:
         host: localhost
-        port: "{{ cadvisor_internal_port }}"
+        port: 8080
         timeout: 30
         state: started
       become: yes
 
     - name: Verify cAdvisor is responding
       uri:
-        url: "http://localhost:{{ cadvisor_internal_port }}/metrics"
+        url: "http://localhost:8080/metrics"
         status_code: 200
         timeout: 10
       register: cadvisor_check
diff --git a/roles/cadvisor/templates/docker-compose.yml.j2 b/roles/cadvisor/templates/docker-compose.yml.j2
index bcec0b3..9d1bd42 100644
--- a/roles/cadvisor/templates/docker-compose.yml.j2
+++ b/roles/cadvisor/templates/docker-compose.yml.j2
@@ -16,11 +16,10 @@ services:
       - /dev/disk/:/dev/disk:ro
       - /cgroup:/cgroup:ro
     ports:
-      - "{{ monitoring_ports.cadvisor }}:{{ cadvisor_internal_port }}"
+      - "8080:8080"
     command:
       - --housekeeping_interval=30s
       - --docker_only=true
-      - --port={{ cadvisor_internal_port }}
     networks:
       - monitoring
 
diff --git a/roles/grafana/files/vmagent.yaml b/roles/grafana/files/vmagent.yaml
index e59268b..8f3b1b8 100644
--- a/roles/grafana/files/vmagent.yaml
+++ b/roles/grafana/files/vmagent.yaml
@@ -21,18 +21,15 @@ scrape_configs:
 
   # ========== cAdvisor для мониторинга Docker на всех серверах ==========
   - job_name: 'cadvisor'
-    static_configs:
-      - targets:
-        {% for server in monitoring_groups.cadvisor_servers %}
-        - '{{ server }}:{{ monitoring_ports.cadvisor }}'
-        {% endfor %}
-    scrape_interval: 30s
-    metrics_path: /metrics
-    relabel_configs:
-      - source_labels: [__address__]
-        target_label: instance
-        regex: '(.*):{{ monitoring_ports.cadvisor }}'
-        replacement: '${1}'
+  static_configs:
+    - targets:
+      {% for server in monitoring_groups.node_exporter_servers %}
+      {% if server != server_ips.olimp %}  
+      - '{{ server }}:8080'  
+      {% endif %}
+      {% endfor %}
+  scrape_interval: 30s
+  metrics_path: /metrics
 
   # ========== Proxmox VE ==========
   - job_name: 'proxmox'