task 순서 변경

handlers/main.yml

@@ -56,3 +56,15 @@
     name: dsk-plan-maria-agent
     enabled: true
     state: restarted
+
+- name: Restart dsk-redis-agent service
+  ansible.builtin.systemd:
+    name: dsk-redis-agent
+    enabled: true
+    state: restarted
+
+- name: Restart dsk-cloudwatch-agent service
+  ansible.builtin.systemd:
+    name: dsk-cloudwatch-agent
+    enabled: true
+    state: restarted

tasks/check-agent.yml

@@ -86,8 +86,8 @@
 
 - name: "Check dsk-docker-redis-agent"
   include_tasks: dsk-docker-redis-agent.yml
-  when: '"dsk-docker-redis-agent" in datasaker_agents'
+  when: '"dsk-docker-redis-agent" in datasaker_docker_agents'
 
 - name: "Check dsk-docker-cloudwatch-agent"
   include_tasks: dsk-docker-cloudwatch-agent.yml
-  when: '"dsk-docker-cloudwatch-agent" in datasaker_agents'
+  when: '"dsk-docker-cloudwatch-agent" in datasaker_docker_agents'

tasks/dsk-debian-pkg.yml

@@ -50,9 +50,6 @@
     state: present
     filename: datasaker
 
-- name: "Check datasaker Agent"
-  include_tasks: check-agent.yml
-
 - name: "Install metric sidecar"
   apt:
     name: "dsk-metric-sidecar"
@@ -79,6 +76,9 @@
     - "{{ datasaker_agents }}"
   ignore_errors: true
 
+- name: "Check datasaker Agent"
+  include_tasks: check-agent.yml
+
 - name: "Install datasaker log agent"
   apt:
     name: "td-agent"

tasks/dsk-redhat-pkg.yml

@@ -18,9 +18,6 @@
 # - 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 }}"
@@ -52,6 +49,9 @@
     - Restart {{ item }} service
   ignore_errors: true
 
+- name: "Check datasaker Agent"
+  include_tasks: check-agent.yml
+
 - name: "Setting dsk-log-agent config"
   template:
     src: log-agent-config.yml.j2
@@ -59,3 +59,12 @@
   when: 
     - '"dsk-log-agent" in datasaker_agents'
     - log_agent_image_tag == "latest"
+
+- name: "Restart dsk-agent service"
+  systemd_service:
+    state: restarted
+    name: "{{ item }}"
+    enabled: true
+  with_items:
+    - "{{ datasaker_agents }}"
+  ignore_errors: true

templates/redis-agent-config.yml.j2

@@ -4,7 +4,7 @@ agent:
     cluster_id: "{{ redis_agent_cluster | default('unknown') }}"
   option:
     external_labels:
-      redis: {{ reids_address }}
+      redis: {{ redis_address }}
     exporter_config:
       command: "/usr/bin/dsk-redis-exporter"
       port: {{ redis_agent_port | default('19121') }}