diff --git a/Dockerfile b/Dockerfile index fe5825b..ecc802e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -FROM python:3.11.9-alpine3.20 +#FROM python:3.11.9-alpine3.20 +FROM python:3.6-alpine -LABEL version="1.0" -LABEL agent_list="host,container,ndm" +LABEL version="1.5" +LABEL agent_list="host,manager" RUN \ - pip3 install ansible && \ - apk add openssh sshpass + apk add --no-cache gcc musl-dev libffi-dev openssh sshpass python3-dev && \ + pip3 install ansible WORKDIR /installer diff --git a/agent.yml b/agent.yml index cf6816d..dcb5ede 100644 --- a/agent.yml +++ b/agent.yml @@ -11,6 +11,5 @@ #MANAGER_RECEIVER_PORT: 9010 # port 설정이 필요할 경우 위 주석을 해제하고 설정 # RECEIVER_PORT 와 MANGER_RECEIVER_PORT 같은 경우 변수를 설정하지 않을 경우 default 값으로 각각 9009 , 9010 으로 설정 됨 - host-agent-version: 3.0.21 - manager-agent-version: 3.0.11 + host_agent_version: 3.0.21 agent_list: ['host-agent', 'manager-agent'] diff --git a/installer/ansible.cfg b/installer/ansible.cfg index 3480d3f..68a0f1c 100644 --- a/installer/ansible.cfg +++ b/installer/ansible.cfg @@ -4,5 +4,5 @@ roles_path = roles deprecation_warnings = False display_skipped_hosts = no ansible_home = . -stdout_callback = debug -host_key_checking = False \ No newline at end of file +stdout_callback = yaml +host_key_checking = False diff --git a/installer/roles/one_agent/tasks/host-agent.yml b/installer/roles/one_agent/tasks/host-agent.yml index 8d19b23..550a88a 100644 --- a/installer/roles/one_agent/tasks/host-agent.yml +++ b/installer/roles/one_agent/tasks/host-agent.yml @@ -21,7 +21,7 @@ - name: Install Start exemONE Host-Agent ansible.builtin.shell: | - {{ EXEM_HOME }}/host/setup_exem-host-agent_{{ host-agent-version }}.bin ./host_config + {{ EXEM_HOME }}/host/setup_exem-host-agent_{{ host_agent_version }}.bin ./host_config args: chdir: "{{ EXEM_HOME }}/host" diff --git a/installer/roles/one_agent/tasks/main.yml b/installer/roles/one_agent/tasks/main.yml index 6f5be85..6d5bf8a 100644 --- a/installer/roles/one_agent/tasks/main.yml +++ b/installer/roles/one_agent/tasks/main.yml @@ -9,7 +9,7 @@ - include_tasks: manager-agent.yml when: - - agent_list | select('search' 'manager-agent') | list | count > 0 + - agent_list | select('search', 'manager-agent') | list | count > 0 - "'manager_agent' in group_names" # - include_tasks: container-agent.yml diff --git a/installer/roles/one_agent/tasks/manager-agent.yml b/installer/roles/one_agent/tasks/manager-agent.yml index 11b1106..1801fec 100644 --- a/installer/roles/one_agent/tasks/manager-agent.yml +++ b/installer/roles/one_agent/tasks/manager-agent.yml @@ -53,6 +53,13 @@ - start.sh - stop.sh + - name: Copy binary to linux + ansible.builtin.copy: + src: "{{ EXEM_HOME }}/manager/os_binary/exem-manager-agent_linux-2.6-x86_64-64" + dest: "{{ EXEM_HOME }}/manager/bin/exem-manager-agent" + mode: '0755' + remote_src: yes + - name: exem-manager-agent start ansible.builtin.shell: | - {{ EXEM_HOME }}/manager/start.sh \ No newline at end of file + {{ EXEM_HOME }}/manager/start.sh diff --git a/installer/roles/one_agent/templates/autoload_conf.j2 b/installer/roles/one_agent/templates/autoload_conf.j2 index 89b7cd9..9390924 100644 --- a/installer/roles/one_agent/templates/autoload_conf.j2 +++ b/installer/roles/one_agent/templates/autoload_conf.j2 @@ -1,3 +1,3 @@ -{{ EXEM_HOME }}/host/data/host_id +{{ EXEM_HOME }}/host/exem/host/data/host_id {{ EXEM_HOME }}/exemone-db-agent/db_id -{{ EXEM_HOME }}/ndm/data/agent.id \ No newline at end of file +{{ EXEM_HOME }}/ndm/data/agent.id diff --git a/inventory b/inventory index 04eac8b..26becf7 100644 --- a/inventory +++ b/inventory @@ -3,7 +3,8 @@ host_agent manager_agent [host_agent] -10.10.52.117 ansible_user=root ansible_ssh_pass=tmax@23 ansible_become_pass=tmax@23 +10.10.52.211 ansible_user=root ansible_ssh_pass=tmax@23 ansible_become_pass=tmax@23 +#10.10.52.212 ansible_user=root ansible_ssh_pass=tmax@23 ansible_become_pass=tmax@23 #10.10.52.201 ansible_user=root ansible_ssh_pass=exem@23 ansible_become_pass=exem@23 #10.10.52.202 ansible_user=root ansible_ssh_pass=exem@23 ansible_become_pass=exem@23 #10.10.52.203 ansible_user=root ansible_ssh_pass=exem@23 ansible_become_pass=exem@23 @@ -11,4 +12,4 @@ manager_agent #10.10.52.205 ansible_user=root ansible_ssh_pass=exem@23 ansible_become_pass=exem@23 [manager_agent] - +10.10.52.211 ansible_user=root ansible_ssh_pass=tmax@23 ansible_become_pass=tmax@23