update

tasks/dsk-common.yml

@@ -25,16 +25,21 @@
     path: "{{ item }}"
     state: directory
     recurse: yes
-    owner: root
-    group: root
   with_items:
     - "{{ datasaker_docker_config_path }}"
   when:
   - datasaker_docker_agents
 
+- name: "Touch agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_global_config }}"
+    state: touch
+  when:
+  - datasaker_docker_agents
+
 - name: "Setting global-config"
   template:
     src: global-config.yml.j2
     dest: "{{ datasaker_docker_global_config }}"
   when:
-  - datasaker_docker_agents
+  - datasaker_docker_agents

tasks/dsk-docker-log-agent.yml

@@ -9,6 +9,11 @@
   with_items:
     - "{{ datasaker_docker_path }}/agent/dsk-log-agent"
 
+- name: "Touch agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/log-agent-config.yml"
+    state: touch
+
 - name: "Setting dsk-log-agent config"
   template:
     src: log-agent-config.yml.j2
@@ -16,11 +21,11 @@
 
 - name: Run Datasaker Log Agent
   docker_container:
-    name: dsk-log-agent
+    name: dsk-docker-log-agent
     image: "datasaker/dsk-log-agent:{{ trace_agent_image_tag }}"
     state: started
     detach: true
-    restart_policy: always
+    restart_policy: "{{ log_agent_restart_policy }}"
     env:
       DKS_LOG_LEVEL: "{{ log_agent_log_level }}"
     command: "-global.config=/etc/datasaker/global-config.yml -agent.config=/etc/datasaker/dsk-log-agent/agent-config.yml -mount.volume=true"

tasks/dsk-docker-node-agent.yml

@@ -33,7 +33,7 @@
 
 - name: "Run Datasaker Container Agent"
   ansible.builtin.docker_container:
-    name: dsk-container-agent
+    name: dsk-docker-container-agent
     image: "datasaker/dsk-container-agent:{{ container_agent_image_tag }}"
     state: started
     restart_policy: "{{ container_agent_restart_policy }}"
@@ -52,7 +52,7 @@
 
 - name: "Run Datasaker Node Agent"
   ansible.builtin.docker_container:
-    name: dsk-node-agent
+    name: dsk-docker-node-agent
     image: "datasaker/dsk-node-agent:{{ node_agent_image_tag }}"
     state: started
     restart_policy: "{{ node_agent_restart_policy }}"

tasks/dsk-docker-postgres-agent.yml

@@ -10,9 +10,14 @@
     - "{{ datasaker_docker_path }}/agent/dsk-postgres-agent"
     - "{{ datasaker_docker_path }}/agent/dsk-plan-postgres-agent"
 
+- name: "Touch agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/dsk-postgres-config.yml"
+    state: touch
+
 - name: "Setting dsk-postgres-agent config"
   template:
-    src: postgres-agent-config.yml.j2
+    src: docker-postgres-agent-config.yml.j2
     dest: "{{ datasaker_docker_path }}/dsk-postgres-config.yml"
 
 - name: "Setting plan-dsk-postgres-agent config"
@@ -22,10 +27,10 @@
 
 - name: "Run dsk-postgres-agent container"
   docker_container:
-    name: dsk-postgres-agent
-    image: datasaker/dsk-postgres-agent:rel0.1.2
+    name: dsk-docker-postgres-agent
+    image: "datasaker/dsk-postgres-agent:{{ postgres_agent_image_tag }}"
     state: started
-    restart_policy: always
+    restart_policy: "{{ postgres_agent_restart_policy }}"
     detach: true
     env:
       DKS_LOG_LEVEL: "info"
@@ -39,10 +44,10 @@
 
 - name: "Run dsk-plan-postgres-agent container"
   docker_container:
-    name: dsk-plan-postgres-agent
-    image: datasaker/dsk-plan-postgres-agent:latest
+    name: dsk-docker-plan-postgres-agent
+    image: "datasaker/dsk-plan-postgres-agent:{{ plan_postgres_agent_image_tag }}"
     state: started
-    restart_policy: always
+    restart_policy: "{{ plan_postgres_agent_restart_policy }}"
     detach: true
     env:
       DKS_LOG_LEVEL: "info"

tasks/dsk-docker-trace-agent.yml

@@ -9,6 +9,11 @@
   with_items:
     - "{{ datasaker_docker_path }}/agent/dsk-trace-agent"
 
+- name: "Touch agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/trace-agent-config.yml"
+    state: touch
+
 - name: "Setting dsk-trace-agent config"
   template:
     src: trace-agent-config.yml.j2
@@ -16,7 +21,7 @@
 
 - name: "Run Datasaker trace Agent"
   ansible.builtin.docker_container:
-    name: dsk-trace-agent
+    name: dsk-docker-trace-agent
     image: "datasaker/dsk-trace-agent:{{ trace_agent_image_tag }}"
     state: started
     restart_policy: "{{ trace_agent_restart_policy }}"

tasks/dsk-log-agent.yml

@@ -4,12 +4,10 @@
     path: "/etc/datasaker/{{ item }}"
     state: directory
     recurse: yes
-    owner: root
-    group: root
   with_items:
     - "dsk-log-agent"
 
 - 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"

tasks/remove-datasaker.yml

@@ -5,6 +5,8 @@
     state: absent
   with_items:
     - "{{ datasaker_agents }}"
+  when: 
+    - datasaker_agents
 
 - name: Remove Datasaker Agent Directory
   ansible.builtin.file:
@@ -12,6 +14,8 @@
     state: absent
   with_items:
     - "{{ datasaker_agents }}"
+  when: 
+    - datasaker_agents
 
 - name: Stop agent service
   service:
@@ -20,6 +24,8 @@
     state: stopped
   with_items:
     - "{{ datasaker_agents }}"
+  when: 
+    - datasaker_agents
   ignore_errors: true
 
 - name: "Uninstall datasaker agent"
@@ -29,6 +35,27 @@
     update_cache: yes
   with_items:
     - "{{ datasaker_agents }}"
+  when: 
+    - datasaker_agents
+  ignore_errors: true
+
+- 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 plan-postgres-agent container
+  docker_container:
+    name: "dsk-docker-plan-postgres-agent"
+    state: absent
+  when:
+    - '"dsk-docker-postgres-agent" in datasaker_docker_agents'
   ignore_errors: true
 
 - name: Remove Datasaker Agent Directory
@@ -37,6 +64,8 @@
     state: absent
   with_items:
     - "{{ datasaker_agents }}"
+  when: 
+    - datasaker_agents
 
 - name: Remove Datasaker All Directory
   ansible.builtin.file:
@@ -46,32 +75,40 @@
     - /etc/datasaker
     - /var/log/datasaker
     - /var/datasaker
-    - ~/.datasaker
     - "{{ apt_sources_list }}"
     - "{{ apt_trusted_d_keyring }}"
     - "{{ apt_usr_share_keyring }}"
-  when: datasaker_clean == True
+  when:
+    - datasaker_clean == True
+    - datasaker_agents
 
 - name: "Remove datasaker_docker_user"
   ansible.builtin.user:
     name: "{{datasaker_docker_user}}"
     state: absent
-  when: datasaker_clean == True
+  when: 
+    - datasaker_clean == True
+    - datasaker_docker_agents
   ignore_errors: yes
 
 - name: "Remove datasaker_docker_group"
   ansible.builtin.group:
     name: "{{datasaker_docker_group}}"
     state: absent
-  when: datasaker_clean == True
+  when: 
+    - datasaker_clean == True
+    - datasaker_docker_agents
   ignore_errors: yes
 
 - name: "Remove datasaker_docker_directory"
   ansible.builtin.file:
     name: "{{ item }}"
     state: absent
-  when: datasaker_clean == True
-  ignore_errors: yes
   with_items:
     - "{{ datasaker_docker_config_path }}"
     - "{{ datasaker_docker_path }}"
+  when: 
+    - datasaker_clean == True
+    - datasaker_docker_agents
+  ignore_errors: yes
+