From 01985bd793dc3c23dc2b9d0469009db5b92867cf Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_a84168@example.com>
Date: Thu, 20 Nov 2025 05:58:14 +0000
Subject: [PATCH] Update 3 files

- /roles/grafana/files/vmagent.yaml
- /roles/grafana/files/vmagent.yaml.j2
- /roles/grafana/tasks/main.yml
---
 .../files/{vmagent.yaml => vmagent.yaml.j2}   | 21 +++++++++++--------
 roles/grafana/tasks/main.yml                  |  8 ++++---
 2 files changed, 17 insertions(+), 12 deletions(-)
 rename roles/grafana/files/{vmagent.yaml => vmagent.yaml.j2} (79%)

diff --git a/roles/grafana/files/vmagent.yaml b/roles/grafana/files/vmagent.yaml.j2
similarity index 79%
rename from roles/grafana/files/vmagent.yaml
rename to roles/grafana/files/vmagent.yaml.j2
index 8f3b1b8..e59268b 100644
--- a/roles/grafana/files/vmagent.yaml
+++ b/roles/grafana/files/vmagent.yaml.j2
@@ -21,15 +21,18 @@ scrape_configs:
 
   # ========== cAdvisor для мониторинга Docker на всех серверах ==========
   - job_name: 'cadvisor'
-  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
+    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}'
 
   # ========== Proxmox VE ==========
   - job_name: 'proxmox'
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 1bf527b..1168943 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -13,13 +13,15 @@
     - "{{ grafana_vm_data_dir }}"
     - "{{ grafana_vmagent_tmp_dir | dirname }}"  # создаёт /mnt/grafana/vmagent
 
-- name: Copy vmagent config
-  ansible.builtin.copy:
-    src: vmagent.yaml
+- name: Deploy vmagent configuration
+  template:
+    src: vmagent.yaml.j2
     dest: "{{ grafana_vmagent_config }}"
     owner: root
     group: root
     mode: '0644'
+  become: yes
+  notify: restart vmagent
 
 - name: Deploy Grafana docker-compose.yml
   ansible.builtin.template: