feat(vector): switch to native package with journald, docker_logs, and secret masking
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 2s
ansible-deploy / deploy (core-mon, ) (push) Failing after 33s
ansible-deploy / deploy (core-net, ) (push) Failing after 28s
ansible-deploy / deploy (core-secrets, ) (push) Failing after 38s
ansible-deploy / deploy (ger-nod-02, ) (push) Failing after 31s
ansible-deploy / deploy (rus-central, ) (push) Failing after 49s

This commit is contained in:
karpenok committed 2026-11-18 11:45:05 +07:00
1 parent 1252413a1b
commit 8ab5b65073
4 files changed
+72 -68

No files matched your search

+3 -2
View File
@@ -1,6 +1,7 @@
--- ---
vector_dir: /opt/vector vector_config_path: /etc/vector/vector.yaml
vector_image: "timberio/vector:0.45.0-alpine" vector_data_dir: /var/lib/vector
vector_legacy_dir: /opt/vector
vector_vlogs_host: "{{ hostvars['core-mon'].ansible_host }}" vector_vlogs_host: "{{ hostvars['core-mon'].ansible_host }}"
vector_vlogs_url: "http://{{ vector_vlogs_host }}:9428/insert/jsonline" vector_vlogs_url: "http://{{ vector_vlogs_host }}:9428/insert/jsonline"
vector_host_name: "{{ inventory_hostname }}" vector_host_name: "{{ inventory_hostname }}"
+53 -36
View File
@@ -1,43 +1,60 @@
--- ---
- name: Создать каталоги Vector - name: Проверить наличие старого Docker-контейнера Vector
ansible.builtin.file: ansible.builtin.stat:
path: "{{ item }}" path: "{{ vector_legacy_dir }}/compose.yaml"
state: directory register: vector_legacy_compose
owner: root
group: root
mode: "0755"
loop:
- "{{ vector_dir }}"
- "{{ vector_dir }}/data"
- 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: ansible.builtin.template:
src: vector.yaml.j2 src: vector.yaml.j2
dest: "{{ vector_dir }}/vector.yaml" dest: "{{ vector_config_path }}"
owner: root owner: root
group: root group: vector
mode: "0644" mode: "0640"
validate: "vector validate --no-environment %s"
register: vector_config register: vector_config
- name: Compose Vector - name: Запустить и включить systemd-сервис Vector
ansible.builtin.template: ansible.builtin.systemd:
src: compose.yaml.j2 name: vector
dest: "{{ vector_dir }}/compose.yaml" enabled: true
owner: root state: "{{ 'restarted' if (vector_config is changed or vector_user_groups is changed) else 'started' }}"
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
@@ -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
+16 -13
View File
@@ -1,4 +1,4 @@
data_dir: /var/lib/vector data_dir: {{ vector_data_dir }}
sources: sources:
docker: docker:
@@ -6,13 +6,9 @@ sources:
exclude_containers: exclude_containers:
- vector - vector
host_logs: journald:
type: file type: journald
include: since_now: true
- /var/log/syslog
- /var/log/messages
- /var/log/auth.log
ignore_older_secs: 86400
transforms: transforms:
normalize_docker: normalize_docker:
@@ -26,22 +22,30 @@ transforms:
if exists(.label."com.docker.compose.service") { if exists(.label."com.docker.compose.service") {
.service = string!(.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 type: remap
inputs: inputs:
- host_logs - journald
source: | source: |
.host = "{{ vector_host_name }}" .host = "{{ vector_host_name }}"
.source_type = "host" .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: sinks:
victorialogs: victorialogs:
type: http type: http
inputs: inputs:
- normalize_docker - normalize_docker
- normalize_host - normalize_journald
uri: "{{ vector_vlogs_url }}" uri: "{{ vector_vlogs_url }}"
encoding: encoding:
codec: json codec: json
@@ -55,4 +59,3 @@ sinks:
VL-Time-Field: "timestamp" VL-Time-Field: "timestamp"
healthcheck: healthcheck:
enabled: false enabled: false