From 021f48a4932e513fab279113f276c859569c3593 Mon Sep 17 00:00:00 2001 From: havelight-ee Date: Thu, 22 Jun 2023 14:29:58 +0900 Subject: [PATCH] update --- documentation | 1 + tasks/check-agent.yml | 2 +- tasks/dsk-common.yml | 2 +- tasks/dsk-debian-pkg.yml | 1 - tasks/dsk-docker-log-agent.yml | 2 +- tasks/dsk-docker-node-agent.yml | 3 +-- tasks/dsk-docker-postgres-agent.yml | 2 +- tasks/dsk-docker-trace-agent.yml | 2 +- tasks/dsk-log-agent.yml | 2 +- tasks/dsk-postgres-agent.yml | 2 +- tasks/dsk-redhat-pkg.yml | 2 +- tasks/main.yml | 2 +- tasks/permissions.yml | 2 +- tasks/remove-datasaker.yml | 3 +-- 14 files changed, 13 insertions(+), 15 deletions(-) create mode 160000 documentation diff --git a/documentation b/documentation new file mode 160000 index 0000000..6ae96f1 --- /dev/null +++ b/documentation @@ -0,0 +1 @@ +Subproject commit 6ae96f196383d697acb38a0ad5a3b1a63d4df586 diff --git a/tasks/check-agent.yml b/tasks/check-agent.yml index fe10f79..63d277d 100644 --- a/tasks/check-agent.yml +++ b/tasks/check-agent.yml @@ -46,4 +46,4 @@ - name: "Check dsk-docker-trace-agent" include_tasks: dsk-docker-trace-agent.yml - when: '"dsk-docker-trace-agent" in datasaker_docker_agents' + when: '"dsk-docker-trace-agent" in datasaker_docker_agents' \ No newline at end of file diff --git a/tasks/dsk-common.yml b/tasks/dsk-common.yml index 0c7ba62..1c5a6a1 100644 --- a/tasks/dsk-common.yml +++ b/tasks/dsk-common.yml @@ -42,4 +42,4 @@ src: global-config.yml.j2 dest: "{{ datasaker_docker_global_config }}" when: - - datasaker_docker_agents + - datasaker_docker_agents \ No newline at end of file diff --git a/tasks/dsk-debian-pkg.yml b/tasks/dsk-debian-pkg.yml index 1674c8d..eb595c1 100644 --- a/tasks/dsk-debian-pkg.yml +++ b/tasks/dsk-debian-pkg.yml @@ -75,7 +75,6 @@ update_cache: yes with_items: - "{{ datasaker_agents }}" - # - Restart {{ item }} service ignore_errors: true - name: "Install datasaker log agent" diff --git a/tasks/dsk-docker-log-agent.yml b/tasks/dsk-docker-log-agent.yml index 07175df..11a68a9 100644 --- a/tasks/dsk-docker-log-agent.yml +++ b/tasks/dsk-docker-log-agent.yml @@ -34,4 +34,4 @@ - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro" - "{{ datasaker_docker_path }}/dsk-docker-log-agent-config.yml:/etc/datasaker/dsk-log-agent/agent-config.yml:ro" - "{{ item }}" - loop: "{{ custom_log_volume | default(['{{ docker_default_path }}:/var/log/sample/:ro']) }}" + loop: "{{ custom_log_volume | default(['{{ docker_default_path }}:/var/log/sample/:ro']) }}" \ No newline at end of file diff --git a/tasks/dsk-docker-node-agent.yml b/tasks/dsk-docker-node-agent.yml index 2d650a1..ba277bf 100644 --- a/tasks/dsk-docker-node-agent.yml +++ b/tasks/dsk-docker-node-agent.yml @@ -30,7 +30,6 @@ - "{{ datasaker_docker_path }}/agent/dsk-node-agent" - "{{ datasaker_docker_path }}/log" - - name: "Run Datasaker Container Agent" ansible.builtin.docker_container: name: dsk-docker-container-agent @@ -66,4 +65,4 @@ - "{{ datasaker_docker_path }}:/var/datasaker/" - "/proc/:/host/proc/:ro" - "/sys/:/host/sys/:ro" - - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro" + - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro" \ No newline at end of file diff --git a/tasks/dsk-docker-postgres-agent.yml b/tasks/dsk-docker-postgres-agent.yml index 540bb28..4cd4ac9 100644 --- a/tasks/dsk-docker-postgres-agent.yml +++ b/tasks/dsk-docker-postgres-agent.yml @@ -54,4 +54,4 @@ volumes: - "{{ datasaker_docker_path }}:/var/datasaker/" - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro" - - "{{ datasaker_docker_path }}/dsk-docker-plan-postgres-config.yml:/etc/datasaker/dsk-plan-postgres-agent/agent-config.yml:ro" + - "{{ datasaker_docker_path }}/dsk-docker-plan-postgres-config.yml:/etc/datasaker/dsk-plan-postgres-agent/agent-config.yml:ro" \ No newline at end of file diff --git a/tasks/dsk-docker-trace-agent.yml b/tasks/dsk-docker-trace-agent.yml index 8b8337e..76fa4a3 100644 --- a/tasks/dsk-docker-trace-agent.yml +++ b/tasks/dsk-docker-trace-agent.yml @@ -34,4 +34,4 @@ volumes: - "{{ datasaker_docker_path }}:/var/datasaker/" - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro" - - "{{ datasaker_docker_path }}/dsk-docker-trace-agent-config.yml:/etc/datasaker/dsk-trace-agent/agent-config.yml:ro" + - "{{ datasaker_docker_path }}/dsk-docker-trace-agent-config.yml:/etc/datasaker/dsk-trace-agent/agent-config.yml:ro" \ No newline at end of file diff --git a/tasks/dsk-log-agent.yml b/tasks/dsk-log-agent.yml index b2532fc..480a6a8 100644 --- a/tasks/dsk-log-agent.yml +++ b/tasks/dsk-log-agent.yml @@ -10,4 +10,4 @@ - name: "Setting dsk-log-agent config" template: src: log-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-log-agent/agent-config.yml" + dest: "/etc/datasaker/dsk-log-agent/agent-config.yml" \ No newline at end of file diff --git a/tasks/dsk-postgres-agent.yml b/tasks/dsk-postgres-agent.yml index 950fb11..e4d997d 100644 --- a/tasks/dsk-postgres-agent.yml +++ b/tasks/dsk-postgres-agent.yml @@ -12,4 +12,4 @@ - name: "Setting dsk-postgres-agent config" template: src: postgres-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-postgres-agent/agent-config.yml" + dest: "/etc/datasaker/dsk-postgres-agent/agent-config.yml" \ No newline at end of file diff --git a/tasks/dsk-redhat-pkg.yml b/tasks/dsk-redhat-pkg.yml index 9a3c7f4..fe6cf67 100644 --- a/tasks/dsk-redhat-pkg.yml +++ b/tasks/dsk-redhat-pkg.yml @@ -45,4 +45,4 @@ notify: - Reload systemd configuration - Restart {{ item }} service - ignore_errors: true + ignore_errors: true \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index 47cbfa5..3813ff5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,4 +43,4 @@ - name: "Uninstall Datasaker Agent" include_tasks: remove-datasaker.yml when: - - uninstall == True + - uninstall == True \ No newline at end of file diff --git a/tasks/permissions.yml b/tasks/permissions.yml index f95f13c..01d4a7b 100644 --- a/tasks/permissions.yml +++ b/tasks/permissions.yml @@ -3,4 +3,4 @@ path: /var/datasaker owner: "{{ datasaker_docker_user }}" group: "{{ datasaker_docker_group }}" - recurse: yes + recurse: yes \ No newline at end of file diff --git a/tasks/remove-datasaker.yml b/tasks/remove-datasaker.yml index 9de5543..addac1d 100644 --- a/tasks/remove-datasaker.yml +++ b/tasks/remove-datasaker.yml @@ -127,5 +127,4 @@ when: - datasaker_clean == True - datasaker_docker_agents - ignore_errors: yes - + ignore_errors: yes \ No newline at end of file