Switch to JSON IoT Agent

Author: jason-fox

.gitpod.yml

@@ -20,7 +20,7 @@ ports:
     port: 4041
     onOpen: ignore
   - name: IoT Agent (South Port)
-    description: Ultralight HTTP measures
+    description: JSON HTTP measures
     port: 7896
     onOpen: ignore
   - name: MongoDB

FIWARE Querying Time Series Data (QuantumLeap).postman_collection.json

@@ -81,15 +81,14 @@ services:
       - IOTA_LOG_LEVEL=INFO # The log level of the IoT Agent
       - IOTA_TIMESTAMP=true # Supply timestamp information with each measurement
       - IOTA_CB_NGSI_VERSION=v2 # use NGSIv2 when sending updates for active attributes
-      - IOTA_AUTOCAST=true # Ensure Ultralight number values are read as numbers not strings
+      - IOTA_AUTOCAST=true # Ensure JSON number values are read as numbers not strings
       - IOTA_MONGO_URI=mongodb://mongo-db:${MONGO_DB_PORT}/iotagentjson # The name of the database used in mongoDB
       - IOTA_HTTP_PORT=${IOTA_SOUTH_PORT} # The port used for device traffic over HTTP
       - IOTA_PROVIDER_URL=http://iot-agent:${IOTA_NORTH_PORT}
+      - IOTA_DEFAULT_RESOURCE=/iot/json
       - IOTA_MULTI_CORE=true
       - IOTA_AMQP_DISABLED=true
       - IOTA_MQTT_DISABLED=true
-    healthcheck:
-      interval: 5s
 
 
   # Tutorial acts as a series of dummy IoT Sensors over HTTP
@@ -119,7 +118,6 @@ services:
       - "WEB_APP_PORT=${TUTORIAL_APP_PORT}" # Port used by the content provider proxy and web-app for viewing data
       - "IOTA_HTTP_HOST=iot-agent"
       - "IOTA_HTTP_PORT=${IOTA_SOUTH_PORT}"
-      - "IOTA_DEFAULT_RESOURCE=/iot/json"
       - "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=JSON"

docker-compose.yml

@@ -119,7 +119,7 @@ curl -s -o /dev/null -X POST \
 #
 
 curl -s -o /dev/null -X POST \
-  "http://iot-agent:$IOTA_NORTH_PORT/iot/jsonevices" \
+  "http://iot-agent:$IOTA_NORTH_PORT/iot/devices" \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
   -H 'fiware-servicepath: /' \
@@ -149,7 +149,7 @@ curl -s -o /dev/null -X POST \
       "entity_name": "Door:001",
       "entity_type": "Door",
       "apikey":      "3089326",
-      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/jsonoor001"'",
+      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/door001"'",
       "static_attributes": [
           {"name": "refStore", "type": "Relationship","value": "urn:ngsi-ld:Store:001"}
        ]
@@ -180,7 +180,7 @@ curl -s -o /dev/null -X POST \
 #
 
 curl -s -o /dev/null -X POST \
-  "http://iot-agent:$IOTA_NORTH_PORT/iot/jsonevices" \
+  "http://iot-agent:$IOTA_NORTH_PORT/iot/devices" \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
   -H 'fiware-servicepath: /' \
@@ -210,7 +210,7 @@ curl -s -o /dev/null -X POST \
       "entity_name": "Door:002",
       "entity_type": "Door",
       "apikey":      "3089326",
-      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/jsonoor002"'",
+      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/door002"'",
       "static_attributes": [
         {"name": "refStore", "type": "Relationship","value": "urn:ngsi-ld:Store:002"}
       ]
@@ -244,7 +244,7 @@ curl -s -o /dev/null -X POST \
 #
 
 curl -s -o /dev/null -X POST \
-  "http://iot-agent:$IOTA_NORTH_PORT/iot/jsonevices" \
+  "http://iot-agent:$IOTA_NORTH_PORT/iot/devices" \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
   -H 'fiware-servicepath: /' \
@@ -274,7 +274,7 @@ curl -s -o /dev/null -X POST \
       "entity_name": "Door:003",
       "entity_type": "Door",
       "apikey":      "3089326",
-      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/jsonoor003"'",
+      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/door003"'",
       "static_attributes": [
         {"name": "refStore", "type": "Relationship","value": "urn:ngsi-ld:Store:003"}
       ]
@@ -307,7 +307,7 @@ curl -s -o /dev/null -X POST \
 #
 
 curl -s -o /dev/null -X POST \
-  "http://iot-agent:$IOTA_NORTH_PORT/iot/jsonevices" \
+  "http://iot-agent:$IOTA_NORTH_PORT/iot/devices" \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
   -H 'fiware-servicepath: /' \
@@ -337,7 +337,7 @@ curl -s -o /dev/null -X POST \
       "entity_name": "Door:004",
       "entity_type": "Door",
       "apikey":      "3089326",
-      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/jsonoor004"'",
+      "endpoint": "'"http://iot-sensors:$TUTORIAL_DUMMY_DEVICE_PORT/iot/door004"'",
       "static_attributes": [
         {"name": "refStore", "type": "Relationship","value": "urn:ngsi-ld:Store:004"}
       ]

provision-devices

@@ -112,8 +112,7 @@ waitForOrion () {
 
 waitForIoTAgent () {
 	echo -e "\n⏳ Waiting for \033[1;36mIoT-Agent\033[0m to be available\n"
-	while ! [ `docker inspect --format='{{.State.Health.Status}}' fiware-iot-agent` == "healthy" ]
-
+	while [ `curl -s -o /dev/null -w %{http_code} 'http://localhost:4041/version'` != "200" ]
 	do 
 	  echo -e "IoT Agent HTTP state: " `curl -s -o /dev/null -w %{http_code} 'http://localhost:4041/version'` " (waiting for 200)"
 	  sleep 1
@@ -134,7 +133,7 @@ case "${command}" in
 		echo -e "- \033[1;34mOrion\033[0m is the context broker"
 		echo -e "- \033[1;34mQuantumLeap\033[0m will write to CrateDB"
 		echo -e "- \033[1mGrafana\033[0m will read from CrateDB"
-		echo -e "- \033[1;36mIoT-Agent\033[0m is configured for the UltraLight Protocol"
+		echo -e "- \033[1;36mIoT-Agent\033[0m is configured for the JSON Protocol"
 		echo -e "- \033[1mTutorial\033[0m acts as a series of dummy IoT Sensors over HTTP"
 		echo ""
 		${dockerCmd} up -d --remove-orphans