Change VES measurement MR topic

Issue-ID: DCAEGEN2-501
Change-Id: I5b70f5153613db321a44061e4ca88e437d8c2921
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/blueprints/k8s-tca-policy.yaml-template b/blueprints/k8s-tca-policy.yaml-template
index 6f3cb2c..bb161c3 100644 (file)
--- a/blueprints/k8s-tca-policy.yaml-template
+++ b/blueprints/k8s-tca-policy.yaml-template
@@ -134,7 +134,7 @@ node_templates:
                 subscriberPollingInterval: '30000'
                 subscriberProtocol: http
                 subscriberTimeoutMS: '-1'
-                subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
+                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
                 tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
         service_component_type: dcaegen2-analytics_tca
     interfaces:
@@ -147,7 +147,7 @@ node_templates:
                 DMAAPPORT:
                     { get_input: dmaap_port }
                 DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
-                DMAAPSUBTOPIC: "unauthenticated.SEC_MEASUREMENT_OUTPUT"
+                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
                 AAIHOST:
                     { get_input: aaiEnrichmentHost }
                 AAIPORT:

diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template
index 8c0dede..09debd2 100644 (file)
--- a/blueprints/k8s-tca.yaml-template
+++ b/blueprints/k8s-tca.yaml-template
@@ -74,7 +74,7 @@ node_templates:
     type: dcae.nodes.ContainerizedPlatformComponent
     properties:
         name: 'dcae-tca-analytics'
-        dns_name: 'dcae-tca-analytics' 
+        dns_name: 'dcae-tca-analytics'
         image:
           get_input: tag_version
         log_info:
@@ -129,7 +129,7 @@ node_templates:
                 subscriberPollingInterval: '30000'
                 subscriberProtocol: http
                 subscriberTimeoutMS: '-1'
-                subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
+                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
                 tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -141,7 +141,7 @@ node_templates:
                 DMAAPPORT:
                     { get_input: dmaap_port }
                 DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
-                DMAAPSUBTOPIC: "unauthenticated.SEC_MEASUREMENT_OUTPUT"
+                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
                 AAIHOST:
                     { get_input: aaiEnrichmentHost }
                 AAIPORT:

diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index d0c4e5a..56eef34 100644 (file)
--- a/blueprints/k8s-ves.yaml-template
+++ b/blueprints/k8s-ves.yaml-template
@@ -38,8 +38,8 @@ inputs:
     #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
   ves_measurement_publish_url:
     type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
-    #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
+    #default: "http://10.0.11.1:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
   tag_version:
     type: string
     default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2.0"

diff --git a/blueprints/tca.yaml-template b/blueprints/tca.yaml-template
index 081536d..9699456 100644 (file)
--- a/blueprints/tca.yaml-template
+++ b/blueprints/tca.yaml-template
@@ -65,7 +65,7 @@ node_templates:
         subscriberPollingInterval: '30000'
         subscriberProtocol: http
         subscriberTimeoutMS: '-1'
-        subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
+        subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
         tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
       artifact_name: dcae-analytics-cdap-tca
       artifact_version: 2.0.0

diff --git a/blueprints/tcadocker-service.yaml-template b/blueprints/tcadocker-service.yaml-template
index dce7290..6e536e2 100644 (file)
--- a/blueprints/tcadocker-service.yaml-template
+++ b/blueprints/tcadocker-service.yaml-template
@@ -106,7 +106,7 @@ node_templates:
               DMAAPPORT: 
                 get_input: dmaap_port
               DMAAPPUBTOPIC: unauthenticated.DCAE_CL_OUTPUT
-              DMAAPSUBTOPIC: unauthenticated.SEC_MEASUREMENT_OUTPUT
+              DMAAPSUBTOPIC: unauthenticated.VES_MEASUREMENT_OUTPUT
 #              SERVICE_11011_IGNORE: "true"
               SERVICE_11015_IGNORE: "true"
             ports:
@@ -165,7 +165,7 @@ node_templates:
           subscriberPollingInterval: "30000"
           subscriberProtocol: http
           subscriberTimeoutMS: "-1"
-          subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
+          subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
           tca_policy: "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}"
       docker_config: 
         healthcheck: 

diff --git a/blueprints/ves.yaml-template b/blueprints/ves.yaml-template
index 183a407..4b5a5a5 100644 (file)
--- a/blueprints/ves.yaml-template
+++ b/blueprints/ves.yaml-template
@@ -38,7 +38,7 @@ inputs:
     default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
   ves_measurement_publish_url:
     type: string
-    default: "http://10.0.11.1:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
+    default: "http://10.0.11.1:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
   dh_override:
     type: string
     default: "component_dockerhost"