Authentication enhancement doc consul

Add dynami config description in README

Change-Id: I1b5c56bd07ce64993bc23ecb4bf26ccd03ca3405
Issue-ID: DCAEGEN2-1101
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>

diff --git a/README.md b/README.md
index 2193d3e..a87fda4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -95,6 +95,17 @@ VESCollector in DCAE will be deployed as mS via DCAEGEN2 controller. A blueprint
 For testing purpose, the docker image includes preset configuration which can be ran without DCAEGEN2 platform.
 
 
+
+### Consul - Dynamic configuration 
+
+
+Application properties like /etc/collector.properties and Dmaap configuration /etc/DmaapConfig.json are updated frequently by configuration stored in Consul(CBS) http://<kubernetes_host_ip>:30270/ui/#/dc1/kv/<vescollector_SCN> 
+Configuration stored in Consul have bigger priority and always will override local configuration so all configuration modification should be done using Consul update on corresponding kv store. 
+Frequently how often configuration will be fetch from Consul server is manageable in /etc/collector.properties property "collector.dynamic.config.update.frequency={time in minutes}".
+
+Sample configuration of VESCollector K-V store can be found under /dpo/data-formats/ConsulConfig.json
+
+
 ### Testing
 
 For R1 as only measurement and faults are expected in ONAP, configuration are preset currently sto support these two topics only.

diff --git a/dpo/data-formats/ConsulConfig.json b/dpo/data-formats/ConsulConfig.json
new file mode 100644 (file)
index 0000000..ea65522
--- /dev/null
+++ b/dpo/data-formats/ConsulConfig.json
@@ -0,0 +1,53 @@
+{
+  "collector.dynamic.config.update.frequency": "5",
+  "event.transform.flag": "0",
+  "collector.schema.checkflag": "1",
+  "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration",
+  "collector.service.port": "8080",
+  "collector.schema.file": "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.0.1.json\"}",
+  "collector.keystore.passwordfile": "/opt/app/VESCollector/etc/passwordfile",
+  "collector.inputQueue.maxPending": "8096",
+  "streams_publishes": {
+    "ves-measurement": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT/"
+      }
+    },
+    "ves-fault": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.SEC_FAULT_OUTPUT/"
+      }
+    },
+    "ves-pnfRegistration": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.VES_PNFREG_OUTPUT/"
+      }
+    },
+    "ves-other": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.SEC_OTHER_OUTPUT/"
+      }
+    },
+    "ves-heartbeat": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/"
+      }
+    },
+    "ves-notification": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/"
+      }
+    }
+  },
+  "collector.service.secure.port": "8443",
+  "auth.method": "noAuth",
+  "collector.keystore.file.location": "/opt/app/VESCollector/etc/keystore",
+  "services_calls": [],
+  "header.authlist": "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6"
+}