Updating forwarder and baseline data

.env

@@ -8,7 +8,7 @@ ORION_VERSION=3.8.1
 
 # Orion variables
 ORION_LD_PORT=1026
-ORION_LD_VERSION=1.6.0-pre-1596
+ORION_LD_VERSION=1.6.0-pre-1615
 
 # Scorpio variables
 SCORPIO_PORT=9090

docker-compose/common.yml

@@ -140,24 +140,24 @@ services:
     labels:
       org.fiware: 'tutorial'
     image: quay.io/fiware/tutorials.forwarder
-    hostname: 'farmer'
+    hostname: 'openiot'
     container_name: cb-devices
     ports:
       - 1028:80
     environment:
       - TENANT=openiot
       - DEBUG=broker:*
 
-  labourer:
+  contractor:
     labels:
       org.fiware: 'tutorial'
     image: quay.io/fiware/tutorials.forwarder
-    hostname: 'labourer'
-    container_name: cb-labourer
+    hostname: 'contractor'
+    container_name: cb-contractor
     ports:
       - 1029:80
     environment:
-      - TENANT=labourer
+      - TENANT=contractor
       - DEBUG=broker:*
 
   vet:

docker-compose/orion-ld.yml

@@ -31,10 +31,10 @@ services:
       - default
     ports:
       - ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026}
-    command: -dbhost mongo-db -logLevel DEBUG -forwarding -experimental -wip entityMaps
+    command: -dbhost mongo-db -logLevel INFO -forwarding -experimental -wip entityMaps
     healthcheck:
       test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1
-      interval: 5s
+      interval: 30s
 
   # Tutorial connects to the Orion-LD Broker
   tutorial:
@@ -49,7 +49,7 @@ services:
   farmer:
     environment:
       - CONTEXT_BROKER=http://orion:${ORION_LD_PORT}
-  labourer:
+  contractor:
     environment:
       - CONTEXT_BROKER=http://orion:${ORION_LD_PORT}
   vet:

docker-compose/scorpio.yml

@@ -53,7 +53,7 @@ services:
   farmer:
     environment:
       - CONTEXT_BROKER=http://scorpio:${SCORPIO_PORT}
-  labourer:
+  contractor:
     environment:
       - CONTEXT_BROKER=http://scorpio:${SCORPIO_PORT}
   vet:

import-data

@@ -560,6 +560,14 @@ curl -s -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOperations/upsert
       "type": "VocabularyProperty", "vocab": "noStatus",
       "observedAt": "2024-02-02T15:00:00.000Z"
     }
+  },
+  {
+    "id": "urn:ngsi-ld:Animal:cow001",
+    "type": "Animal",
+    "comment": {
+      "type": "Property", "value": "Please check hooves.",
+      "observedAt": "2024-01-01T15:00:00.000Z"
+    }
   }
 ]'