[DCAE-14] VES collector rebasing updates for 1.1.0

Change-Id: Iac6a52fcb644028420ffd607c46fd5bc9c65bf8c
Signed-off-by: Venkatesh Kumar, Vijay (vv770d) <vv770d@att.com>

1 files changed, 14 insertions, 24 deletions

diff --git a/etc/collector.properties b/etc/collector.properties
index a2f9d60..672a7fe 100644
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -20,8 +20,8 @@ collector.service.port=8080
 
 ## The secure port is required if header.authflag is set to 1 (true)
 ## Authentication is only supported via secure port
-#collector.service.secure.port=8443
-
+## When enabled - require valid keystore defined
+##collector.service.secure.port=8443
 
 ## The keystore must be setup per installation when secure port is configured
 collector.keystore.file.location=../etc/keystore
@@ -29,7 +29,8 @@ collector.keystore.passwordfile=./etc/passwordfile
 collector.keystore.alias=tomcat
 
 
-################################################################################# Processing
+###############################################################################
+## Processing
 ##
 ## If there's a problem that prevents the collector from processing alarms,
 ## it's normally better to apply back pressure to the caller than to try to
@@ -42,34 +43,23 @@ collector.keystore.alias=tomcat
 ## default no validation checkflag (-1)
 ## If enabled (1) - schemafile location must be specified
 collector.schema.checkflag=1
-collector.schema.file=./etc/CommonEventFormat_Vendors_v26.0.json
-
+collector.schema.file=./etc/CommonEventFormat_27.2.json
 
-## To be used when multiple streamid to be supported for later release  
-collector.dmaap.streamid=sec_measurement
-
-## Highland Park processor config is specified as a comma-delimited list of
-## files to load. Note that the "phase" is "collector". Also note that the
-## collector creates an input channel for the events passed via API.
-collector.hpprocessing=./etc/HPProcessingConfig.json
-#collector.hpprocessing=./etc/DmaapConfig.json
+## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  
+collector.dmaap.streamid=fault=sec_fault,roadm-sec-to-hp|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert
+collector.dmaapfile=./etc/DmaapConfig.json
 
 ## Custom ExceptionConfiguration
 exceptionConfig=./etc/ExceptionConfig.json
 
-## authflag enables/disables basic authentication by the collector
-## If enabled (1) - then authid/pwd has to be defined
-## Authid and pwd for validating incoming event header request via basic auth
-## For initial deploy - below static setting will be used
-## And can be updated via controller
+## authflag control authentication by the collector
+## If enabled (1) - then authlist has to be defined
+## When authflag is enabled, only secure port will be supported
+## To disable enter 0/-1
 header.authflag=0
-
-## Combintion of userid,base64 encoded pwd list to be supported
+## Combination of userid,base64 encoded pwd list to be supported
 ## userid and pwd comma separated; pipe delimitation between each pair
-header.authlist=secureid,IWRjYWVSb2FkbTEyMyEt|sample1,c2FtcGxlMQ==
-
-## To be used when multiple accounts to be supported for later release
-header.authstore=./etc/userstore
+header.authlist=secureid,IWRjYWVSb2FkbTEyMyEt|sample1,c2FtcGxlMQ==|vdnsagg,dmRuc2FnZw==
 
 ###############################################################################
 ##