From 0c95c0daf04e3edc8f66bd50293c7a358f3ecab0 Mon Sep 17 00:00:00 2001 From: anmunoz Date: Mon, 7 Mar 2022 00:44:12 +0100 Subject: [PATCH] Update docker-compose for quick start and documentation --- docs/processors_catalogue/ngsi_ckan_sink.md | 38 +++++++++---------- .../upadate_ckan_metadata.md | 22 +++++------ docs/quick_start_guide.md | 4 +- nifi-ngsi-resources/docker-compose.yml | 6 ++- nifi-ngsi-resources/docker/docker-compose.yml | 6 ++- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/docs/processors_catalogue/ngsi_ckan_sink.md b/docs/processors_catalogue/ngsi_ckan_sink.md index b8320112..40a6a1b1 100644 --- a/docs/processors_catalogue/ngsi_ckan_sink.md +++ b/docs/processors_catalogue/ngsi_ckan_sink.md @@ -1,25 +1,25 @@ # NGSIToCKAN Content: -* [Functionality](#section1) - * [Mapping NGSI-LD events to `NGSI-LDEvent` objects](#section1.1) - * [Mapping `NGSI-LDEvents` to CKAN data structures](#section1.2) - * [Organizations naming conventions](#section1.2.1) - * [Package/dataset naming conventions](#section1.2.2) - * [Resource naming conventions](#section1.2.3) - * [Column-like storing](#section1.2.4) - * [Example](#section1.3) - * [NGSI-LDEvent](#section1.3.1) - * [Organization, dataset and resource names](#section1.3.2) - * [Column-like storing](#section1.3.3) -* [Administration guide](#section2) - * [Configuration](#section2.1) - * [Use cases](#section2.2) - * [Important notes](#section2.3) - * [About the persistence mode](#section2.3.1) - * [About the encoding](#section2.3.3) -* [Programmers guide](#section3) - * [`NGSICKANSink` class](#section3.1) +- [Functionality](#section1) + - [Mapping NGSI-LD events to `NGSI-LDEvent` objects](#section1.1) + - [Mapping `NGSI-LDEvents` to CKAN data structures](#section1.2) + - [Organizations naming conventions](#section1.2.1) + - [Package/dataset naming conventions](#section1.2.2) + - [Resource naming conventions](#section1.2.3) + - [Column-like storing](#section1.2.4) + - [Example](#section1.3) + - [NGSI-LDEvent](#section1.3.1) + - [Organization, dataset and resource names](#section1.3.2) + - [Column-like storing](#section1.3.3) +- [Administration guide](#section2) + - [Configuration](#section2.1) + - [Use cases](#section2.2) + - [Important notes](#section2.3) + - [About the persistence mode](#section2.3.1) + - [About the encoding](#section2.3.3) +- [Programmers guide](#section3) + - [`NGSICKANSink` class](#section3.1) ## Functionality `NGSIToCKAN`, is a processor designed to persist NGSI-LD-like context data events within a [CKAN](http://ckan.org/) server.Usually, such a context data is notified by a diff --git a/docs/processors_catalogue/upadate_ckan_metadata.md b/docs/processors_catalogue/upadate_ckan_metadata.md index 39c196f0..b6fd3227 100644 --- a/docs/processors_catalogue/upadate_ckan_metadata.md +++ b/docs/processors_catalogue/upadate_ckan_metadata.md @@ -1,17 +1,17 @@ # UpdateCKANMetadata Content: -* [Functionality](#section1) -* [Mapping NGSI-LD events to `NGSI-LDEvent` objects](#section1.1) -* [Mapping `NGSI-LDEvents` to DCAT-AP Metadata into CKAN data structures](#section1.2) - * [DCAT-AP Metadata tags for Organizations](#section1.2.1) - * [DCAT-AP Metadata tags for Packages/Datasets](#section1.2.2) - * [DCAT-AP Metadata tags for Resources](#section1.2.3) -* [Administration guide](#section2) - * [Configuration](#section2.1) -* [Use cases](#section2.2) -* [Programmers guide](#section3) - * [`UpdateCKANMetadata` class](#section3.1) +- [Functionality](#section1) +- [Mapping NGSI-LD events to `NGSI-LDEvent` objects](#section1.1) +- [Mapping `NGSI-LDEvents` to DCAT-AP Metadata into CKAN data structures](#section1.2) + - [DCAT-AP Metadata tags for Organizations](#section1.2.1) + - [DCAT-AP Metadata tags for Packages/Datasets](#section1.2.2) + - [DCAT-AP Metadata tags for Resources](#section1.2.3) +- [Administration guide](#section2) + - [Configuration](#section2.1) +- [Use cases](#section2.2) +- [Programmers guide](#section3) + - [`UpdateCKANMetadata` class](#section3.1) ## Functionality `UpdateCKANMetadata`, is a processor designed to add additional metadata to an incoming flowfile or NGSI-LD event. This processor was designed to include all the metadata fields needed for complying with [DCAT-AP v2.0.1](https://joinup.ec.europa.eu/collection/semantic-interoperability-community-semic/news/dcat-ap-release-201) diff --git a/docs/quick_start_guide.md b/docs/quick_start_guide.md index d9df7dfe..af63dc43 100644 --- a/docs/quick_start_guide.md +++ b/docs/quick_start_guide.md @@ -61,7 +61,9 @@ mysql latest 273a1eca2d3a 2 weeks ago (2) Once you have your containers up and running, you can add the template provided for persisting data to MySQL. -First, go to your browser and open Draco using this URL `http://localhost:9090/nifi` +First, go to your browser and open Draco using this URL `https://localhost:9090/nifi/` using the following credentials in the login page: +- `user: admin` +- `password: pass1234567890` The next image provides you the location of many components of Draco. Please put special attention to the template button, play button and processor component, you will use them later. diff --git a/nifi-ngsi-resources/docker-compose.yml b/nifi-ngsi-resources/docker-compose.yml index e75b7e72..959f62dc 100644 --- a/nifi-ngsi-resources/docker-compose.yml +++ b/nifi-ngsi-resources/docker-compose.yml @@ -1,10 +1,12 @@ version: '3.1' services: draco: - image: ging/fiware-draco:1.3.6 + image: ging/fiware-draco:2.1.0 container_name: draco environment: - - NIFI_WEB_HTTP_PORT=9090 + - NIFI_WEB_HTTPS_PORT=9090 + - SINGLE_USER_CREDENTIALS_USERNAME=admin + - SINGLE_USER_CREDENTIALS_PASSWORD=pass1234567890 ports: - "9090:9090" - "5050:5050" diff --git a/nifi-ngsi-resources/docker/docker-compose.yml b/nifi-ngsi-resources/docker/docker-compose.yml index 760fd1c7..9446f2b6 100644 --- a/nifi-ngsi-resources/docker/docker-compose.yml +++ b/nifi-ngsi-resources/docker/docker-compose.yml @@ -1,10 +1,12 @@ version: '3.1' services: draco: - image: ging/fiware-draco + image: ging/fiware-draco:2.1.0 container_name: draco environment: - - NIFI_WEB_HTTP_PORT=9090 + - NIFI_WEB_HTTPS_PORT=9090 + - SINGLE_USER_CREDENTIALS_USERNAME=admin + - SINGLE_USER_CREDENTIALS_PASSWORD=pass1234567890 ports: - "9090:9090" - "5050:5050"