From 8ab5b650737ca46ad525bff95394d4879ae984c8 Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 18 Nov 2026 11:45:05 +0700 Subject: [PATCH] feat(vector): switch to native package with journald, docker_logs, and secret masking --- ansible/roles/vector/defaults/main.yml | 5 +- ansible/roles/vector/tasks/main.yml | 89 +++++++++++-------- .../roles/vector/templates/compose.yaml.j2 | 17 ---- ansible/roles/vector/templates/vector.yaml.j2 | 29 +++--- 4 files changed, 72 insertions(+), 68 deletions(-) delete mode 100644 ansible/roles/vector/templates/compose.yaml.j2 diff --git a/ansible/roles/vector/defaults/main.yml b/ansible/roles/vector/defaults/main.yml index a00da38..b4e90eb 100644 --- a/ansible/roles/vector/defaults/main.yml +++ b/ansible/roles/vector/defaults/main.yml @@ -1,6 +1,7 @@ --- -vector_dir: /opt/vector -vector_image: "timberio/vector:0.45.0-alpine" +vector_config_path: /etc/vector/vector.yaml +vector_data_dir: /var/lib/vector +vector_legacy_dir: /opt/vector vector_vlogs_host: "{{ hostvars['core-mon'].ansible_host }}" vector_vlogs_url: "http://{{ vector_vlogs_host }}:9428/insert/jsonline" vector_host_name: "{{ inventory_hostname }}" diff --git a/ansible/roles/vector/tasks/main.yml b/ansible/roles/vector/tasks/main.yml index e629b6e..1e587f1 100644 --- a/ansible/roles/vector/tasks/main.yml +++ b/ansible/roles/vector/tasks/main.yml @@ -1,43 +1,60 @@ --- -- name: Создать каталоги Vector - ansible.builtin.file: - path: "{{ item }}" - state: directory - owner: root - group: root - mode: "0755" - loop: - - "{{ vector_dir }}" - - "{{ vector_dir }}/data" +- name: Проверить наличие старого Docker-контейнера Vector + ansible.builtin.stat: + path: "{{ vector_legacy_dir }}/compose.yaml" + register: vector_legacy_compose -- name: Конфиг Vector +- name: Остановить старый Docker-контейнер Vector + ansible.builtin.command: docker compose -f {{ vector_legacy_dir }}/compose.yaml down --remove-orphans + when: vector_legacy_compose.stat.exists + changed_when: true + +- name: Удалить каталог старого Docker-контейнера Vector + ansible.builtin.file: + path: "{{ vector_legacy_dir }}" + state: absent + when: vector_legacy_compose.stat.exists + +- name: Подключить APT-репозиторий Vector + ansible.builtin.shell: curl -1sLf 'https://setup.vector.dev' | bash + args: + creates: /etc/apt/sources.list.d/vector.list + +- name: Установить нативный пакет Vector + ansible.builtin.apt: + name: vector + state: present + update_cache: true + +- name: Выдать пользователю vector доступ к journald и docker + ansible.builtin.user: + name: vector + groups: + - systemd-journal + - docker + append: true + register: vector_user_groups + +- name: Подготовить каталог данных Vector + ansible.builtin.file: + path: "{{ vector_data_dir }}" + state: directory + owner: vector + group: vector + mode: "0750" + +- name: Установить конфигурацию Vector ansible.builtin.template: src: vector.yaml.j2 - dest: "{{ vector_dir }}/vector.yaml" + dest: "{{ vector_config_path }}" owner: root - group: root - mode: "0644" + group: vector + mode: "0640" + validate: "vector validate --no-environment %s" register: vector_config -- name: Compose Vector - ansible.builtin.template: - src: compose.yaml.j2 - dest: "{{ vector_dir }}/compose.yaml" - owner: root - group: root - mode: "0644" - register: vector_compose - -- name: Запустить Vector - ansible.builtin.command: docker compose -f {{ vector_dir }}/compose.yaml up -d --remove-orphans - register: vector_up - changed_when: >- - 'Started' in vector_up.stderr or - 'Created' in vector_up.stderr or - 'Recreated' in vector_up.stderr or - 'Pulled' in vector_up.stderr - -- name: Перезапустить Vector после изменения конфигурации - ansible.builtin.command: docker compose -f {{ vector_dir }}/compose.yaml restart vector - when: vector_config is changed and not (vector_compose is changed) - changed_when: true +- name: Запустить и включить systemd-сервис Vector + ansible.builtin.systemd: + name: vector + enabled: true + state: "{{ 'restarted' if (vector_config is changed or vector_user_groups is changed) else 'started' }}" diff --git a/ansible/roles/vector/templates/compose.yaml.j2 b/ansible/roles/vector/templates/compose.yaml.j2 deleted file mode 100644 index d9017a5..0000000 --- a/ansible/roles/vector/templates/compose.yaml.j2 +++ /dev/null @@ -1,17 +0,0 @@ -name: vector - -services: - vector: - image: {{ vector_image }} - container_name: vector - network_mode: host - restart: unless-stopped - command: - - "--config" - - "/etc/vector/vector.yaml" - volumes: - - ./vector.yaml:/etc/vector/vector.yaml:ro - - ./data:/var/lib/vector - - /var/run/docker.sock:/var/run/docker.sock:ro - - /var/log:/var/log:ro - diff --git a/ansible/roles/vector/templates/vector.yaml.j2 b/ansible/roles/vector/templates/vector.yaml.j2 index 830678b..91df048 100644 --- a/ansible/roles/vector/templates/vector.yaml.j2 +++ b/ansible/roles/vector/templates/vector.yaml.j2 @@ -1,4 +1,4 @@ -data_dir: /var/lib/vector +data_dir: {{ vector_data_dir }} sources: docker: @@ -6,13 +6,9 @@ sources: exclude_containers: - vector - host_logs: - type: file - include: - - /var/log/syslog - - /var/log/messages - - /var/log/auth.log - ignore_older_secs: 86400 + journald: + type: journald + since_now: true transforms: normalize_docker: @@ -26,22 +22,30 @@ transforms: if exists(.label."com.docker.compose.service") { .service = string!(.label."com.docker.compose.service") } + 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]") + .message = msg - normalize_host: + normalize_journald: type: remap inputs: - - host_logs + - journald source: | .host = "{{ vector_host_name }}" .source_type = "host" - .service = replace(string!(.file), "/var/log/", "") + .service = to_string(.SYSLOG_IDENTIFIER) ?? to_string(._SYSTEMD_UNIT) ?? "kernel" + 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]") + .message = msg sinks: victorialogs: type: http inputs: - normalize_docker - - normalize_host + - normalize_journald uri: "{{ vector_vlogs_url }}" encoding: codec: json @@ -55,4 +59,3 @@ sinks: VL-Time-Field: "timestamp" healthcheck: enabled: false -