From 50a628b5875f4701339cf39067c686abac446afa Mon Sep 17 00:00:00 2001 From: havelight-ee Date: Fri, 23 Jun 2023 11:38:35 +0900 Subject: [PATCH] update --- .README.md.swp | Bin 0 -> 16384 bytes README.md | 18 +++--- tasks/dsk-common.yml | 3 +- tasks/dsk-debian-pkg.yml | 2 +- tasks/dsk-docker-postgres-agent.yml | 5 ++ tasks/dsk-log-agent.yml | 11 +++- tasks/dsk-node-agent.yml | 11 +++- tasks/dsk-plan-postgres-agent.yml | 11 +++- tasks/dsk-postgres-agent.yml | 9 ++- tasks/dsk-redhat-pkg.yml | 7 +-- tasks/dsk-trace-agent.yml | 11 +++- tasks/main.yml | 2 +- tasks/permissions.yml | 2 +- tasks/remove-datasaker.yml | 83 +++++++++++++++------------- tasks/vi | 43 -------------- 15 files changed, 103 insertions(+), 115 deletions(-) create mode 100644 .README.md.swp delete mode 100644 tasks/vi diff --git a/.README.md.swp b/.README.md.swp new file mode 100644 index 0000000000000000000000000000000000000000..b5952d1087f8d780af09d5c2379eed426732886a GIT binary patch literal 16384 zcmeI3TWl0n7{`x_7gW4}@yUn7A_j}QlopJs(AY@jUa(RUW617ocW5`=ovAak(3*|b zxR443s$r$YZ7tzu4be5+O2UIrm}rbICI%mP@Ig#xR(&w252F8bW@dMGx|O!UOU#+} zpKZ@M^PO{kGw1SsGaIemx^^RdDpW&oJV40TKOKzimS>ammurZoss>BG(XnpLx|XKZ zH!4NQtIXh%4N_EJA}M-2nvj=hYC^_;ZL(qn-L&S$hE*FIL&?~UEs7F?fFLj>0x4sA z@Toa1wKYqtS@{Kl`E=ggmMNVo3JC&&fFK|U2m*qDARq_`0)oK*gMiUFi@b)e-0E~^ zjq`bn@AD7msB+TR`tq+k`751t-IxEnlTV%Wyf5GRS9}Npf`A|(2nYg#fFK|U2m*qD zARq_`0)oKbKtRG%cINxnGlw6~|6Tw8>ivX#2fYUkL;In9P#jtW{dONAze3+bSD}xf z5252w8tQ^}LW`j)=$AQ!T!X%VE@@vtr{v2a{5WNn9( zh@|N%H&9-AAZ-vd=u)N3FfN@qC6_nPb*SHbhrMwfaS?B&K%+ zksRc&XGEso?&W&rDmqndGW)CvbTjfNV^O=bwt87*vo?`Rt>#uiWiq3T3hz8O;h^RT zoe4<^`;f4-o5qA!;05BhJ|!Zx9vVb7R#sGpyBVE~NBPmfr`{nVw+&!f+(iXp`nEZq&v z0yR&Za!wuIW$x`Y_Z|yTzGl-^6;II3;}@x!IcnuDnxkjv8dWzOOKicvz%MLnH4hB3 z5=U~>ypSmj=B&)eg~5Z=>>qV2VfzBUzS$iLDr!u2$BZ|ms$UPpDl_10NOx|0dsN6a7gXtf8mv)!g^72S{$ z3EJ2tB|8&xg|74MFl^d=F5NMKZIm~&1nJ-DmS<>9)+u6TGv+X#c*e)_=IJqK24r)g z+1FFZ=BPE$3$KLT;`R(j2r{jqGjLomY4RB@pD!FZ#U{g23c;<>kd$6g6}lm=q`GJgHSO;7p_6Fv$sX(7evg45<6@q} zZ^jxLpys|jCTT0%%N7H(cNf-!8yaxizN04eL}m!K@P8QKK>0H3}Ong_MRUvGozp_R~+5cA_7hUP%bkG~3i0-b{1hW0~m zLOY-o6on*cE5zFJJR}Z5KoAfF1OY)n5D)|e0YN|z_^%TP2J1;xRg-GSbyZaq-!x>A zIyoAb6sjAVY_ztsG`dAoQ}_n3-j44C$CWlaXa`5n=R&t8WJ#$*X?XJ#M@n(rL{FN> z;pSl|=9;f)Sl!sPCEV1ov9X?q8~%}!|(-yap#VA5qIFk1%lAi5-cxcDZ zs5#Kj!n~fGvOr6O@@OUZrp^AG8$}#Ml=zJyc-ROQ=4j!-8FL@vhWP_d{Dv0#`mCXg z;}`ni)*_yq8~-@(Ml3y#8K099y37OKMacXqpxe8!9r%dMsF8TkS*)4G-DstX{|C{t z(!I#9vNhCGx@8ePp%Hc`M_7>8e%NdF4_NP" datasaker_agents: ["dsk-node-agent"] ``` -##### Docker Agent Default Install Example +#### Docker Agent Default Install Example ```yml - hosts: servers become: true @@ -41,7 +41,7 @@ ansible-galaxy install dsk_bot.datasaker datasaker_docker_agents: ["dsk-docker-node-agent","dsk-docker-log-agent"] ``` -#### 필수 설정 +### 필수 설정 | 변수명 | 설명 | |--------------------------------------------|--------------------------------------------------| @@ -72,7 +72,7 @@ ansible-galaxy install dsk_bot.datasaker |`datasaker_api_send_interval`| Datasaker API Server Data 전송 만료 시간 설정.
(Default) `1m`| --> -#### Docker Container Agent 설정 +### Docker Container Agent 설정 | 변수명 | 설명 | |--------------------------------------------|--------------------------------------------------| |`datasaker_docker_config_path`| Datasaker Global Config 위치 설정.
(Default) `~/.datasaker`| @@ -103,7 +103,7 @@ ansible-galaxy install dsk_bot.datasaker |`postgres_agent_image_tag`| `dsk-postgres-agent` Image tag 설정.
(Default) `latest`| |`plan_postgres_agent_image_tag`| `dsk-plan-postgres-agent` Image tag 설정.
(Default) `latest`|--> -#### Datasaker Agent 상세 설정 +### Datasaker Agent 상세 설정 - Host Agent 와 Docker Container Agent는 같은 설정값을 사용합니다. | 변수명 | 설명 | @@ -135,7 +135,7 @@ ansible-galaxy install dsk_bot.datasaker |`plan_postgres_activity_query_buffer`| `dsk-plan-postgres-agent`에 Plan Postgres activity query buffer 설정.
(Default) `50` | |`plan_postgres_plan_sender_buffer`| `dsk-plan-postgres-agent`에 Plan Postgres plan sender buffer 설정.
(Default) `50` | -##### Ansible Playbook 상세 설정 Example +#### Ansible Playbook 상세 설정 Example ```yml - hosts: servers become: true @@ -186,7 +186,7 @@ datasaker_clean은 uninstall이 `True`로 설정되어야 합니다. |`uninstall`| `datasaker_agents` 또는 `datasaker_docker_agents` 에 작성된 Agent만 제거.
(Default) `False`| |`datasaker_clean`| `datasaker_agents` 또는 `datasaker_docker_agents` 에 작성된 Agent 와 생성 된 폴더 및 설정 파일까지 제거.
(Default) `False`| -##### Datasaker Agents Uninstall Example +#### Datasaker Agents Uninstall Example ```yml - hosts: servers diff --git a/tasks/dsk-common.yml b/tasks/dsk-common.yml index 251228d..c6c465d 100644 --- a/tasks/dsk-common.yml +++ b/tasks/dsk-common.yml @@ -47,5 +47,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 40a48fb..c4acb12 100644 --- a/tasks/dsk-debian-pkg.yml +++ b/tasks/dsk-debian-pkg.yml @@ -90,4 +90,4 @@ state: restarted with_items: - "{{ datasaker_agents }}" - ignore_errors: true + ignore_errors: true \ No newline at end of file diff --git a/tasks/dsk-docker-postgres-agent.yml b/tasks/dsk-docker-postgres-agent.yml index 4cd4ac9..9ae1589 100644 --- a/tasks/dsk-docker-postgres-agent.yml +++ b/tasks/dsk-docker-postgres-agent.yml @@ -20,6 +20,11 @@ src: docker-postgres-agent-config.yml.j2 dest: "{{ datasaker_docker_path }}/dsk-docker-postgres-config.yml" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_docker_path }}/dsk-docker-plan-postgres-config.yml" + state: touch + - name: "Setting plan-dsk-postgres-agent config" template: src: docker-plan-postgres-agent-config.yml.j2 diff --git a/tasks/dsk-log-agent.yml b/tasks/dsk-log-agent.yml index 480a6a8..cebebea 100644 --- a/tasks/dsk-log-agent.yml +++ b/tasks/dsk-log-agent.yml @@ -1,13 +1,20 @@ --- -- name: Make agent Directory +- name: "Make agent Directory" ansible.builtin.file: path: "/etc/datasaker/{{ item }}" state: directory recurse: yes + owner: root + group: root with_items: - "dsk-log-agent" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/dsk-log-agent/agent-config.yml" + state: touch + - name: "Setting dsk-log-agent config" template: src: log-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-log-agent/agent-config.yml" \ No newline at end of file + dest: "{{ datasaker_host_path }}/dsk-log-agent/agent-config.yml" \ No newline at end of file diff --git a/tasks/dsk-node-agent.yml b/tasks/dsk-node-agent.yml index 673baa9..3cd4c56 100644 --- a/tasks/dsk-node-agent.yml +++ b/tasks/dsk-node-agent.yml @@ -1,7 +1,7 @@ --- -- name: Make agent Directory +- name: "Make agent Directory" ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" + path: "{{ datasaker_host_path }}/{{ item }}" state: directory recurse: yes owner: root @@ -9,7 +9,12 @@ with_items: - "dsk-node-agent" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/dsk-node-agent/agent-config.yml" + state: touch + - name: "Setting dsk-node-agent config" template: src: node-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-node-agent/agent-config.yml" \ No newline at end of file + dest: "{{ datasaker_host_path }}/dsk-node-agent/agent-config.yml" \ No newline at end of file diff --git a/tasks/dsk-plan-postgres-agent.yml b/tasks/dsk-plan-postgres-agent.yml index 29029bd..de2e08f 100644 --- a/tasks/dsk-plan-postgres-agent.yml +++ b/tasks/dsk-plan-postgres-agent.yml @@ -1,7 +1,7 @@ --- -- name: Make agent Directory +- name: "Make agent Directory" ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" + path: "{{ datasaker_host_path }}/{{ item }}" state: directory recurse: yes owner: root @@ -9,7 +9,12 @@ with_items: - "dsk-plan-postgres-agent" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/dsk-plan-postgres-agent/agent-config.yml" + state: touch + - name: "Setting dsk-plan-postgres-agent config" template: src: plan-postgres-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-plan-postgres-agent/agent-config.yml" \ No newline at end of file + dest: "{{ datasaker_host_path }}/dsk-plan-postgres-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 e4d997d..e187ded 100644 --- a/tasks/dsk-postgres-agent.yml +++ b/tasks/dsk-postgres-agent.yml @@ -1,7 +1,7 @@ --- - name: "Make agent Directory" ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" + path: "{{ datasaker_host_path }}/{{ item }}" state: directory recurse: yes owner: root @@ -9,7 +9,12 @@ with_items: - "dsk-postgres-agent" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/dsk-postgres-agent/agent-config.yml" + state: touch + - name: "Setting dsk-postgres-agent config" template: src: postgres-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-postgres-agent/agent-config.yml" \ No newline at end of file + dest: "{{ datasaker_host_path }}/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 fe6cf67..17de2da 100644 --- a/tasks/dsk-redhat-pkg.yml +++ b/tasks/dsk-redhat-pkg.yml @@ -1,9 +1,4 @@ --- -- name: "Setting global-config" - template: - src: global-config.yml.j2 - dest: "/etc/datasaker/global-config.yml" - - name: "Add datasaker repository" yum_repository: name: datasaker @@ -20,7 +15,7 @@ - name: Make Datasaker Log Directory ansible.builtin.file: - path: "/var/log/datasaker/{{ item }}" + path: "{{ datasaker_host_log_path }}/{{ item }}" state: directory recurse: yes owner: root diff --git a/tasks/dsk-trace-agent.yml b/tasks/dsk-trace-agent.yml index bb15f02..af6b8ac 100644 --- a/tasks/dsk-trace-agent.yml +++ b/tasks/dsk-trace-agent.yml @@ -1,7 +1,7 @@ --- -- name: Make agent Directory +- name: "Make agent Directory" ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" + path: "{{ datasaker_host_path }}/{{ item }}" state: directory recurse: yes owner: root @@ -9,7 +9,12 @@ with_items: - "dsk-trace-agent" +- name: "Create agent config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/dsk-trace-agent/agent-config.yml" + state: touch + - name: "Setting dsk-trace-agent config" template: src: trace-agent-config.yml.j2 - dest: "/etc/datasaker/dsk-trace-agent/agent-config.yml" \ No newline at end of file + dest: "{{ datasaker_host_path }}/dsk-trace-agent/agent-config.yml" \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index a1ead5c..59d6ae3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -44,4 +44,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 01d4a7b..1b912a4 100644 --- a/tasks/permissions.yml +++ b/tasks/permissions.yml @@ -1,6 +1,6 @@ - name: "Change owner and group of datasaker docker directory" ansible.builtin.file: - path: /var/datasaker + path: "{{ datasaker_docker_path }}" owner: "{{ datasaker_docker_user }}" group: "{{ datasaker_docker_group }}" recurse: yes \ No newline at end of file diff --git a/tasks/remove-datasaker.yml b/tasks/remove-datasaker.yml index addac1d..7d8d4d7 100644 --- a/tasks/remove-datasaker.yml +++ b/tasks/remove-datasaker.yml @@ -1,26 +1,8 @@ --- -- name: Remove Datasaker Log Directory - ansible.builtin.file: - path: "/var/log/datasaker/{{ item }}" - state: absent - with_items: - - "{{ datasaker_agents }}" - when: - - datasaker_agents - -- name: Remove Datasaker Agent Directory - ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" - state: absent - with_items: - - "{{ datasaker_agents }}" - when: - - datasaker_agents - - name: Stop agent service ansible.builtin.systemd: name: "{{ item }}" - enabled: true + enabled: false state: stopped with_items: - "{{ datasaker_agents }}" @@ -55,18 +37,56 @@ - Reload systemd configuration ignore_errors: true +- name: Remove Datasaker Log Directory + ansible.builtin.file: + path: "{{ datasaker_host_log_path }}/{{ item }}" + state: absent + with_items: + - "{{ datasaker_agents }}" + when: + - datasaker_agents + +- name: Remove Datasaker Agent Directory + ansible.builtin.file: + path: "{{ datasaker_host_path }}/{{ item }}" + state: absent + with_items: + - "{{ datasaker_agents }}" + when: + - datasaker_agents + +- name: Remove Datasaker Host Directory + ansible.builtin.file: + path: "{{ item }}" + state: absent + with_items: + - "{{ datasaker_host_path }}" + - "{{ datasaker_host_log_path }}" + - "{{ apt_sources_list }}" + - "{{ apt_trusted_d_keyring }}" + - "{{ apt_usr_share_keyring }}" + when: + - datasaker_clean == True + - datasaker_agents - name: Stop the Docker container docker_container: name: "{{ item }}" state: absent with_items: - - "dsk-docker-container-agent" - "{{ datasaker_docker_agents }}" when: - datasaker_docker_agents ignore_errors: true +- name: Stop the Docker container-agent container + docker_container: + name: "dsk-docker-container-agent" + state: absent + when: + - '"dsk-docker-node-agent" in datasaker_docker_agents' + ignore_errors: true + - name: Stop the Docker plan-postgres-agent container docker_container: name: "dsk-docker-plan-postgres-agent" @@ -75,29 +95,14 @@ - '"dsk-docker-postgres-agent" in datasaker_docker_agents' ignore_errors: true -- name: Remove Datasaker Agent Directory +- name: Remove Datasaker Docker Agent Directory ansible.builtin.file: - path: "/etc/datasaker/{{ item }}" + path: "{{ datasaker_docker_path }}/{{ item }}" state: absent with_items: - - "{{ datasaker_agents }}" + - "{{ datasaker_docker_agents }}" when: - - datasaker_agents - -- name: Remove Datasaker All Directory - ansible.builtin.file: - path: "{{ item }}" - state: absent - with_items: - - /etc/datasaker - - /var/log/datasaker - - /var/datasaker - - "{{ apt_sources_list }}" - - "{{ apt_trusted_d_keyring }}" - - "{{ apt_usr_share_keyring }}" - when: - - datasaker_clean == True - - datasaker_agents + - datasaker_docker_agents - name: "Remove datasaker_docker_user" ansible.builtin.user: diff --git a/tasks/vi b/tasks/vi deleted file mode 100644 index a778fa9..0000000 --- a/tasks/vi +++ /dev/null @@ -1,43 +0,0 @@ ---- -- name: "Add datasaker repository" - yum_repository: - name: datasaker - description: datasaker-repo - baseurl: "{{ datasaker_yum_repo }}" - enabled: "{{ datasaker_yum_enabled }}" - gpgcheck: "{{ datasaker_yum_gpgcheck }}" - -- set_fact: - datasaker_agents: "{{ datasaker_agents | reject('equalto', 'dsk-log-agent') | list }}" - -- name: "Check datasaker Agent" - include_tasks: check-agent.yml - -- name: Make Datasaker Log Directory - ansible.builtin.file: - path: "{{ datasaker_host_log_path }}/{{ item }}" - state: directory - recurse: yes - owner: root - group: root - with_items: - - "{{ datasaker_agents }}" - -- name: "Install datasaker log agent" - apt: - name: "td-agent" - state: latest - update_cache: yes - when: '"dsk-log-agent" in datasaker_agents' - -- name: "Install datasaker agent" - yum: - name: "{{ item }}" - state: present - update_cache: yes - with_items: - - "{{ datasaker_agents }}" - notify: - - Reload systemd configuration - - Restart {{ item }} service - ignore_errors: true