Consul Health Check changes for MessageRouter

Issue-ID: OOM-987

Change-Id: If55855dbadcb009da3e82a2a3aa05bd49915a517
Signed-off-by: Priyanka <Priyanka.Jain3@amdocs.com>

6 files changed, 32 insertions, 33 deletions

diff --git a/kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json b/kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
deleted file mode 100644
index 386e226168..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Message Router - DMaaP",
-    "check": {
-      "http": "http://message-router:3904/topics",
-      "interval": "30s",
-      "timeout": "1s"
-    }
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/mr-health.json b/kubernetes/consul/resources/config/consul-agent-config/mr-health.json
new file mode 100644
index 0000000000..d8c056f006
--- /dev/null
+++ b/kubernetes/consul/resources/config/consul-agent-config/mr-health.json
@@ -0,0 +1,29 @@
+{
+  "service": {
+    "name": "Health Check: DMaaP",
+    "checks":[
+      {
+      "id": "dmaap",
+      "name": "Health Check: Message Router",
+      "http": "http://message-router:3904/topics",
+      "tls_skip_verify": true,
+      "interval": "30s",
+      "timeout": "1s"
+      },
+      {
+      "id": "mr-zookeeper",
+      "name": "Health Check: Message Router - ZooKeeper",
+      "script": "/consul/scripts/mr-zookeeper-health.sh",
+      "interval": "10s",
+      "timeout": "5s"
+      },
+      {
+      "id": "mr-kafka",
+      "name": "Health Check: Message Router - Kafka",
+      "script": "/consul/scripts/mr-kafka-health.sh",
+      "interval": "30s",
+      "timeout": "5s"
+      }
+    ]
+  }
+}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json b/kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
deleted file mode 100644
index df3b190726..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "service": {
-   "name": "Health Check: Message Router - Kafka",
-   "check": {
-     "script": "/consul/scripts/mr-kafka-health.sh",
-     "interval": "30s",
-     "timeout": "1s"
-   }
- }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json b/kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
deleted file mode 100644
index 36d295c1ef..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "service": {
-   "name": "Health Check: Message Router - ZooKeeper",
-   "check": {
-     "script": "/consul/scripts/mr-zookeeper-health.sh",
-     "interval": "30s",
-     "timeout": "1s"
-   }
- }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
index fd4587551d..4be0a24851 100755
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
@@ -1,4 +1,4 @@
-kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-kafka-[^[:space:]]*")
+kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-kafka-[^[:space:]]*")
 if [ -n "$kafkapod" ]; then
    if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $kafkapod -- ps ef | grep -i kafka; then
       echo Success. Kafka process is running. 2>&1
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
index fb34057bfc..f8f40b9f83 100755
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
@@ -1,6 +1,6 @@
-zkpod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-zookeeper-[^[:space:]]*")
+zkpod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-zookeeper-[^[:space:]]*")
 if [ -n "$zkpod" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $zkpod -- ps ef | grep -i zookeeper; then
+   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $zkpod -- ps aux | grep -i zookeeper; then
       echo Success. Zookeeper process is running. 2>&1
       exit 0
    else