Update Scorpio and Stellio

Author: jason-fox

.env

@@ -7,10 +7,10 @@ ORION_LD_VERSION=1.1.0-PRE-697
 
 # Scorpio variables
 SCORPIO_PORT=9090
-SCORPIO_VERSION=1.1.0
+SCORPIO_VERSION=2.1.13
 
 # Stellio variables
-STELLIO_DOCKER_TAG=v1.7.2
+STELLIO_DOCKER_TAG=v1.8.0
 STELLIO_PORT=8080
 
 # MongoDB variables

docker-compose/scorpio-aaio.yml

@@ -16,10 +16,9 @@
 # 
 # see: https://github.com/FIWARE/helm-charts/
 #
-version: "3.8"
+version: "3.9"
 
 services:
-
   zookeeper:
     labels:
       org.fiware: 'tutorial'
@@ -30,10 +29,12 @@ services:
       - default
     ports:
       - "2181"
+    logging:
+      driver: none
   kafka:
     labels:
       org.fiware: 'tutorial'
-    image: wurstmeister/kafka
+    image: bitnami/kafka
     hostname: kafka
     container_name: kafka
     networks:
@@ -44,15 +45,19 @@ services:
       KAFKA_ADVERTISED_HOST_NAME: kafka
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_ADVERTISED_PORT: 9092
+      KAFKA_LOG_RETENTION_MS: 10000
+      KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS: 5000
+      ALLOW_PLAINTEXT_LISTENER: "yes"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       - zookeeper
-      
+    logging:
+      driver: none
   postgres:
     labels:
       org.fiware: 'tutorial'
-    image: mdillon/postgis
+    image: postgis/postgis
     hostname: postgres
     container_name: db-postgres
     networks:
@@ -63,30 +68,21 @@ services:
       POSTGRES_USER: ngb
       POSTGRES_PASSWORD: ngb
       POSTGRES_DB: ngb
-
+    logging:
+      driver: none
   scorpio:
     labels:
       org.fiware: 'tutorial'
-    image: scorpiobroker/scorpio:scorpio-aaio_${SCORPIO_VERSION}
+    image: scorpiobroker/scorpio:scorpio-aaio-no-eureka_${SCORPIO_VERSION}
     hostname: scorpio
     container_name: fiware-scorpio
     networks:
       - default
     ports:
       - "${SCORPIO_PORT}:9090"
     depends_on:
-      - kafka
       - postgres
-    #healthcheck:
-    #  test: curl --fail -s http://scorpio:${SCORPIO_PORT}/scorpio/v1/info/ || exit 1
-    deploy:
-      resources:
-        limits:
-          cpus: '0.8'
-          memory: 640M
-        reservations:
-          cpus: '0.6'
-          memory: 480M
+      - kafka
 
   # IoT-Agent connects to the Scorpio Broker
   iot-agent:

docker-compose/stellio.yml

@@ -1,31 +1,5 @@
-version: '3.5'
+version: '3.9'
 services:
-  zookeeper:
-    image: confluentinc/cp-zookeeper:5.4.1
-    container_name: zookeeper
-    ports:
-      - 2181:2181
-    environment:
-      ZOOKEEPER_SERVER_ID: 1
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-
-  kafka:
-    image: confluentinc/cp-kafka:5.4.1
-    container_name: kafka
-    ports:
-      - 29092:29092
-    environment:
-      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9092,EXTERNAL://localhost:29092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_BROKER_ID: 1
-      KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    depends_on:
-      - zookeeper
-
   api-gateway:
     container_name: stellio-api-gateway
     hostname: stellio
@@ -38,6 +12,7 @@ services:
       - "${STELLIO_PORT}:8080"
 
   entity-service:
+    restart: always
     container_name: stellio-entity-service
     labels:
       org.fiware: 'tutorial'
@@ -48,8 +23,10 @@ services:
     ports:
       - 8082:8082
     depends_on:
-      - neo4j
-      - kafka
+      neo4j:
+        condition: service_healthy
+      kafka:
+        condition: service_started
 
   search-service:
     container_name: stellio-search-service
@@ -66,8 +43,10 @@ services:
     ports:
       - 8083:8083
     depends_on:
-      - postgres
-      - kafka
+      postgres:
+        condition: service_healthy
+      kafka:
+        condition: service_started
 
   subscription-service:
     container_name: stellio-subscription-service
@@ -84,12 +63,50 @@ services:
     ports:
       - 8084:8084
     depends_on:
-      - postgres
-      - kafka
+      postgres:
+        condition: service_healthy
+      kafka:
+        condition: service_started
+
+  zookeeper:
+    labels:
+      org.fiware: 'tutorial'
+    image: confluentinc/cp-zookeeper:5.5.7
+    container_name: zookeeper
+    ports:
+      - 2181:2181
+    restart: always
+    environment:
+      ZOOKEEPER_SERVER_ID: 1
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  kafka:
+    labels:
+      org.fiware: 'tutorial'
+    image: confluentinc/cp-kafka:5.5.7
+    container_name: kafka
+    ports:
+      - 29092:29092
+    restart: always
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9092,EXTERNAL://localhost:29092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_BROKER_ID: 1
+      KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+    depends_on:
+      - zookeeper
+
+
 
   # Databases
   neo4j:
-    image: neo4j:4.2
+    labels:
+      org.fiware: 'tutorial'
+    image: neo4j:4.4
     hostname: neo4j
     container_name: db-neo4j
     volumes:
@@ -103,6 +120,13 @@ services:
     ports:
       - 7474:7474
       - 7687:7687
+    # following https://github.com/neo4j/neo4j/issues/7203#issuecomment-898511474
+    healthcheck:
+      test: wget -qO- http://localhost:7474 || exit 1
+      interval: 1s
+      timeout: 10s
+      retries: 20
+      start_period: 3s
 
   postgres:
     labels:
@@ -118,7 +142,12 @@ services:
       - 5432:5432
     volumes:
       - postgres-db:/var/lib/postgresql/data
-
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 20
+      start_period: 10s
 
   # IoT-Agent connects to the Stellio Broker
   iot-agent:
@@ -134,7 +163,7 @@ services:
       - DUMMY_DEVICES_PORT=${TUTORIAL_DUMMY_DEVICE_PORT} # Port used by the dummy IOT devices to receive commands
       - DUMMY_DEVICES_TRANSPORT=HTTP # Default transport used by dummy Io devices
       - DUMMY_DEVICES_PAYLOAD=ULTRALIGHT
-      - CONTEXT_BROKER=http://api-gateway:${STELLIO_PORT}/ngsi-ld/v1 # URL of the context broker to update context
+      - CONTEXT_BROKER=http://stellio:${STELLIO_PORT}/ngsi-ld/v1 # URL of the context broker to update context
 
 volumes:
   neo4j-db: ~

services

@@ -6,7 +6,8 @@
 
 set -e
 
-SCORPIO="http://scorpio:9090/scorpio/v1/info/"
+STELLIO="http://stellio:8080/actuator/health"
+SCORPIO="http://scorpio:9090/scorpio/"
 ORION="http://orion:1026/version"
 CONTEXT="http://context/ngsi-context.jsonld"
 
@@ -17,7 +18,7 @@ fi
 
 if (( $# < 1 )); then
 	echo "Illegal number of parameters"
-	echo "usage: services [create|orion|scorpio|stop]"
+	echo "usage: services [create|orion|scorpio|stellio|stop]"
 	exit 1
 fi
 
@@ -58,13 +59,6 @@ waitForScorpio () {
 		pause 60
 		getHeartbeat "${SCORPIO}"
 	done
-	echo -e "\n⏳ Waiting for all \033[1;34mScorpio\033[0m services to be fully available\n"
-	while [ "$response" -eq 500 ]
-	do
-		echo -e "Context Broker HTTP state: ${response} (waiting for 200)"
-		pause 60
-		getHeartbeat "${SCORPIO}"
-	done
 }
 
 waitForStellio () {
@@ -220,9 +214,9 @@ addIoTDatabaseIndex () {
 command="$1"
 case "${command}" in
 	"help")
-        echo "usage: services [create|orion|scorpio|stop]"
+        echo "usage: services [create|orion|scorpio|stellio|stop]"
         ;;
-	 "orion")
+	"orion")
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
 		echo -e "Starting containers:  \033[1;34mOrion\033[0m, \033[1;36mIoT-Agent\033[0m, \033[1mTutorial\033[0m, a linked data \033[1mContext\033[0m and \033[1mMongoDB\033[0m databases."
@@ -253,6 +247,21 @@ case "${command}" in
 		displayServices
 		echo -e "Now open \033[4mhttp://localhost:3000/device/monitor\033[0m"
 		;;
+	"stellio")
+		export $(cat .env | grep "#" -v)
+		stoppingContainers
+		echo -e "Starting containers:  \033[1;34mStellio\033[0m, \033[1mKafka\033[0m, \033[1mZookeeper\033[0m and a \033[1mPostgres\033[0m database and a \033[1mNeo4J\033[0m database, \033[1;36mIoT-Agent\033[0m, \033[1mTutorial\033[0m, a linked data \033[1mContext\033[0m and \033[1mMongoDB\033[0m databases."
+		echo -e "- \033[1;Stellio\033[0m is the context broker"
+		echo ""
+		${dockerCmd} -f docker-compose/common.yml -f docker-compose/stellio.yml -p fiware up -d --remove-orphans --renew-anon-volumes
+		waitForMongo
+		addIoTDatabaseIndex
+		waitForContext
+		waitForStellio
+		loadData stellio:8080
+		displayServices
+		echo -e "Now open \033[4mhttp://localhost:3000/device/monitor\033[0m"
+		;;
 	"stop")
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
@@ -269,7 +278,7 @@ case "${command}" in
 		;;
 	*)
 		echo "Command not Found."
-		echo "usage: services [create|orion|scorpio|stop]"
+		echo "usage: services [create|orion|scorpio|stellio|stop]"
 		exit 127;
 		;;
 esac