From cc62d2ee6ac4f016c0759051b5564e696e4fbc2f Mon Sep 17 00:00:00 2001 From: dfarrelly Date: Tue, 28 Apr 2020 11:23:38 +0100 Subject: Update PMSH Frankfurt docs *Add example monitoring policy Issue-ID: DCAEGEN2-1820 Signed-off-by: dfarrelly Change-Id: Ibfdfbc2877078815a97971c471b20c1e5cb316a4 --- .../pm-subscription-handler/installation.rst | 9 +++- .../resources/monitoring-policy.json | 58 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 docs/sections/services/pm-subscription-handler/resources/monitoring-policy.json 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` -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 -- cgit 1.2.3-korg