From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Fri, 22 Sep 2017 17:38:10 +0000 (+0000)
Subject: Merge "Add AAI config changes"
X-Git-Tag: 2.0.0-ONAP~636
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b4779c6f4df54bcd6a8aaedeab1603422346b2ab;hp=95b8c4a7e326ed7774ea0509b8c5c7306f5424a9;p=oom.git

Merge "Add AAI config changes"
---

diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
new file mode 100644
index 0000000000..bd01bc5d95
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
@@ -0,0 +1,10 @@
+{
+  "service": {
+    "name": "Health Check: Message Router - DMaaP",
+    "check": {
+      "http": "http://dmaap.onap-message-router:3904/topics",
+      "interval": "30s",
+      "timeout": "1s"
+    }
+  }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
new file mode 100644
index 0000000000..128cf94460
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
@@ -0,0 +1,10 @@
+{
+ "service": {
+   "name": "Health Check: Message Router - Kafka",
+   "check": {
+     "script": "/consul/config/scripts/mr-kafka-health.sh",
+     "interval": "30s",
+     "timeout": "1s"
+   }
+ }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
new file mode 100644
index 0000000000..5268747349
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
@@ -0,0 +1,10 @@
+{
+ "service": {
+   "name": "Health Check: Message Router - ZooKeeper",
+   "check": {
+     "script": "/consul/config/scripts/mr-zookeeper-health.sh",
+     "interval": "30s",
+     "timeout": "1s"
+   }
+ }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
new file mode 100644
index 0000000000..317c2a699c
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
@@ -0,0 +1,13 @@
+kafkapod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "global-kafka-[^[:space:]]*")
+if [ -n "$kafkapod" ]; then
+   if /consul/config/bin/kubectl -n onap-message-router exec -it $kafkapod -- ps ef | grep -i kafka; then
+      echo Success. Kafka process is running. 2>&1
+      exit 0
+   else
+      echo Failed. Kafka is not running. 2>&1
+      exit 1
+   fi
+else
+   echo Failed. Kafka container is offline. 2>&1
+   exit 1
+fi
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
new file mode 100644
index 0000000000..3da456c05a
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
@@ -0,0 +1,13 @@
+zkpod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "zookeeper-[^[:space:]]*")
+if [ -n "$zkpod" ]; then
+   if /consul/config/bin/kubectl -n onap-message-router exec -it $zkpod -- ps ef | grep -i zookeeper; then
+      echo Success. Zookeeper process is running. 2>&1
+      exit 0
+   else
+      echo Failed. Zookeeper is not running. 2>&1
+      exit 1
+   fi
+else
+   echo Failed. Zookeeper container is offline. 2>&1
+   exit 1
+fi