From: dfarrelly <david.farrelly@est.tech>
Date: Tue, 28 Apr 2020 10:23:38 +0000 (+0100)
Subject: Update PMSH Frankfurt docs
X-Git-Tag: 6.0.0-ONAP~7^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cc62d2ee6ac4f016c0759051b5564e696e4fbc2f;p=dcaegen2.git

Update PMSH Frankfurt docs

*Add example monitoring policy

Issue-ID: DCAEGEN2-1820
Signed-off-by: dfarrelly <david.farrelly@est.tech>
Change-Id: Ibfdfbc2877078815a97971c471b20c1e5cb316a4
---

diff --git a/docs/sections/services/pm-subscription-handler/installation.rst b/docs/sections/services/pm-subscription-handler/installation.rst
index 3865cfbd..f858222a 100644
--- a/docs/sections/services/pm-subscription-handler/installation.rst
+++ b/docs/sections/services/pm-subscription-handler/installation.rst
@@ -6,8 +6,8 @@
 Installation
 ============
 
-Due to a bug in the Frankfurt release, the PMSH cannot be deployed through CLAMP. The PMSH can instead be deployed
-using the DCAE Dashboard or via CLI. Steps to deploy using CLI will be shown below.
+In Frankfurt, the PMSH can be deployed using the DCAE Dashboard or via CLI. Steps to deploy using CLI will be shown
+below.
 
 Deployment Prerequisites
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -46,6 +46,11 @@ See :ref:`Subscription configuration<Subscription>`
             -H 'Content-Type: application/json' \
             -d @monitoring-policy.json
 
+The following JSON is an example monitoring policy.
+
+.. literalinclude:: resources/monitoring-policy.json
+    :language: json
+
 To deploy the PMSH microservice using the deployment handler API, the ``serviceTypeId`` is needed, this can be retrieved
 using the inventory API
 
diff --git a/docs/sections/services/pm-subscription-handler/resources/monitoring-policy.json b/docs/sections/services/pm-subscription-handler/resources/monitoring-policy.json
new file mode 100644
index 00000000..da2d263f
--- /dev/null
+++ b/docs/sections/services/pm-subscription-handler/resources/monitoring-policy.json
@@ -0,0 +1,58 @@
+{
+  "subscription":{
+    "subscriptionName":"subscriptiona",
+    "administrativeState":"UNLOCKED",
+    "fileBasedGP":15,
+    "fileLocation":"/pm/pm.xml",
+    "nfFilter":{
+      "nfNames":[
+        "^pnf1.*"
+      ],
+      "swVersions":[
+        "1.0.0"
+      ]
+    },
+    "measurementGroups":[
+      {
+        "measurementGroup":{
+          "measurementTypes":[
+            {
+              "measurementType":"countera"
+            },
+            {
+              "measurementType":"counterb"
+            }
+          ],
+          "managedObjectDNsBasic":[
+            {
+              "DN":"dna"
+            },
+            {
+              "DN":"dnb"
+            }
+          ]
+        }
+      },
+      {
+        "measurementGroup":{
+          "measurementTypes":[
+            {
+              "measurementType":"counterc"
+            },
+            {
+              "measurementType":"counterd"
+            }
+          ],
+          "managedObjectDNsBasic":[
+            {
+              "DN":"dnc"
+            },
+            {
+              "DN":"dnd"
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file