Skip to content

Commit 5c16724

Browse files
jason-foxjason-fox
committed
Update Stellio.
1 parent 881144e commit 5c16724

File tree

6 files changed

+33
-41
lines changed

6 files changed

+33
-41
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ EXPOSED_PORT=1026
44

55
# Orion LD variables
66
ORION_LD_PORT=1026
7-
ORION_LD_VERSION=1.7.1
7+
ORION_LD_VERSION=1.8.0
88

99
# Scorpio variables
1010
SCORPIO_PORT=9090

‎README.ja.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,23 +230,23 @@ curl -X POST 'http://localhost:1026/ngsi-ld/v1/entityOperations/upsert' \
230230
"id": "urn:ngsi-ld:TemperatureSensor:001",
231231
"type": "TemperatureSensor",
232232
"description" : {"type": "Property", "value": "Temperature Gauge 1"},
233-
"category": {"type": "Property", "value": "sensor"},
233+
"category": {"type": "VocabProperty", "vocab": "sensor"},
234234
"controlledProperty" : {"type": "Property", "value": "temperature"},
235235
"temperature": {"type": "Property", "value": 20, "unitCode": "CEL"}
236236
},
237237
{
238238
"id": "urn:ngsi-ld:TemperatureSensor:002",
239239
"type": "TemperatureSensor",
240240
"description" : {"type": "Property", "value": "Temperature Gauge 2"},
241-
"category": {"type": "Property", "value": "sensor"},
241+
"category": {"type": "VocabProperty", "vocab": "sensor"},
242242
"controlledProperty" : {"type": "Property", "value": "temperature"},
243243
"temperature": {"type": "Property", "value": 21, "unitCode": "CEL"}
244244
},
245245
{
246246
"id": "urn:ngsi-ld:TemperatureSensor:003",
247247
"type": "TemperatureSensor",
248248
"description" : {"type": "Property", "value": "Temperature Gauge 3"},
249-
"category": {"type": "Property", "value": "sensor"},
249+
"category": {"type": "VocabProperty", "vocab": "sensor"},
250250
"controlledProperty" : {"type": "Property", "value": "temperature"},
251251
"temperature": {"type": "Property", "value": 27, "unitCode": "CEL"}
252252
}
@@ -266,23 +266,23 @@ curl -iX POST 'http://localhost:1026/ngsi-ld/v1/entityOperations/upsert' \
266266
"id": "urn:ngsi-ld:FillingLevelSensor:001",
267267
"type": "FillingLevelSensor",
268268
"description" : {"type": "Property", "value": "Filling Level Sensor 1"},
269-
"category": {"type": "Property", "value": "sensor"},
269+
"category": {"type": "VocabProperty", "vocab": "sensor"},
270270
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
271271
"fillingLevel": {"type": "Property", "value": 1, "unitCode": "C62"}
272272
},
273273
{
274274
"id": "urn:ngsi-ld:FillingLevelSensor:002",
275275
"type": "FillingLevelSensor",
276276
"description" : {"type": "Property", "value": "Filling Level Sensor 2"},
277-
"category": {"type": "Property", "value": "sensor"},
277+
"category": {"type": "VocabProperty", "vocab": "sensor"},
278278
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
279279
"fillingLevel": {"type": "Property", "value": 0.9, "unitCode": "C62"}
280280
},
281281
{
282282
"id": "urn:ngsi-ld:FillingLevelSensor:003",
283283
"type": "FillingLevelSensor",
284284
"description" : {"type": "Property", "value": "Filling Gauge 3"},
285-
"category": {"type": "Property", "value": "sensor"},
285+
"category": {"type": "VocabProperty", "vocab": "sensor"},
286286
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
287287
"fillingLevel": {"type": "Property", "value": 0.8, "unitCode": "C62"}
288288
}

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,23 +231,23 @@ curl -X POST 'http://localhost:1026/ngsi-ld/v1/entityOperations/upsert' \
231231
"id": "urn:ngsi-ld:TemperatureSensor:001",
232232
"type": "TemperatureSensor",
233233
"description" : {"type": "Property", "value": "Temperature Gauge 1"},
234-
"category": {"type": "Property", "value": "sensor"},
234+
"category": {"type": "VocabProperty", "vocab": "sensor"},
235235
"controlledProperty" : {"type": "Property", "value": "temperature"},
236236
"temperature": {"type": "Property", "value": 20, "unitCode": "CEL"}
237237
},
238238
{
239239
"id": "urn:ngsi-ld:TemperatureSensor:002",
240240
"type": "TemperatureSensor",
241241
"description" : {"type": "Property", "value": "Temperature Gauge 2"},
242-
"category": {"type": "Property", "value": "sensor"},
242+
"category": {"type": "VocabProperty", "vocab": "sensor"},
243243
"controlledProperty" : {"type": "Property", "value": "temperature"},
244244
"temperature": {"type": "Property", "value": 21, "unitCode": "CEL"}
245245
},
246246
{
247247
"id": "urn:ngsi-ld:TemperatureSensor:003",
248248
"type": "TemperatureSensor",
249249
"description" : {"type": "Property", "value": "Temperature Gauge 3"},
250-
"category": {"type": "Property", "value": "sensor"},
250+
"category": {"type": "VocabProperty", "vocab": "sensor"},
251251
"controlledProperty" : {"type": "Property", "value": "temperature"},
252252
"temperature": {"type": "Property", "value": 27, "unitCode": "CEL"}
253253
}
@@ -267,23 +267,23 @@ curl -iX POST 'http://localhost:1026/ngsi-ld/v1/entityOperations/upsert' \
267267
"id": "urn:ngsi-ld:FillingLevelSensor:001",
268268
"type": "FillingLevelSensor",
269269
"description" : {"type": "Property", "value": "Filling Level Sensor 1"},
270-
"category": {"type": "Property", "value": "sensor"},
270+
"category": {"type": "VocabProperty", "vocab": "sensor"},
271271
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
272272
"fillingLevel": {"type": "Property", "value": 1, "unitCode": "C62"}
273273
},
274274
{
275275
"id": "urn:ngsi-ld:FillingLevelSensor:002",
276276
"type": "FillingLevelSensor",
277277
"description" : {"type": "Property", "value": "Filling Level Sensor 2"},
278-
"category": {"type": "Property", "value": "sensor"},
278+
"category": {"type": "VocabProperty", "vocab": "sensor"},
279279
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
280280
"fillingLevel": {"type": "Property", "value": 0.9, "unitCode": "C62"}
281281
},
282282
{
283283
"id": "urn:ngsi-ld:FillingLevelSensor:003",
284284
"type": "FillingLevelSensor",
285285
"description" : {"type": "Property", "value": "Filling Gauge 3"},
286-
"category": {"type": "Property", "value": "sensor"},
286+
"category": {"type": "VocabProperty", "vocab": "sensor"},
287287
"controlledProperty" : {"type": "Property", "value": "fillingLevel"},
288288
"fillingLevel": {"type": "Property", "value": 0.8, "unitCode": "C62"}
289289
}

‎docker-compose/stellio.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ services:
44
hostname: stellio
55
labels:
66
org.fiware: 'tutorial'
7-
image: stellio/stellio-api-gateway:${STELLIO_DOCKER_TAG}
8-
platform: linux/amd64
7+
image: quay.io/fiware/stellio-api-gateway:${STELLIO_DOCKER_TAG}
98
environment:
109
- SPRING_PROFILES_ACTIVE=docker
1110
ports:
12-
- ${EXPOSED_PORT:-1026}:${STELLIO_PORT:-9090}
11+
- "${EXPOSED_PORT}:${STELLIO_PORT}"
12+
networks:
13+
- default
1314

1415
search-service:
1516
container_name: stellio-search-service
1617
labels:
1718
org.fiware: 'tutorial'
18-
image: stellio/stellio-search-service:${STELLIO_DOCKER_TAG}
19-
platform: linux/amd64
19+
image: quay.io/fiware/stellio-search-service:${STELLIO_DOCKER_TAG}
2020
environment:
2121
- SPRING_PROFILES_ACTIVE=docker
2222
- SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_search
@@ -34,6 +34,8 @@ services:
3434
- APPLICATION_PAGINATION_LIMIT-MAX=1000
3535
ports:
3636
- 8083:8083
37+
networks:
38+
- default
3739
restart: always
3840
depends_on:
3941
postgres:
@@ -45,8 +47,7 @@ services:
4547
container_name: stellio-subscription-service
4648
labels:
4749
org.fiware: 'tutorial'
48-
image: stellio/stellio-subscription-service:${STELLIO_DOCKER_TAG}
49-
platform: linux/amd64
50+
image: quay.io/fiware/stellio-subscription-service:${STELLIO_DOCKER_TAG}
5051
environment:
5152
- SPRING_PROFILES_ACTIVE=docker
5253
- SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_subscription
@@ -64,6 +65,8 @@ services:
6465
- APPLICATION_PAGINATION_LIMIT-MAX=1000
6566
ports:
6667
- 8085:8084
68+
networks:
69+
- default
6770
restart: always
6871
depends_on:
6972
postgres:
@@ -74,10 +77,12 @@ services:
7477
kafka:
7578
labels:
7679
org.fiware: 'tutorial'
77-
image: confluentinc/cp-kafka:7.3.1
80+
image: confluentinc/cp-kafka:7.6.0
7881
container_name: kafka
7982
ports:
8083
- 29092:29092
84+
networks:
85+
- default
8186
restart: always
8287
environment:
8388
KAFKA_BROKER_ID: 1
@@ -91,17 +96,14 @@ services:
9196
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
9297
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
9398
KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
94-
volumes:
95-
- ./stellio/kafka/update_run.sh:/tmp/update_run.sh
96-
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'"
99+
CLUSTER_ID: NjExODZhMWVjMzllMTFlZm
97100

98101

99102
# Databases
100103
postgres:
101104
labels:
102105
org.fiware: 'tutorial'
103106
image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS}
104-
105107
hostname: postgres
106108
container_name: db-postgres
107109
environment:
@@ -112,6 +114,8 @@ services:
112114
- ACCEPT_TIMESCALE_TUNING=TRUE
113115
ports:
114116
- 5432:5432
117+
networks:
118+
- default
115119
volumes:
116120
- postgres-db:/var/lib/postgresql
117121
healthcheck:
@@ -120,7 +124,6 @@ services:
120124
timeout: 5s
121125
retries: 20
122126
start_period: 10s
123-
124127
# Tutorial acts as a series of dummy IoT Sensors over HTTP and connects to the Stellio Broker
125128
tutorial:
126129
environment:

‎docker-compose/stellio/kafka/update_run.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎import-data‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
2121
{
2222
"id": "urn:ngsi-ld:Building:farm001",
2323
"type": "Building",
24-
"category": {"type": "Property", "value": ["farm"]},
24+
"category": {"type": "VocabProperty", "vocab": ["farm"]},
2525
"address": {
2626
"type": "Property",
2727
"value": { "streetAddress": "Großer Stern 1", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -49,7 +49,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
4949
{
5050
"id": "urn:ngsi-ld:Building:barn002",
5151
"type": "Building",
52-
"category": {"type": "Property", "value": ["barn"]},
52+
"category": {"type": "VocabProperty", "vocab": ["barn"]},
5353
"address": {
5454
"type": "Property",
5555
"value": { "streetAddress": "Straße des 17. Juni", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -77,7 +77,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
7777
{
7878
"id": "urn:ngsi-ld:Building:tower003",
7979
"type": "Building",
80-
"category": {"type": "Property", "value": ["water_tower"]},
80+
"category": {"type": "VocabProperty", "vocab": ["water_tower"]},
8181
"address": {
8282
"type": "Property",
8383
"value": { "streetAddress": "John-Foster-Dulles-Allee", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10557"},
@@ -93,7 +93,7 @@ curl -s -o /dev/null -X POST 'http://'"${CONTEXT_BROKER}"'/ngsi-ld/v1/entityOper
9393
{
9494
"id": "urn:ngsi-ld:Building:farm002",
9595
"type": "Building",
96-
"category": {"type": "Property", "value": ["farm"]},
96+
"category": {"type": "VocabProperty", "vocab": ["farm"]},
9797
"address": {
9898
"type": "Property",
9999
"value": { "streetAddress": "Hardenbergplatz 8", "addressRegion": "Berlin", "addressLocality": "Tiergarten", "postalCode": "10787"},

0 commit comments

Comments
 (0)