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 (Mongo-DB).postman_collection.json

@@ -136,7 +136,7 @@ Enabler の組み合わせを使用して、履歴コンテキスト・データ
 このチュートリアルの目的のために、一連のダミー IoT デバイスが作成され、Context
 Broker に接続されます。使用しているアーキテクチャとプロトコルの詳細は
 、[IoT Sensors チュートリアル](https://github.com/FIWARE/tutorials.IoT-Sensors/tree/NGSI-v2)に
-あります。各デバイスの状態は、次の UltraLight デバイス・モニタの Web ページで確
+あります。各デバイスの状態は、次の JSON デバイス・モニタの Web ページで確
 認できます : `http://localhost:3000/device/monitor`
 
 ![FIWARE Monitor](https://fiware.github.io/tutorials.Short-Term-History/img/device-monitor.png)

README.ja.md

@@ -94,8 +94,6 @@ services:
       - IOTA_DEFAULT_RESOURCE=/iot/json
       - IOTA_AMQP_DISABLED=true
       - IOTA_MQTT_DISABLED=true
-    healthcheck:
-      interval: 5s
 
 
   # Tutorial acts as a series of dummy IoT Sensors over HTTP
@@ -127,7 +125,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/cygnus-sth-comet.yml

@@ -87,8 +87,6 @@ services:
       - IOTA_DEFAULT_RESOURCE=/iot/json
       - IOTA_AMQP_DISABLED=true
       - IOTA_MQTT_DISABLED=true
-    healthcheck:
-      interval: 5s
 
 
   # Tutorial acts as a series of dummy IoT Sensors over HTTP
@@ -120,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/sth-comet.yml

@@ -14,7 +14,7 @@ printf "⏳ Provisioning IoT devices "
 
 
 #
-# Create a service groups for all UltraLight IoT devices
+# Create a service groups for all JSON IoT devices
 #
 
 curl -s -o /dev/null -X POST \

provision-devices

@@ -105,8 +105,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