Add provision

.env

@@ -1,5 +1,8 @@
 # Docker: Environment variables in Compose
 
+## UI
+MF_UI_PORT=3000
+
 ## NginX
 MF_NGINX_HTTP_PORT=80
 MF_NGINX_SSL_PORT=443
@@ -12,9 +15,6 @@ MF_NATS_URL=nats://nats:4222
 ## Redis
 MF_REDIS_TCP_PORT=6379
 
-## UI
-MF_UI_PORT=3000
-
 ## Grafana
 MF_GRAFANA_PORT=3000
 
@@ -31,6 +31,8 @@ MF_JAEGER_URL=jaeger:6831
 MF_AUTHN_LOG_LEVEL=debug
 MF_AUTHN_HTTP_PORT=8189
 MF_AUTHN_GRPC_PORT=8181
+MF_AUTHN_GRPC_URL=authn:8181
+MF_AUTHN_GRPC_TIMEOUT=1s
 MF_AUTHN_DB_PORT=5432
 MF_AUTHN_DB_USER=mainflux
 MF_AUTHN_DB_PASS=mainflux
@@ -63,6 +65,8 @@ MF_THINGS_LOG_LEVEL=debug
 MF_THINGS_HTTP_PORT=8182
 MF_THINGS_AUTH_HTTP_PORT=8989
 MF_THINGS_AUTH_GRPC_PORT=8183
+MF_THINGS_AUTH_GRPC_URL=things:8183
+MF_THINGS_AUTH_GRPC_TIMEOUT=1s
 MF_THINGS_DB_PORT=5432
 MF_THINGS_DB_USER=mainflux
 MF_THINGS_DB_PASS=mainflux
@@ -72,23 +76,21 @@ MF_THINGS_ES_URL=localhost:6379
 MF_THINGS_ES_PASS=
 MF_THINGS_ES_DB=0
 
-### WS
-MF_WS_ADAPTER_LOG_LEVEL=debug
-MF_WS_ADAPTER_PORT=8186
-
 ### HTTP
 MF_HTTP_ADAPTER_PORT=8185
 
 ### MQTT
 MF_MQTT_ADAPTER_LOG_LEVEL=debug
-MF_MQTT_ADAPTER_PORT=1883
+MF_MQTT_ADAPTER_MQTT_PORT=1883
+MF_MQTT_BROKER_PORT=1883
 MF_MQTT_ADAPTER_WS_PORT=8080
+MF_MQTT_BROKER_WS_PORT=8080
 MF_MQTT_ADAPTER_ES_DB=0
 MF_MQTT_ADAPTER_ES_PASS=
 
-### CoAP
-MF_COAP_ADAPTER_LOG_LEVEL=debug
-MF_COAP_ADAPTER_PORT=5683
+### VERMEMQ
+MF_DOCKER_VERNEMQ_ALLOW_ANONYMOUS=on
+MF_DOCKER_VERNEMQ_LOG__CONSOLE__LEVEL=error
 
 ## Addons Services
 ### Bootstrap
@@ -100,6 +102,30 @@ MF_BOOTSTRAP_DB_PASS=mainflux
 MF_BOOTSTRAP_DB=bootstrap
 MF_BOOTSTRAP_DB_SSL_MODE=disable
 
+
+### Provision
+MF_PROVISION_CONFIG_FILE=/configs/config.toml
+MF_PROVISION_LOG_LEVEL=debug
+MF_PROVISION_HTTP_PORT=8190
+MF_PROVISION_ENV_CLIENTS_TLS=false
+MF_PROVISION_SERVER_CERT=
+MF_PROVISION_SERVER_KEY=
+MF_PROVISION_MQTT_URL=tcp://localhost
+MF_PROVISION_USERS_LOCATION=http://localhost:8180
+MF_PROVISION_THINGS_LOCATION=http://things:8182
+MF_PROVISION_USER=
+MF_PROVISION_PASS=
+MF_PROVISION_API_KEY=
+MF_PROVISION_CERTS_SVC_URL=http://certs:8204
+MF_PROVISION_X509_PROVISIONING=false
+MF_PROVISION_BS_SVC_URL=http://bootstrap:8202/things
+MF_PROVISION_BS_SVC_WHITELIST_URL=http://bootstrap:8202/things/state
+MF_PROVISION_BS_CONFIG_PROVISIONING=true
+MF_PROVISION_BS_AUTO_WHITELIST=true
+MF_PROVISION_BS_CONTENT=
+MF_PROVISION_CERTS_RSA_BITS=4096
+MF_PROVISION_CERTS_HOURS_VALID=2400h
+
 ### LoRa
 MF_LORA_ADAPTER_LOG_LEVEL=debug
 MF_LORA_ADAPTER_MESSAGES_URL=tcp://lora.mqtt.mainflux.io:1883
@@ -111,9 +137,6 @@ MF_LORA_ADAPTER_ROUTE_MAP_DB=0
 ### OPC-UA
 MF_OPCUA_ADAPTER_HTTP_PORT=8188
 MF_OPCUA_ADAPTER_LOG_LEVEL=debug
-MF_OPCUA_ADAPTER_SERVER_URI=opc.tcp://opcua.rocks:4840
-MF_OPCUA_ADAPTER_NODE_NAMESPACE=0
-MF_OPCUA_ADAPTER_NODE_IDENTIFIER=2256
 MF_OPCUA_ADAPTER_POLICY=
 MF_OPCUA_ADAPTER_MODE=
 MF_OPCUA_ADAPTER_CERT_FILE=
@@ -123,73 +146,44 @@ MF_OPCUA_ADAPTER_ROUTE_MAP_PASS=
 MF_OPCUA_ADAPTER_ROUTE_MAP_DB=0
 MF_OPCUA_ADAPTER_EVENT_CONSUMER=opcua
 
-### Cassandra Writer
-MF_CASSANDRA_WRITER_LOG_LEVEL=debug
-MF_CASSANDRA_WRITER_PORT=8902
-MF_CASSANDRA_WRITER_DB_PORT=9042
-MF_CASSANDRA_WRITER_DB_CLUSTER=mainflux-cassandra
-MF_CASSANDRA_WRITER_DB_KEYSPACE=mainflux
-
-### Cassandra Reader
-MF_CASSANDRA_READER_LOG_LEVEL=debug
-MF_CASSANDRA_READER_PORT=8903
-MF_CASSANDRA_READER_DB_PORT=9042
-MF_CASSANDRA_READER_DB_CLUSTER=mainflux-cassandra
-MF_CASSANDRA_READER_DB_KEYSPACE=mainflux
-
 ### InfluxDB Writer
 MF_INFLUX_WRITER_LOG_LEVEL=debug
 MF_INFLUX_WRITER_PORT=8900
 MF_INFLUX_WRITER_BATCH_SIZE=5000
 MF_INFLUX_WRITER_BATCH_TIMEOUT=5
 MF_INFLUX_WRITER_DB_PORT=8086
-MF_INFLUX_WRITER_DB_NAME=mainflux
 MF_INFLUX_WRITER_DB_USER=mainflux
 MF_INFLUX_WRITER_DB_PASS=mainflux
+MF_INFLUX_WRITER_DB=mainflux
 MF_INFLUX_WRITER_GRAFANA_PORT=3001
+MF_INFLUX_WRITER_CONTENT_TYPE=application/senml+json
 
 ### InfluxDB Reader
 MF_INFLUX_READER_LOG_LEVEL=debug
 MF_INFLUX_READER_PORT=8905
-MF_INFLUX_READER_DB_NAME=mainflux
 MF_INFLUX_READER_DB_PORT=8086
 MF_INFLUX_READER_DB_USER=mainflux
 MF_INFLUX_READER_DB_PASS=mainflux
-
-### MongoDB Writer
-MF_MONGO_WRITER_LOG_LEVEL=debug
-MF_MONGO_WRITER_PORT=8901
-MF_MONGO_WRITER_DB_NAME=mainflux
-MF_MONGO_WRITER_DB_PORT=27017
-
-### MongoDB Reader
-MF_MONGO_READER_LOG_LEVEL=debug
-MF_MONGO_READER_PORT=8904
-MF_MONGO_READER_DB_NAME=mainflux
-MF_MONGO_READER_DB_PORT=27017
-
-### Postgres Writer
-MF_POSTGRES_WRITER_LOG_LEVEL=debug
-MF_POSTGRES_WRITER_PORT=9104
-MF_POSTGRES_WRITER_DB_PORT=5432
-MF_POSTGRES_WRITER_DB_USER=mainflux
-MF_POSTGRES_WRITER_DB_PASS=mainflux
-MF_POSTGRES_WRITER_DB_NAME=messages
-MF_POSTGRES_WRITER_DB_SSL_MODE=disable
-MF_POSTGRES_WRITER_DB_SSL_CERT=""
-MF_POSTGRES_WRITER_DB_SSL_KEY=""
-MF_POSTGRES_WRITER_DB_SSL_ROOT_CERT=""
-
-### Postgres Reader
-MF_POSTGRES_READER_LOG_LEVEL=debug
-MF_POSTGRES_READER_PORT=9204
-MF_POSTGRES_READER_CLIENT_TLS=false
-MF_POSTGRES_READER_CA_CERTS=""
-MF_POSTGRES_READER_DB_PORT=5432
-MF_POSTGRES_READER_DB_USER=mainflux
-MF_POSTGRES_READER_DB_PASS=mainflux
-MF_POSTGRES_READER_DB_NAME=messages
-MF_POSTGRES_READER_DB_SSL_MODE=disable
-MF_POSTGRES_READER_DB_SSL_CERT=""
-MF_POSTGRES_READER_DB_SSL_KEY=""
-MF_POSTGRES_READER_DB_SSL_ROOT_CERT=""
+MF_INFLUX_READER_DB=mainflux
+MF_INFLUX_READER_SERVER_CERT=
+MF_INFLUX_READER_SERVER_KEY=
+
+
+
+# Twins
+MF_TWINS_LOG_LEVEL=debug
+MF_TWINS_HTTP_PORT=9021
+MF_TWINS_SERVER_CERT=""
+MF_TWINS_SERVER_KEY=""
+MF_TWINS_DB=mainflux-twins
+MF_TWINS_DB_HOST=twins-db
+MF_TWINS_DB_PORT=27018
+MF_TWINS_SINGLE_USER_EMAIL=""
+MF_TWINS_SINGLE_USER_TOKEN=""
+MF_TWINS_CLIENT_TLS=""
+MF_TWINS_CA_CERTS=""
+MF_TWINS_MQTT_URL=tcp://mqtt-adapter:1883
+MF_TWINS_CHANNEL_ID=""
+MF_TWINS_CACHE_URL=localhost:6379
+MF_TWINS_CACHE_PASS=""
+MF_TWINS_CACHE_DB=0

Makefile

@@ -2,7 +2,10 @@ ui:
 	docker build --tag=mainflux/ui -f docker/Dockerfile .
 
 run:
-	docker-compose -f docker/docker-compose.yml -f docker/aedes.yml up
+	docker-compose -f docker/docker-compose.yml up
+
+clean:
+	docker-compose -f docker/docker-compose.yml down --rmi all -v --remove-orphans
 
 release:
 	$(eval version = $(shell git describe --abbrev=0 --tags))

README.md

@@ -1,23 +1,31 @@
 # Mainflux IoT Admin UI based on Angular 8+ and <a href="https://github.com/akveo/nebular">Nebular</a>
 
-![dashboard][dashboard]
-
-![things][things]
-
-![details][details]
-
 ## Install
+Build Docker image:
+```
+make ui
+```
+
+Run docker-compose:
+```
+make run
+```
 
+Run angular-cli:
 ```
 cd ui
 npm install
 npm start
 ```
 
-Make UI Docker:
-```
-make docker_ui
-```
+##
+![dashboard][dashboard]
+
+##
+![things][things]
+
+##
+![details][details]
 
 [dashboard]: https://github.com/mainflux/docs/blob/master/docs/img/ui/dashboard.png
 [things]: https://github.com/mainflux/docs/blob/master/docs/img/ui/things.png

docker/configs/config.toml

@@ -0,0 +1,78 @@
+[bootstrap]
+  [bootstrap.content]
+    [bootstrap.content.agent.edgex]
+      url = "http://localhost:48090/api/v1/"
+
+    [bootstrap.content.agent.log]
+      level = "info"
+
+    [bootstrap.content.agent.mqtt]
+      mtls = false
+      qos = 0
+      retain = false
+      skip_tls_ver = true
+      url = "localhost:1883"
+
+    [bootstrap.content.agent.server]
+      nats_url = "localhost:4222"
+      port = "9000"
+
+    [bootstrap.content.agent.heartbeat]
+      interval = "30s"
+
+    [bootstrap.content.agent.terminal]
+      session_timeout = "30s"
+
+
+    [bootstrap.content.export.exp]
+      log_level = "debug"
+      nats = "nats://localhost:4222"
+      port = "8172"
+      cache_url = "localhost:6379"
+      cache_pass = ""
+      cache_db = "0"
+
+    [bootstrap.content.export.mqtt]
+      ca_path = "ca.crt"
+      cert_path = "thing.crt"
+      channel = ""
+      host = "tcp://localhost:1883"
+      mtls = false
+      password = ""
+      priv_key_path = "thing.key"
+      qos = 0
+      retain = false
+      skip_tls_ver = false
+      username = ""
+
+    [[bootstrap.content.export.routes]]
+      mqtt_topic = ""
+      nats_topic = "channels"
+      subtopic = ""
+      type = "mfx"
+      workers = 10
+
+    [[bootstrap.content.export.routes]]
+      mqtt_topic = ""
+      nats_topic = "export"
+      subtopic = ""
+      type = "default"
+      workers = 10
+
+[[things]]
+  name = "thing"
+
+  [things.metadata]
+    external_id = "xxxxxx"
+
+[[channels]]
+  name = "control-channel"
+
+  [channels.metadata]
+    type = "control"
+
+[[channels]]
+  name = "data-channel"
+
+  [channels.metadata]
+    type = "data"