From 9688635e4208fd64e2992cfde262e56cc1c38768 Mon Sep 17 00:00:00 2001
From: LinPeiWen <591171850@qq.com>
Date: Wed, 3 Mar 2021 09:37:42 +0000
Subject: [PATCH] Use Docker healthchecks for skydive services

This change enables the use of Docker healthchecks for skydive services.
Implements: blueprint container-health-check

Change-Id: I2e18f2d912dad92a327261e092da358911531ebe
---
 ansible/roles/skydive/defaults/main.yml       | 28 +++++++++++++++++++
 ansible/roles/skydive/handlers/main.yml       |  2 ++
 .../roles/skydive/tasks/check-containers.yml  |  1 +
 ...thchecks-for-skydive-a3063822a68205b1.yaml |  6 ++++
 4 files changed, 37 insertions(+)
 create mode 100644 releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml

diff --git a/ansible/roles/skydive/defaults/main.yml b/ansible/roles/skydive/defaults/main.yml
index bbda2f5993..54a90972c9 100644
--- a/ansible/roles/skydive/defaults/main.yml
+++ b/ansible/roles/skydive/defaults/main.yml
@@ -9,6 +9,7 @@ skydive_services:
     image: "{{ skydive_analyzer_image_full }}"
     volumes: "{{ skydive_analyzer_default_volumes + skydive_analyzer_extra_volumes }}"
     dimensions: "{{ skydive_analyzer_dimensions }}"
+    healthcheck: "{{ skydive_analyzer_healthcheck }}"
     haproxy:
       skydive_server:
         enabled: "{{ enable_skydive }}"
@@ -28,6 +29,7 @@ skydive_services:
     privileged: True
     volumes: "{{ skydive_agent_default_volumes + skydive_agent_extra_volumes }}"
     dimensions: "{{ skydive_agent_dimensions }}"
+    healthcheck: "{{ skydive_agent_healthcheck }}"
 
 ####################
 # Docker
@@ -44,6 +46,32 @@ skydive_agent_image_full: "{{ skydive_agent_image }}:{{ skydive_agent_tag }}"
 skydive_analyzer_dimensions: "{{ default_container_dimensions }}"
 skydive_agent_dimensions: "{{ default_container_dimensions }}"
 
+skydive_analyzer_enable_healthchecks: "{{ enable_container_healthchecks }}"
+skydive_analyzer_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
+skydive_analyzer_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
+skydive_analyzer_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
+skydive_analyzer_healthcheck_test: ["CMD-SHELL", "healthcheck_listen skydive {{ skydive_analyzer_port }}"]
+skydive_analyzer_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
+skydive_analyzer_healthcheck:
+  interval: "{{ skydive_analyzer_healthcheck_interval }}"
+  retries: "{{ skydive_analyzer_healthcheck_retries }}"
+  start_period: "{{ skydive_analyzer_healthcheck_start_period }}"
+  test: "{% if skydive_analyzer_enable_healthchecks | bool %}{{ skydive_analyzer_healthcheck_test }}{% else %}NONE{% endif %}"
+  timeout: "{{ skydive_analyzer_healthcheck_timeout }}"
+
+skydive_agent_enable_healthchecks: "{{ enable_container_healthchecks }}"
+skydive_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
+skydive_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
+skydive_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
+skydive_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_listen skydive {{ skydive_agents_port }}"]
+skydive_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
+skydive_agent_healthcheck:
+  interval: "{{ skydive_agent_healthcheck_interval }}"
+  retries: "{{ skydive_agent_healthcheck_retries }}"
+  start_period: "{{ skydive_agent_healthcheck_start_period }}"
+  test: "{% if skydive_agent_enable_healthchecks | bool %}{{ skydive_agent_healthcheck_test }}{% else %}NONE{% endif %}"
+  timeout: "{{ skydive_agent_healthcheck_timeout }}"
+
 skydive_analyzer_default_volumes:
   - "{{ node_config_directory }}/skydive-analyzer/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
diff --git a/ansible/roles/skydive/handlers/main.yml b/ansible/roles/skydive/handlers/main.yml
index 1568590e23..9788ee780b 100644
--- a/ansible/roles/skydive/handlers/main.yml
+++ b/ansible/roles/skydive/handlers/main.yml
@@ -11,6 +11,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
     dimensions: "{{ service.dimensions }}"
+    healthcheck: "{{ service.healthcheck | default(omit) }}"
   when:
     - kolla_action != "config"
 
@@ -27,5 +28,6 @@
     privileged: "{{ service.privileged }}"
     volumes: "{{ service.volumes }}"
     dimensions: "{{ service.dimensions }}"
+    healthcheck: "{{ service.healthcheck | default(omit) }}"
   when:
     - kolla_action != "config"
diff --git a/ansible/roles/skydive/tasks/check-containers.yml b/ansible/roles/skydive/tasks/check-containers.yml
index dd25c44016..c63f6655f3 100644
--- a/ansible/roles/skydive/tasks/check-containers.yml
+++ b/ansible/roles/skydive/tasks/check-containers.yml
@@ -9,6 +9,7 @@
     privileged: "{{ item.value.privileged | default(False) }}"
     volumes: "{{ item.value.volumes }}"
     dimensions: "{{ item.value.dimensions }}"
+    healthcheck: "{{ item.value.healthcheck | default(omit) }}"
   when:
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml b/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml
new file mode 100644
index 0000000000..7f6c67455a
--- /dev/null
+++ b/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Implements container healthchecks for skydive services.
+    See `blueprint
+    <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__