diff --git a/README.md b/README.md
index 8104663..abc7a56 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To deploy the Datasaker Agent on hosts, add the Datasaker role and your API key
| Variable | Description |
|--------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|`datasaker_api_key`|Your Datasaker API key.|
-|`datasaker_agents`|Set to Datasaker Agent.
`dsk_node_agent` `dsk_trace_agent` `dsk_log_agent` `dsk-postgres-agent` `dsk-plan-postgres-agent`
(Default) `dsk_node_agent`|
+|`datasaker_agents`|Set to Datasaker Agent.
`dsk-node-agent` `dsk-trace-agent` `dsk-log-agent` `dsk-postgres-agent` `dsk-plan-postgres-agent`
(Default) `dsk-node-agent`|
|`datagate_url`|The site of the Datasaker intake to send Agent data to.
(Default) `gate.kr.datasaker.io`|
|`datagate_trace_url`|Override the `dsk-trace-agent` datagate url.
(Default) `datagate_url`|
|`datagate_trace_port`|Override the `dsk-trace-agent` datagate port.
(Default) `31300`|
diff --git a/defaults/main.yml b/defaults/main.yml
index 86dffe6..13450d9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,6 +24,10 @@ datagate_loggate_timeout: 5s
datasaker_api_url: api.kr.datasaker.io
datasaker_api_send_interval: 1m
+datasaker_yum_repo: "http://nexus.exem-oss.org/repository/datasaker-amazonlinux-2023"
+datasaker_yum_enabled: yes
+datasaker_yum_gpgcheck: no
+
apt_trusted_d_keyring: "/etc/apt/trusted.gpg.d/datasaker-archive-keyring.gpg"
apt_usr_share_keyring: "/usr/share/keyrings/datasaker-archive-keyring.gpg"
diff --git a/handlers/main.yml b/handlers/main.yml
index abfddbd..7e3220d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,34 +1,34 @@
---
- name: Reload systemd configuration
- service:
+ ansible.builtin.systemd:
daemon_reload: True
- name: Restart dsk-trace-agent service
- service:
+ ansible.builtin.systemd:
name: dsk-trace-agent
enabled: true
state: restarted
- name: Restart dsk-node-agent service
- service:
+ ansible.builtin.systemd:
name: dsk-node-agent
enabled: true
state: restarted
- name: Restart dsk-log-agent service
- service:
+ ansible.builtin.systemd:
name: dsk-log-agent
enabled: true
state: restarted
- name: Restart dsk-postgres-agent service
- service:
+ ansible.builtin.systemd:
name: dsk-postgres-agent
enabled: true
state: restarted
- name: Restart dsk-plan-postgres-agent service
- service:
+ ansible.builtin.systemd:
name: dsk-plan-postgres-agent
enabled: true
state: restarted
\ No newline at end of file
diff --git a/tasks/dsk-redhat-pkg.yml b/tasks/dsk-redhat-pkg.yml
new file mode 100644
index 0000000..790bf62
--- /dev/null
+++ b/tasks/dsk-redhat-pkg.yml
@@ -0,0 +1,40 @@
+---
+- name: "Setting global-config"
+ template:
+ src: global-config.yml.j2
+ dest: "/etc/datasaker/global-config.yml"
+
+- 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: "/var/log/datasaker/{{ item }}"
+ state: directory
+ recurse: yes
+ owner: root
+ group: root
+ with_items:
+ - "{{ 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
diff --git a/tasks/main copy.yml b/tasks/main copy.yml
deleted file mode 100644
index f89f8c2..0000000
--- a/tasks/main copy.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Include Gather Ansible Facts task on Ansible >= 2.10
- include_tasks: gather-facts.yml
- when: ansible_version.major >= 2 and ansible_version.minor >= 10
-
-- name: Include Datasaker Add Repository
- include_tasks: dsk-common.yml
- when: ansible_facts.os_family == "Debian"
-
-- name: Include Datasaker Host Agent Install
- include_tasks: dsk-debian-pkg.yml
- when: ansible_facts.os_family == "Debian"
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index be4f113..e5b4c3a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,12 +5,16 @@
- name: Include Datasaker Add Repository
include_tasks: dsk-common.yml
- when: uninstall == False and ansible_facts.os_family == "Debian"
+ when: uninstall == False and ansible_facts.os_family == "Debian" or ansible_facts.os_family == "RedHat"
-- name: Include Datasaker Host Agent Install
+- name: Include Datasaker Debian Host Agent Install
include_tasks: dsk-debian-pkg.yml
when: uninstall == False and ansible_facts.os_family == "Debian"
+- name: Include Datasaker RedHat Host Agent Install
+ include_tasks: dsk-redhat-pkg.yml
+ when: uninstall == False and ansible_facts.os_family == "RedHat"
+
- name: Uninstall Datasaker Agent
include_tasks: remove-datasaker.yml
- when: uninstall == True
\ No newline at end of file
+ when: uninstall == True
diff --git a/templates/log-agent-config.yml.j2_bak b/templates/log-agent-config.yml.j2_bak
deleted file mode 100644
index cc55c92..0000000
--- a/templates/log-agent-config.yml.j2_bak
+++ /dev/null
@@ -1,37 +0,0 @@
-agent:
- metadata:
- agent_name: "{{ log_agent_name | default('dsk-log-agent') }}"
- cluster_id: "{{ log_agent_cluster_id | default('unknown') }}"
- environment: "{{ log_agent_environment | default('etc') }}"
- collect:
- - paths:
- {% if paths is defined and paths | length > 0 %}
- {% for path in paths %}
- - "{{ path | default('') }}"
- {% endfor %}
- {% else %}
- - /var/log/*/*.log
- {% endif %}
-
- {% if exclude_paths is defined and exclude_paths | length > 0 %}
- exclude_paths:
- {% for exclude_path in exclude_paths %}
- - "{{ exclude_path | default('') }}"
- {% endfor %}
- {% else %}
- exclude_paths: []
- {% endif %}
-
- {% if keywords is defined and keywords | length > 0 %}
- keywords:
- {% for keyword in keywords %}
- - "{{ keyword | default('') }}"
- {% endfor %}
- {% else %}
- keywords: []
- {% endif %}
- tag: "{{ log_agent_tag | default('sample') }}"
- service:
- name: "{{ log_agent_service_name | default('test') }}"
- category: "{{ log_agent_service_category | default('etc') }}"
- type: "{{ log_agent_service_type | default('etc') }}"
\ No newline at end of file