Updating healthcheck for kafka and zookeeper

[osm/devops.git] / installers / docker / docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 3fdfbc1..fe15b8a 100644 (file)
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -40,10 +40,10 @@ services:
     networks:
       - netOSM
     healthcheck:
-      test: echo stat | nc localhost 2181
-      interval: 10s
+      test: echo ruok | nc -w 2 localhost 2181
+      interval: 20s
       timeout: 10s
-      retries: 3
+      retries: 5
     logging:
       driver: "json-file"
       options:
@@ -60,10 +60,17 @@ services:
       KAFKA_ADVERTISED_PORT: 9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_LOG_RETENTION_HOURS: 24
+      KAFKA_BROKER_ID: 1
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
+      KAFKA_LISTENERS: PLAINTEXT://:9092
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'
+      KAFKA_CREATE_TOPICS: 'admin:1:1,users:1:1,projects:1:1,vim_account:1:1,wim_account:1:1,sdn:1:1,k8scluster:1:1,k8srepo:1:1,osmrepos:1:1,vnfd:1:1,nsd:1:1,nst:1:1,pdu:1:1,ns:1:1,nsi:1:1,alarm_request:1:1,alarm_response:1:1'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     healthcheck:
-      test: zookeeper-shell.sh zookeeper:2181 ls /brokers/ids 2>&1 | grep "Node does not exist" && exit 1 || exit 0
+      test: echo ruok | nc -w 2 zookeeper 2181
       interval: 20s
       timeout: 10s
       retries: 5
@@ -264,10 +271,10 @@ services:
   grafana:
     image: grafana/grafana
     volumes:
-      - ./files/dashboards-osm.yml:/etc/grafana/provisioning/dashboards/dashboards-osm.yml
-      - ./files/osm-sample-dashboard.json:/etc/grafana/provisioning/dashboards/osm-sample-dashboard.json
-      - ./files/osm-system-dashboard.json:/etc/grafana/provisioning/dashboards/osm-system-dashboard.json
-      - ./files/datasource-prometheus.yml:/etc/grafana/provisioning/datasources/datasource-prometheus.yml
+      - ./grafana/dashboards-osm.yml:/etc/grafana/provisioning/dashboards/dashboards-osm.yml
+      - ./grafana/osm-sample-dashboard.json:/etc/grafana/provisioning/dashboards/osm-sample-dashboard.json
+      - ./grafana/osm-system-dashboard.json:/etc/grafana/provisioning/dashboards/osm-system-dashboard.json
+      - ./grafana/datasource-prometheus.yml:/etc/grafana/provisioning/datasources/datasource-prometheus.yml
     hostname: grafana
     ports:
       - "${OSM_GRAFANA_PORTS:-3000:3000}"