Merge "Update monitoring policies to match DCAE"

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
index e5d0741..eba46b0 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
@@ -24,9 +24,9 @@
                             [
                                 {
                                     "eventName": "vLoadBalancer",
-                                    "controlLoopSchemaType": "VNF",
-                                    "policyScope": "type=configuration",
-                                    "policyName": "onap.scaleout.tca",
+                                    "controlLoopSchemaType": "VM",
+                                    "policyScope": "DCAE",
+                                    "policyName": "DCAE.Config_tca-hi-lo",
                                     "policyVersion": "v0.0.1",
                                     "thresholds":
                                     [
@@ -34,18 +34,8 @@
                                             "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
                                             "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 500,
-                                            "direction": "LESS_OR_EQUAL",
-                                            "severity": "MAJOR"
-                                        },
-
-                                        {
-                                            "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-                                            "closedLoopEventStatus": "ONSET",
-                                            "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 5000,
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                            "thresholdValue": 300,
                                             "direction": "GREATER_OR_EQUAL",
                                             "severity": "CRITICAL"
                                         }

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
index 09a4915..c47c0f3 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
@@ -14,24 +14,16 @@ topology_template:
                   metricsPerEventName:
                      -
                         eventName: vLoadBalancer
-                        controlLoopSchemaType: VNF
-                        policyScope: "type=configuration"
-                        policyName: "onap.scaleout.tca"
+                        controlLoopSchemaType: VM
+                        policyScope: "DCAE"
+                        policyName: "DCAE.Config_tca-hi-lo"
                         policyVersion: "v0.0.1"
                         thresholds:
                         -
                            closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
                            closedLoopEventStatus: ONSET
                            version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 500
-                           direction: LESS_OR_EQUAL
-                           severity: MAJOR
-                        -
-                           closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
-                           closedLoopEventStatus: ONSET
-                           version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 5000
+                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                           thresholdValue: 300
                            direction: GREATER_OR_EQUAL
-                           severity: CRITICAL
+                           severity: CRITICAL
\ No newline at end of file

diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
index b49571c..d2f07ce 100644 (file)
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
@@ -15,24 +15,16 @@ topology_template:
                   metricsPerEventName:
                      -
                         eventName: vLoadBalancer
-                        controlLoopSchemaType: VNF
-                        policyScope: "type=configuration"
-                        policyName: "onap.scaleout.tca"
+                        controlLoopSchemaType: VM
+                        policyScope: "DCAE"
+                        policyName: "DCAE.Config_tca-hi-lo"
                         policyVersion: "v0.0.1"
                         thresholds:
-                        - 
-                           closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
-                           closedLoopEventStatus: ONSET
-                           version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 500
-                           direction: LESS_OR_EQUAL
-                           severity: MAJOR
                         -
                            closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3"
                            closedLoopEventStatus: ONSET
                            version: "1.0.2"
-                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                           thresholdValue: 5000
+                           fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                           thresholdValue: 300
                            direction: GREATER_OR_EQUAL
-                           severity: CRITICAL
+                           severity: CRITICAL
\ No newline at end of file

diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
index ae8623d..b4f8ee0 100644 (file)
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
@@ -23,31 +23,31 @@
                             "metricsPerEventName":
                             [
                                 {
-                                    "eventName": "vLoadBalancer",
-                                    "controlLoopSchemaType": "VNF",
-                                    "policyScope": "resource=vLoadBalancer;type=configuration",
-                                    "policyName": "onap.vfirewall.tca",
+                                    "eventName": "vFirewallBroadcastPackets",
+                                    "controlLoopSchemaType": "VM",
+                                    "policyScope": "DCAE",
+                                    "policyName": "DCAE.Config_tca-hi-lo",
                                     "policyVersion": "v0.0.1",
                                     "thresholds":
                                     [
                                         {
                                             "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-                                            "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 500,
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                            "thresholdValue": 300,
                                             "direction": "LESS_OR_EQUAL",
-                                            "severity": "MAJOR"
+                                            "severity": "MAJOR",
+                                            "closedLoopEventStatus": "ONSET"
                                         },
 
                                         {
                                             "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-                                            "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 5000,
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                            "thresholdValue": 700,
                                             "direction": "GREATER_OR_EQUAL",
-                                            "severity": "CRITICAL"
+                                            "severity": "CRITICAL",
+                                            "closedLoopEventStatus": "ONSET"
                                         }
                                     ]
                                 }

diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
index 20afb11..1468d75 100644 (file)
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
@@ -13,25 +13,25 @@ topology_template:
               domain: measurementsForVfScaling
               metricsPerEventName:
               -
-                eventName: vLoadBalancer
-                controlLoopSchemaType: VNF
-                policyScope: "resource=vLoadBalancer;type=configuration"
-                policyName: "onap.vfirewall.tca"
+                eventName: vFirewallBroadcastPackets
+                controlLoopSchemaType: VM
+                policyScope: "DCAE"
+                policyName: "DCAE.Config_tca-hi-lo"
                 policyVersion: "v0.0.1"
                 thresholds:
                    -
                        closedLoopControlName: "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a"
-                       closedLoopEventStatus: ONSET
                        version: "1.0.2"
-                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                       thresholdValue: 500
+                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                       thresholdValue: 300
                        direction: LESS_OR_EQUAL
                        severity: MAJOR
+                       closedLoopEventStatus: ONSET
                    -
                        closedLoopControlName: "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a"
-                       closedLoopEventStatus: ONSET
                        version: "1.0.2"
-                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                       thresholdValue: 5000
+                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                       thresholdValue: 700
                        direction: GREATER_OR_EQUAL
-                       severity: CRITICAL
\ No newline at end of file
+                       severity: CRITICAL
+                       closedLoopEventStatus: ONSET
\ No newline at end of file

diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
index 62a4705..496e314 100644 (file)
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
@@ -14,25 +14,25 @@ topology_template:
               domain: measurementsForVfScaling
               metricsPerEventName:
               -
-                eventName: vLoadBalancer
-                controlLoopSchemaType: VNF
-                policyScope: "resource=vLoadBalancer;type=configuration"
-                policyName: "onap.vfirewall.tca"
+                eventName: vFirewallBroadcastPackets
+                controlLoopSchemaType: VM
+                policyScope: "DCAE"
+                policyName: "DCAE.Config_tca-hi-lo"
                 policyVersion: "v0.0.1"
                 thresholds:
                    -
                        closedLoopControlName: "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a"
-                       closedLoopEventStatus: ONSET
                        version: "1.0.2"
-                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                       thresholdValue: 500
+                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                       thresholdValue: 300
                        direction: LESS_OR_EQUAL
                        severity: MAJOR
+                       closedLoopEventStatus: ONSET
                    -
                        closedLoopControlName: "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a"
-                       closedLoopEventStatus: ONSET
                        version: "1.0.2"
-                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"
-                       thresholdValue: 5000
+                       fieldPath: "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
+                       thresholdValue: 700
                        direction: GREATER_OR_EQUAL
-                       severity: CRITICAL
\ No newline at end of file
+                       severity: CRITICAL
+                       closedLoopEventStatus: ONSET
\ No newline at end of file