summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph O'Leary <joseph.o.leary@est.tech>2020-09-09 14:29:06 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-09 14:29:06 +0000
commit13d63d3137c8a365cd1cd8a2a9f7dac72e894b57 (patch)
treefc947e6f752ebf76c5969a60f4eaaffbba8225d7
parentd6b4cbba2f5beff5f120de93c43fb3bb94d3df9d (diff)
parenta0f2e17e63b75dcbc81bfb1cc76c7ef3860cfb81 (diff)
Merge "[PMSH] Add enhanced filtering to config spec"
-rw-r--r--docs/sections/services/pm-subscription-handler/configuration.rst37
1 files changed, 21 insertions, 16 deletions
diff --git a/docs/sections/services/pm-subscription-handler/configuration.rst b/docs/sections/services/pm-subscription-handler/configuration.rst
index 83d9cfd8..1cd6eee0 100644
--- a/docs/sections/services/pm-subscription-handler/configuration.rst
+++ b/docs/sections/services/pm-subscription-handler/configuration.rst
@@ -127,30 +127,35 @@ The subscription is configured within the monitoring policy. The subscription mo
**nfFilter**
-The ``nfFilter`` will be used in order to filter the list of NF's retrieved from A&AI. It will filter on the names
-specified in the ``nfNames`` field, which can also contain regex as seen below.
+The ``nfFilter`` will be used in order to filter the list of NF's retrieved from A&AI. There are three criteria that
+can be filtered on, nfNames, modelInvariantIDs and/or modelVersionIDs. All 3 of these are optional fields but at
+least 1 must be present for the filter to work.
::
"nfFilter": {
- "swVersions": [
- "1.0.0",
- "1.0.1"
+ "nfNames":[
+ "^pnf.*",
+ "^vnf.*"
],
- "nfNames": [
- "ABC",
- "DEF",
- "foo.*"
+ "modelInvariantIDs": [
+ "5845y423-g654-6fju-po78-8n53154532k6",
+ "7129e420-d396-4efb-af02-6b83499b12f8"
+ ],
+ "modelVersionIDs": [
+ "e80a6ae3-cafd-4d24-850d-e14c084a5ca9"
]
}
-+------------+-----------------------------------------------------------------------------+------+----------+
-| Field | Description | Type | Required |
-+============+=============================================================================+======+==========+
-| swVersions | List of software versions. | list | True |
-+------------+-----------------------------------------------------------------------------+------+----------+
-| nfNames | List of NF names. These names are regexes, which will be parsed by the PMSH.| list | True |
-+------------+-----------------------------------------------------------------------------+------+----------+
++------------------------+-----------------------------------------------------------------------------------------------+------+----------+
+| Field | Description | Type | Required |
++========================+===============================================================================================+======+==========+
+| nfNames | List of NF names. These names are regexes, which will be parsed by the PMSH. | list | False |
++------------------------+-----------------------------------------------------------------------------------------------+------+----------+
+| modelInvariantIDs | List of modelInvariantIDs. These UUIDs will be checked for exact matches with AAI entities. | list | False |
++------------------------+-----------------------------------------------------------------------------------------------+------+----------+
+| modelVersionIDs | List of modelVersionIDs. These IDs will be checked for exact matches with AAI entities. | list | False |
++------------------------+-----------------------------------------------------------------------------------------------+------+----------+
**measurementGroup**