From 71f1a009bfbf40ad40d8eb5cab75a33e9a8a63de Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 18 Nov 2026 12:40:26 +0700 Subject: [PATCH] chore(vector): filter journald noise, add core-git, and remove vector from VPS playbooks --- ansible/playbooks/core-git.yml | 2 ++ ansible/playbooks/ger-nod-02.yml | 4 --- ansible/playbooks/rus-central.yml | 4 --- ansible/roles/vector/tasks/main.yml | 28 +++++++++---------- ansible/roles/vector/templates/vector.yaml.j2 | 17 +++++++++-- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/ansible/playbooks/core-git.yml b/ansible/playbooks/core-git.yml index b74cacc..12bc476 100644 --- a/ansible/playbooks/core-git.yml +++ b/ansible/playbooks/core-git.yml @@ -8,3 +8,5 @@ tags: [gitea] - role: core-git/cadvisor tags: [cadvisor] + - role: vector + tags: [vector] diff --git a/ansible/playbooks/ger-nod-02.yml b/ansible/playbooks/ger-nod-02.yml index 896e94f..4aa9fa1 100644 --- a/ansible/playbooks/ger-nod-02.yml +++ b/ansible/playbooks/ger-nod-02.yml @@ -9,7 +9,3 @@ tags: [remnanode] - role: vmagent tags: [vmagent] - - role: vector - vars: - vector_enabled: false - tags: [vector] diff --git a/ansible/playbooks/rus-central.yml b/ansible/playbooks/rus-central.yml index 277bd62..c0b18a2 100644 --- a/ansible/playbooks/rus-central.yml +++ b/ansible/playbooks/rus-central.yml @@ -7,7 +7,3 @@ tags: [netbird] - role: rus-central/cadvisor tags: [cadvisor] - - role: vector - vars: - vector_enabled: false - tags: [vector] diff --git a/ansible/roles/vector/tasks/main.yml b/ansible/roles/vector/tasks/main.yml index d86036e..6caf0b1 100644 --- a/ansible/roles/vector/tasks/main.yml +++ b/ansible/roles/vector/tasks/main.yml @@ -15,25 +15,23 @@ state: absent when: vector_legacy_compose.stat.exists -- name: Отключить и удалить конфиг Vector, если сбор логов выключен +- name: Полностью удалить Vector, если сбор логов выключен when: not (vector_enabled | bool) block: - - name: Проверить наличие systemd-сервиса Vector - ansible.builtin.stat: - path: /lib/systemd/system/vector.service - register: vector_unit - - - name: Остановить и отключить Vector - ansible.builtin.systemd: + - name: Удалить пакет Vector (purge) + ansible.builtin.apt: name: vector - state: stopped - enabled: false - when: vector_unit.stat.exists - - - name: Удалить конфигурацию Vector - ansible.builtin.file: - path: "{{ vector_config_path }}" state: absent + purge: true + + - name: Удалить каталоги и репозиторий Vector + ansible.builtin.file: + path: "{{ item }}" + state: absent + loop: + - /etc/vector + - "{{ vector_data_dir }}" + - /etc/apt/sources.list.d/vector.list - name: Установить и запустить нативный Vector when: vector_enabled | bool diff --git a/ansible/roles/vector/templates/vector.yaml.j2 b/ansible/roles/vector/templates/vector.yaml.j2 index 91df048..264f4ea 100644 --- a/ansible/roles/vector/templates/vector.yaml.j2 +++ b/ansible/roles/vector/templates/vector.yaml.j2 @@ -5,6 +5,7 @@ sources: type: docker_logs exclude_containers: - vector + - monitoring-vlogs journald: type: journald @@ -27,14 +28,26 @@ transforms: msg = replace(msg, r'(?i)((?:password|passwd|secret|api_?key|token)\s*[:=]\s*)[^\s,;"]+', "${1}[REDACTED]") .message = msg + filter_journald: + type: filter + inputs: + - journald + condition: | + ident = to_string(.SYSLOG_IDENTIFIER) ?? "" + !starts_with(ident, "ansible-") && !includes(["vector", "(systemd)", "CRON"], ident) + normalize_journald: type: remap inputs: - - journald + - filter_journald source: | .host = "{{ vector_host_name }}" .source_type = "host" - .service = to_string(.SYSLOG_IDENTIFIER) ?? to_string(._SYSTEMD_UNIT) ?? "kernel" + svc = to_string(.SYSLOG_IDENTIFIER) ?? to_string(._SYSTEMD_UNIT) ?? "kernel" + if svc == "sshd-session" { + svc = "sshd" + } + .service = svc msg = to_string(.message) ?? "" msg = replace(msg, r'(?i)(bearer\s+)[a-z0-9._-]+', "${1}[REDACTED]") msg = replace(msg, r'(?i)((?:password|passwd|secret|api_?key|token)\s*[:=]\s*)[^\s,;"]+', "${1}[REDACTED]")