awatch-rus/AWatch-rus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ansible): run smoke-check on controller + per-user validation dir

Browse Source
This commit is contained in:
igor04091968
2026-05-09 09:42:36 +03:00
parent 2997e7430a
commit aa0ccc4ecf
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ansible/deploy_aw_windows.yml
+14 -2
View File
@@ -285,11 +285,17 @@
url: "{{ aw_windows_server_scheme }}://{{ aw_windows_server_host }}:{{ aw_windows_server_port }}/api/0/buckets/{{ aw_windows_api_smoke_check_bucket_effective }}/events?limit={{ aw_windows_api_smoke_check_limit }}" url: "{{ aw_windows_server_scheme }}://{{ aw_windows_server_host }}:{{ aw_windows_server_port }}/api/0/buckets/{{ aw_windows_api_smoke_check_bucket_effective }}/events?limit={{ aw_windows_api_smoke_check_limit }}"
method: GET method: GET
status_code: 200 status_code: 200
return_content: true
register: aw_windows_api_smoke_result register: aw_windows_api_smoke_result
until: (aw_windows_api_smoke_result.json | length) >= aw_windows_api_smoke_check_min_events failed_when: false
until: >-
(aw_windows_api_smoke_result.status | default(0)) == 200
and ((aw_windows_api_smoke_result.json | default([])) | length) >= aw_windows_api_smoke_check_min_events
retries: 12 retries: 12
delay: 5 delay: 5
ignore_errors: "{{ (not aw_windows_fail_on_validation_error | bool) }}" ignore_errors: "{{ (not aw_windows_fail_on_validation_error | bool) }}"
delegate_to: localhost
changed_when: false
- name: Выполнить AW API smoke-check (Window bucket должен получать события) - name: Выполнить AW API smoke-check (Window bucket должен получать события)
when: when:
@@ -300,11 +306,17 @@
url: "{{ aw_windows_server_scheme }}://{{ aw_windows_server_host }}:{{ aw_windows_server_port }}/api/0/buckets/{{ aw_windows_api_smoke_check_window_bucket_effective }}/events?limit={{ aw_windows_api_smoke_check_limit }}" url: "{{ aw_windows_server_scheme }}://{{ aw_windows_server_host }}:{{ aw_windows_server_port }}/api/0/buckets/{{ aw_windows_api_smoke_check_window_bucket_effective }}/events?limit={{ aw_windows_api_smoke_check_limit }}"
method: GET method: GET
status_code: 200 status_code: 200
return_content: true
register: aw_windows_api_smoke_window_result register: aw_windows_api_smoke_window_result
until: (aw_windows_api_smoke_window_result.json | length) >= aw_windows_api_smoke_check_min_events failed_when: false
until: >-
(aw_windows_api_smoke_window_result.status | default(0)) == 200
and ((aw_windows_api_smoke_window_result.json | default([])) | length) >= aw_windows_api_smoke_check_min_events
retries: 12 retries: 12
delay: 5 delay: 5
ignore_errors: "{{ (not aw_windows_fail_on_validation_error | bool) }}" ignore_errors: "{{ (not aw_windows_fail_on_validation_error | bool) }}"
delegate_to: localhost
changed_when: false
- name: Валидировать развёртывание на эндпоинте - name: Валидировать развёртывание на эндпоинте
ansible.windows.win_powershell: ansible.windows.win_powershell:
ansible/group_vars/aw_windows.yml
+1 -1
View File
@@ -42,7 +42,7 @@ aw_windows_rules_path: "{{ aw_windows_deploy_root }}\\windows\\web-category-rule
aw_windows_policy_path: "{{ aw_windows_deploy_root }}\\windows\\dlp-policy.example.json" aw_windows_policy_path: "{{ aw_windows_deploy_root }}\\windows\\dlp-policy.example.json"
aw_windows_validation_remote_path: "{{ aw_windows_state_root }}\\aw_validate_ansible.json" aw_windows_validation_remote_path: "{{ aw_windows_state_root }}\\aw_validate_ansible.json"
aw_windows_validation_local_dir: "/tmp/aw-rus-validation" aw_windows_validation_local_dir: "/tmp/aw-rus-validation-{{ lookup('env','USER') | default('ansible', true) }}"
aw_windows_fail_on_validation_error: true aw_windows_fail_on_validation_error: true
aw_windows_migration_enabled: false aw_windows_migration_enabled: false
ansible/group_vars/windows.example.yml
+1 -1
View File
@@ -36,7 +36,7 @@ aw_windows_rules_path: "{{ aw_windows_deploy_root }}\\windows\\web-category-rule
aw_windows_policy_path: "{{ aw_windows_deploy_root }}\\windows\\dlp-policy.example.json" aw_windows_policy_path: "{{ aw_windows_deploy_root }}\\windows\\dlp-policy.example.json"
aw_windows_validation_remote_path: "{{ aw_windows_state_root }}\\aw_validate_ansible.json" aw_windows_validation_remote_path: "{{ aw_windows_state_root }}\\aw_validate_ansible.json"
aw_windows_validation_local_dir: "/tmp/aw-rus-validation" aw_windows_validation_local_dir: "/tmp/aw-rus-validation-{{ lookup('env','USER') | default('ansible', true) }}"
aw_windows_fail_on_validation_error: true aw_windows_fail_on_validation_error: true
# Безопасная миграция текущего прода со старых путей в единый профиль AWatch-rus. # Безопасная миграция текущего прода со старых путей в единый профиль AWatch-rus.