From 4edf0fa48892bf38d0e3838d125e9bf2324b38e0 Mon Sep 17 00:00:00 2001 From: an4828 Date: Fri, 15 Sep 2017 15:28:53 -0400 Subject: Add support for ABATED alerts within CDAP TCA Change-Id: Iae560a2d0a47b30b41cd31206dc481a08e4930f7 Signed-off-by: an4828 Issue-ID: DCAEGEN2-107 Signed-off-by: an4828 --- .../properties/tca_controller_policy.properties | 83 --------------------- .../tca_controller_policy_from_json.properties | 86 ---------------------- 2 files changed, 169 deletions(-) delete mode 100644 dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy.properties delete mode 100644 dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy_from_json.properties (limited to 'dcae-analytics-cdap-tca/src/test/resources/data/properties') diff --git a/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy.properties b/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy.properties deleted file mode 100644 index 2f6921f..0000000 --- a/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy.properties +++ /dev/null @@ -1,83 +0,0 @@ -# -# ===============================LICENSE_START====================================== -# dcae-analytics -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================LICENSE_END=========================================== -# - -domain=measurementsForVfScaling - -configuration.metricsPerFunctionalRole.vFirewall.policy.functionalRole=vFirewall -configuration.metricsPerFunctionalRole.vFirewall.policyName=configuration.dcae.microservice.tca.xml -configuration.metricsPerFunctionalRole.vFirewall.policyVersion=v0.0.1 -configuration.metricsPerFunctionalRole.vFirewall.policyScope=resource=vFirewall;type=configuration - -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.closedLoopControlName=CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.thresholdValue=4000 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.direction=LESS_OR_EQUAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.severity=MAJOR -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.closedLoopControlName=L-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.thresholdValue=20000 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.direction=GREATER_OR_EQUAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.severity=CRITICAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vLoadBalancer.policy.functionalRole=vLoadBalancer -configuration.metricsPerFunctionalRole.vLoadBalancer.policyName=configuration.dcae.microservice.tca.xml -configuration.metricsPerFunctionalRole.vLoadBalancer.policyVersion=v0.0.1 -configuration.metricsPerFunctionalRole.vLoadBalancer.policyScope=resource=vLoadBalancer;type=configuration - -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.thresholdValue=500 -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.direction=LESS_OR_EQUAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.severity=MAJOR -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.thresholdValue=5000 -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.direction=GREATER_OR_EQUAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.severity=CRITICAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.version=1.0.2 - -subscriberHostName=dcae-msrt-ftl.homer.com -subscriberHostPort=3905 -subscriberTopicName=com.dcae.dmaap.FTL.DcaeTestVESSub -subscriberProtocol=https -subscriberUserName=USER -subscriberUserPassword=PASSWORD -subscriberContentType=application/json -subscriberConsumerId=c12 -subscriberConsumerGroup=OpenDCAE-c12 -subscriberTimeoutMS=-1 -subscriberMessageLimit=-1 -subscriberPollingInterval=20000 -publisherHostName=dcae-msrt-ftl.homer.com -publisherHostPort=3905 -publisherTopicName=com.dcae.dmaap.FTL.DcaeTestVESPub -publisherProtocol=https -publisherUserName=USER -publisherUserPassword=PASSWORD -publisherContentType=application/json -publisherMaxBatchSize=10 -publisherMaxRecoveryQueueSize=100000 -publisherPollingInterval=20000 -enableAlertCEFFormat=false diff --git a/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy_from_json.properties b/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy_from_json.properties deleted file mode 100644 index 5e2bb2a..0000000 --- a/dcae-analytics-cdap-tca/src/test/resources/data/properties/tca_controller_policy_from_json.properties +++ /dev/null @@ -1,86 +0,0 @@ -# ============LICENSE_START========================================================= -# dcae-analytics -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# - - -domain=measurementsForVfScaling - -configuration.metricsPerFunctionalRole.vFirewall.policy.functionalRole=vFirewall -configuration.metricsPerFunctionalRole.vFirewall.policyName=configuration.dcae.microservice.tca.xml -configuration.metricsPerFunctionalRole.vFirewall.policyVersion=v0.0.1 -configuration.metricsPerFunctionalRole.vFirewall.policyScope=resource=vFirewall;type=configuration - -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.closedLoopControlName=CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.thresholdValue=4000 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.direction=LESS_OR_EQUAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.severity=MAJOR -configuration.metricsPerFunctionalRole.vFirewall.thresholds.0.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.closedLoopControlName=L-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.thresholdValue=20000 -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.direction=GREATER_OR_EQUAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.severity=CRITICAL -configuration.metricsPerFunctionalRole.vFirewall.thresholds.1.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vLoadBalancer.policy.functionalRole=vLoadBalancer -configuration.metricsPerFunctionalRole.vLoadBalancer.policyName=configuration.dcae.microservice.tca.xml -configuration.metricsPerFunctionalRole.vLoadBalancer.policyVersion=v0.0.1 -configuration.metricsPerFunctionalRole.vLoadBalancer.policyScope=resource=vLoadBalancer;type=configuration - -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.thresholdValue=500 -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.direction=LESS_OR_EQUAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.severity=MAJOR -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.0.policy.version=1.0.2 - -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.thresholdValue=5000 -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.direction=GREATER_OR_EQUAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.severity=CRITICAL -configuration.metricsPerFunctionalRole.vLoadBalancer.thresholds.1.policy.version=1.0.2 - -tca_policy='{\"domain\":\"measurementsForVfScaling\",\"metricsPerFunctionalRole\":[{\"functionalRole\":\"vFirewall\",\"policyScope\":\"resource=vFirewall;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn\",\"thresholdValue\":4000,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn\",\"thresholdValue\":20000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]},{\"functionalRole\":\"vLoadBalancer\",\"policyScope\":\"resource=vLoadBalancer;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\",\"thresholdValue\":5000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]}]}' - -subscriberHostName=dcae-msrt-ftl.homer.com -subscriberHostPort=3905 -subscriberTopicName=com.dcae.dmaap.FTL.DcaeTestVESSub -subscriberProtocol=https -subscriberUserName=USER -subscriberUserPassword=PASSWORD -subscriberContentType=application/json -subscriberConsumerId=c12 -subscriberConsumerGroup=OpenDCAE-c12 -subscriberTimeoutMS=-1 -subscriberMessageLimit=-1 -subscriberPollingInterval=20000 -publisherHostName=dcae-msrt-ftl.homer.com -publisherHostPort=3905 -publisherTopicName=com.dcae.dmaap.FTL.DcaeTestVESPub -publisherProtocol=https -publisherUserName=USER -publisherUserPassword=PASSWORD -publisherContentType=application/json -publisherMaxBatchSize=10 -publisherMaxRecoveryQueueSize=100000 -publisherPollingInterval=20000 -enableAlertCEFFormat=false - -- cgit 1.2.3-korg