Update Stellio

Author: jason-fox

.env

@@ -4,7 +4,7 @@ EXPOSED_PORT=1026
 
 # Orion variables
 ORION_LD_PORT=1026
-ORION_LD_VERSION=1.7.1
+ORION_LD_VERSION=1.8.0
 
 # Mintaka variables
 MINTAKA_PORT=8080
@@ -29,7 +29,7 @@ MONGO_DB_PORT=27017
 MONGO_DB_VERSION=6.0
 
 # IoT Agent Ultralight Variables
-ULTRALIGHT_VERSION=3.3.0-distroless
+ULTRALIGHT_VERSION=3.4.0-distroless
 IOTA_NORTH_PORT=4041
 IOTA_SOUTH_PORT=7896
 

README.ja.md

@@ -1003,8 +1003,8 @@ curl -L -X GET \
         "observedAt": "2021-09-16T15:24:15.781Z"
     },
     "category": {
-        "value": "sensor",
-        "type": "Property",
+        "vocab": "sensor",
+        "type": "VocabProperty",
         "observedAt": "2021-09-16T15:24:15.781Z"
     },
     "controlledProperty": {

README.md

@@ -988,8 +988,8 @@ attribute has also been added to the model.
         "observedAt": "2021-09-16T15:24:15.781Z"
     },
     "category": {
-        "value": "sensor",
-        "type": "Property",
+        "vocab": "sensor",
+        "type": "VocabProperty",
         "observedAt": "2021-09-16T15:24:15.781Z"
     },
     "controlledProperty": {

docker-compose/stellio.yml

@@ -4,17 +4,19 @@ services:
     hostname: stellio
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-api-gateway:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-api-gateway:${STELLIO_DOCKER_TAG}
     environment:
       - SPRING_PROFILES_ACTIVE=docker
     ports:
-      - ${EXPOSED_PORT:-1026}:${STELLIO_PORT:-9090}
+      - "${EXPOSED_PORT}:${STELLIO_PORT}"
+    networks:
+      - default
 
   search-service:
     container_name: stellio-search-service
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-search-service:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-search-service:${STELLIO_DOCKER_TAG}
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_search
@@ -28,10 +30,24 @@ services:
       - APPLICATION_TENANTS_1_NAME=openiot
       - APPLICATION_TENANTS_1_ISSUER=https://sso.stellio.io/auth/realms/openiot
       - APPLICATION_TENANTS_1_DBSCHEMA=openiot
+      - APPLICATION_TENANTS_2_NAME=farmer
+      - APPLICATION_TENANTS_2_ISSUER=https://sso.stellio.io/auth/realms/farmer
+      - APPLICATION_TENANTS_2_DBSCHEMA=farmer
+      - APPLICATION_TENANTS_3_NAME=vet
+      - APPLICATION_TENANTS_3_ISSUER=https://sso.stellio.io/auth/realms/vet
+      - APPLICATION_TENANTS_3_DBSCHEMA=vet
+      - APPLICATION_TENANTS_4_NAME=contractor
+      - APPLICATION_TENANTS_4_ISSUER=https://sso.stellio.io/auth/realms/contractor
+      - APPLICATION_TENANTS_4_DBSCHEMA=contractor
+      - APPLICATION_TENANTS_5_NAME=weather
+      - APPLICATION_TENANTS_5_ISSUER=https://sso.stellio.io/auth/realms/weather
+      - APPLICATION_TENANTS_5_DBSCHEMA=weather
       - APPLICATION_PAGINATION_LIMIT-DEFAULT=30
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8083:8083
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -43,7 +59,7 @@ services:
     container_name: stellio-subscription-service
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-subscription-service:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-subscription-service:${STELLIO_DOCKER_TAG}    
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_subscription
@@ -57,10 +73,24 @@ services:
       - APPLICATION_TENANTS_1_NAME=openiot
       - APPLICATION_TENANTS_1_ISSUER=https://sso.stellio.io/auth/realms/openiot
       - APPLICATION_TENANTS_1_DBSCHEMA=openiot
+      - APPLICATION_TENANTS_2_NAME=farmer
+      - APPLICATION_TENANTS_2_ISSUER=https://sso.stellio.io/auth/realms/farmer
+      - APPLICATION_TENANTS_2_DBSCHEMA=farmer
+      - APPLICATION_TENANTS_3_NAME=vet
+      - APPLICATION_TENANTS_3_ISSUER=https://sso.stellio.io/auth/realms/vet
+      - APPLICATION_TENANTS_3_DBSCHEMA=vet
+      - APPLICATION_TENANTS_4_NAME=contractor
+      - APPLICATION_TENANTS_4_ISSUER=https://sso.stellio.io/auth/realms/contractor
+      - APPLICATION_TENANTS_4_DBSCHEMA=contractor
+      - APPLICATION_TENANTS_5_NAME=weather
+      - APPLICATION_TENANTS_5_ISSUER=https://sso.stellio.io/auth/realms/weather
+      - APPLICATION_TENANTS_5_DBSCHEMA=weather
       - APPLICATION_PAGINATION_LIMIT-DEFAULT=30
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8085:8084
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -71,10 +101,12 @@ services:
   kafka:
     labels:
       org.fiware: 'tutorial'
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: kafka
     ports:
       - 29092:29092
+    networks:
+      - default
     restart: always
     environment:
       KAFKA_BROKER_ID: 1
@@ -88,17 +120,14 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
-    volumes:
-      - ./stellio/kafka/update_run.sh:/tmp/update_run.sh
-    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+      CLUSTER_ID: NjExODZhMWVjMzllMTFlZm
 
 
   # Databases
   postgres:
     labels:
       org.fiware: 'tutorial'
     image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS}
-
     hostname: postgres
     container_name: db-postgres
     environment:
@@ -109,6 +138,8 @@ services:
       - ACCEPT_TIMESCALE_TUNING=TRUE
     ports:
       - 5432:5432
+    networks:
+      - default
     volumes:
       - postgres-db:/var/lib/postgresql
     healthcheck:
@@ -118,7 +149,6 @@ services:
       retries: 20
       start_period: 10s
 
-
   farmer:
     environment:
       - CONTEXT_BROKER=http://stellio:${STELLIO_PORT}

docker-compose/stellio/kafka/update_run.sh

@@ -117,7 +117,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
   {
     "id": "urn:ngsi-ld:Building:farm001",
     "type": "Building",
-    "category": {"type": "Property", "value": ["farm"]},
+    "category": {"type": "VocabProperty", "vocab": ["farm"]},
     "address": {
         "type": "Property",
         "value": { "streetAddress": "Großer Stern 1", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -133,7 +133,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
   {
     "id": "urn:ngsi-ld:Building:barn002",
     "type": "Building",
-    "category": {"type": "Property", "value": ["barn"]},
+    "category": {"type": "VocabProperty", "vocab": ["barn"]},
     "address": {
         "type": "Property",
         "value": { "streetAddress": "Straße des 17. Juni", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -149,7 +149,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
   {
     "id": "urn:ngsi-ld:Building:tower003",
     "type": "Building",
-    "category": {"type": "Property", "value": ["water_tower"]},
+    "category": {"type": "VocabProperty", "vocab": ["water_tower"]},
     "address": {
         "type": "Property",
         "value": { "streetAddress": "John-Foster-Dulles-Allee", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -165,7 +165,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
   {
     "id": "urn:ngsi-ld:Building:farm002",
     "type": "Building",
-    "category": {"type": "Property", "value": ["farm"]},
+    "category": {"type": "VocabProperty", "vocab": ["farm"]},
     "address": {
         "type": "Property",
         "value": { "streetAddress": "Hardenbergplatz 8", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10787"},