Update 3 files

- /roles/grafana/files/vmagent.yaml
- /roles/grafana/files/vmagent.yaml.j2
- /roles/grafana/tasks/main.yml

roles/grafana/files/vmagent.yaml.j2

@@ -21,15 +21,18 @@ scrape_configs:
 
   # ========== cAdvisor для мониторинга Docker на всех серверах ==========
   - job_name: 'cadvisor'
-  static_configs:
+    static_configs:
-    - targets:
+      - targets:
-      {% for server in monitoring_groups.node_exporter_servers %}
+        {% for server in monitoring_groups.cadvisor_servers %}
-      {% if server != server_ips.olimp %}  
+        - '{{ server }}:{{ monitoring_ports.cadvisor }}'
-      - '{{ server }}:8080'  
+        {% endfor %}
-      {% endif %}
+    scrape_interval: 30s
-      {% endfor %}
+    metrics_path: /metrics
-  scrape_interval: 30s
+    relabel_configs:
-  metrics_path: /metrics
+      - source_labels: [__address__]
+        target_label: instance
+        regex: '(.*):{{ monitoring_ports.cadvisor }}'
+        replacement: '${1}'
 
   # ========== Proxmox VE ==========
   - job_name: 'proxmox'

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
+- name: Deploy vmagent configuration
-  ansible.builtin.copy:
+  template:
-    src: vmagent.yaml
+    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: