diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-04-20 11:20:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-20 11:20:50 +0000 |
| commit | 93f42d205461df56d64dd65172a31c4af69664df (patch) | |
| tree | f0d41cbbebf59e3ddf0f1d72ef12645aa50356b9 /models-examples | |
| parent | 8e3dfc00ee7e443862069b7424b31bd73bc1988d (diff) | |
| parent | 42649a778ce94ab2fa120d1a3482f6fad16eec32 (diff) | |
Merge "Update monitoring policies to match DCAE"
Diffstat (limited to 'models-examples')
6 files changed, 51 insertions, 77 deletions
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 e5d074163..eba46b006 100644 --- 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 09a491584..c47c0f301 100644 --- 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 b49571c26..d2f07ce57 100644 --- 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 ae8623dca..b4f8ee039 100644 --- 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 20afb111b..1468d75ee 100644 --- 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 62a470596..496e3147d 100644 --- 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 |