diff --git a/docker-compose.yml b/docker-compose.yml index 6d9f0e7..c560222 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,8 @@ services: - ./mittaridatapumppu-endpoint:/home/app - ./fvhiot-python/fvhiot:/home/app/fvhiot environment: - DEVREG_ENDPOINTS_URL: "http://deviceregistry:8000/api/v1/hosts/localhost/" - DEVREG_API_TOKEN: "abcdef1234567890abcdef1234567890abcdef12" + ENDPOINT_CONFIG_URL: "http://deviceregistry:8000/api/v1/hosts/localhost/" + DEVICE_REGISTRY_TOKEN: "abcdef1234567890abcdef1234567890abcdef12" KAFKA_BOOTSTRAP_SERVERS: "kafka:9092" UVICORN_LOG_LEVEL: "debug" UVICORN_RELOAD: "true" @@ -27,7 +27,7 @@ services: parser-digita: image: ghcr.io/city-of-helsinki/mittaridatapumppu-parser:latest build: ./mittaridatapumppu-parser - container_name: parser-digita + container_name: parser depends_on: kafka: condition: service_healthy @@ -38,10 +38,9 @@ services: # Kafka client config KAFKA_BOOTSTRAP_SERVERS: "kafka:9092" KAFKA_GROUP_ID: "digita_dev" - KAFKA_PARSED_DATA_TOPIC_NAME: "digita.parseddata" - KAFKA_RAW_DATA_TOPIC_NAME: "digita.rawdata" # Parser config DEVICE_REGISTRY_URL: "http://deviceregistry:8000/api/v1" + DEVICE_REGISTRY_ENDPOINTS_URL: "http://deviceregistry:8000/api/v1/hosts/localhost/" DEVICE_REGISTRY_TOKEN: abcdef1234567890abcdef1234567890abcdef12 # Debug config DEBUG: 1 diff --git a/fvhiot-python b/fvhiot-python index 677797f..be6b33c 160000 --- a/fvhiot-python +++ b/fvhiot-python @@ -1 +1 @@ -Subproject commit 677797fa6e86a3d37b43cab53edb659418b7f256 +Subproject commit be6b33c40036a3884d9455455f25f294c2a3dd43 diff --git a/mittaridatapumppu-deviceregistry/devices/fixtures/endpoints.json b/mittaridatapumppu-deviceregistry/devices/fixtures/endpoints.json index b933384..4397c44 100644 --- a/mittaridatapumppu-deviceregistry/devices/fixtures/endpoints.json +++ b/mittaridatapumppu-deviceregistry/devices/fixtures/endpoints.json @@ -47,5 +47,23 @@ "kafka_parsed_data_topic": "digita.parsed", "kafka_group_id": "digita_dev" } +}, +{ + "model": "endpoints.endpoint", + "pk": 3, + "fields": { + "created_at": "2023-10-06T12:00:00.042Z", + "updated_at": "2023-10-06T12:00:00.042Z", + "host": 1, + "endpoint_path": "/api/v1/cesva", + "http_request_handler": "endpoints.sentilo.cesva", + "auth_token": "abc123", + "data_source": "sentilo.cesva.http", + "properties": null, + "allowed_ip_addresses": "", + "kafka_raw_data_topic": "cesva.rawdata", + "kafka_parsed_data_topic": "cesva.parsed", + "kafka_group_id": "cesva_dev" + } } ] diff --git a/mittaridatapumppu-endpoint b/mittaridatapumppu-endpoint index e71bd8f..11e23fe 160000 --- a/mittaridatapumppu-endpoint +++ b/mittaridatapumppu-endpoint @@ -1 +1 @@ -Subproject commit e71bd8f5a24d5ff8b5cd07cd4f67e5f5d15f20d8 +Subproject commit 11e23fe870c126af9b4db5a6eb22593f91799ee0 diff --git a/mittaridatapumppu-parser b/mittaridatapumppu-parser index 9510b50..3a14e18 160000 --- a/mittaridatapumppu-parser +++ b/mittaridatapumppu-parser @@ -1 +1 @@ -Subproject commit 9510b5071db9a59683d901796eb161bc066004a3 +Subproject commit 3a14e18ce1cee35b4b6dfa20e86b5ea74e160055