From d764ead505ccb1b43af1e99f82157d37792aea49 Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_a84168@example.com>
Date: Fri, 21 Nov 2025 11:16:41 +0000
Subject: [PATCH] Update 3 files

- /olimp-deploy.yml
- /roles/grafana/templates/vmagent.yaml.j2
- /group_vars/all.yml
---
 group_vars/all.yml                      |  2 +-
 olimp-deploy.yml                        |  1 +
 roles/grafana/templates/vmagent.yaml.j2 | 27 ++++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 646286e..683446f 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -42,7 +42,7 @@ monitoring_groups:
 monitoring_ports:
   node_exporter: 9100
   cadvisor: 8080
-  proxmox_exporter: 9221
+  proxmox_exporter: 9223
   vmagent: 8429
   victoriametrics: 8428
   loki: 3100
diff --git a/olimp-deploy.yml b/olimp-deploy.yml
index e9336e0..5412b13 100644
--- a/olimp-deploy.yml
+++ b/olimp-deploy.yml
@@ -4,6 +4,7 @@
     - {role: base_setup,              tags: deploy_base}
     - {role: system_cleanup,          tags: deploy_cleanup}
     - {role: cadvisor,                tags: deploy_cadvisor}
+    - {role: promtail,                tags: deploy_promtail}
 
 - hosts: pve-server
   roles:
diff --git a/roles/grafana/templates/vmagent.yaml.j2 b/roles/grafana/templates/vmagent.yaml.j2
index 94153ef..48568a2 100644
--- a/roles/grafana/templates/vmagent.yaml.j2
+++ b/roles/grafana/templates/vmagent.yaml.j2
@@ -46,13 +46,38 @@ scrape_configs:
       module: [default]
     scrape_interval: 30s
     relabel_configs:
-      # Исправляем дублирование instance
       - source_labels: [__address__]
         target_label: instance
         regex: '([^:]+)(:\d+)?'
         replacement: '${1}'
         action: replace
+# ========== Loki ==========
+  - job_name: 'loki'
+    static_configs:
+      - targets:
+          - '{{ server_ips.manage }}:{{ monitoring_ports.loki }}'  # 3100
+    scrape_interval: 30s
+    metrics_path: /metrics
+    relabel_configs:
+      - source_labels: [__address__]
+        target_label: instance
+        regex: '(.*):{{ monitoring_ports.loki }}'
+        replacement: '${1}'
 
+  # ========== Promtail ==========
+  - job_name: 'promtail'
+    static_configs:
+      - targets:
+{% for server in monitoring_groups.promtail_servers %}
+          - '{{ server }}:{{ monitoring_ports.promtail }}'  # 9080
+{% endfor %}
+    scrape_interval: 30s
+    metrics_path: /metrics
+    relabel_configs:
+      - source_labels: [__address__]
+        target_label: instance
+        regex: '(.*):{{ monitoring_ports.promtail }}'
+        replacement: '${1}'
   # ========== Self-monitoring ==========
   - job_name: 'vmagent'
     static_configs: