From 79225b4ecdbbc5fde760f2f70f26bce022fcf0ed Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Tue, 16 Jun 2020 08:44:28 -0400
Subject: [PATCH] VES chart updates

1. add config for more VES data types;
2. bring parameters such as DMaaP and topics to values and override.

Change-Id: I931d25ad5cefb46915b5b6638158548413f4afcd
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 ric-aux/RECIPE_EXAMPLE/example_recipe.yaml |  4 +++
 ric-aux/helm/ves/templates/configmap.yaml  | 46 ++++++++++++++++++++++++++++--
 ric-aux/helm/ves/values.yaml               |  6 ++++
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml b/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
index cda2d987..af4a5a9c 100644
--- a/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
@@ -55,6 +55,10 @@ extsvcaux:
 #        email: ""
 
 
+ves:
+  dmaapMrHostPorts: "message-router.onap:3904"
+
+
 dashboard:
   imagePullPolicy: IfNotPresent
   image:
diff --git a/ric-aux/helm/ves/templates/configmap.yaml b/ric-aux/helm/ves/templates/configmap.yaml
index 3f1f8b16..0453b85a 100644
--- a/ric-aux/helm/ves/templates/configmap.yaml
+++ b/ric-aux/helm/ves/templates/configmap.yaml
@@ -1,5 +1,5 @@
 ################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019,2020 AT&T Intellectual Property.                        #
 #   Copyright (c) 2019 Nokia.                                                  #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
@@ -25,11 +25,51 @@ data:
       "channels": [
         {
           "name": "ves-measurement",
-          "cambria.topic": "unauthenticated.SEC_MEASUREMENT_OUTPUT",
           "class": "HpCambriaOutputStream",
           "stripHpId": "true",
           "type": "out",
-          "cambria.hosts": "ricaux-message-router:3904"
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicSecMeasurement | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
+        },
+        {
+          "name": "ves-fault",
+          "class": "HpCambriaOutputStream",
+          "stripHpId": "true",
+          "type": "out",
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicSecFault | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
+        },
+        {
+          "name": "ves-heartbeat",
+          "class": "HpCambriaOutputStream",
+          "stripHpId": "true",
+          "type": "out",
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicSecFault | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
+        },
+        {
+          "name": "ves-other",
+          "class": "HpCambriaOutputStream",
+          "stripHpId": "true",
+          "type": "out",
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicSecOther | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
+        },
+        {
+          "name": "ves-notification",
+          "class": "HpCambriaOutputStream",
+          "stripHpId": "true",
+          "type": "out",
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicVesNotification | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
+        },
+        {
+          "name": "ves-pnfRegistration",
+          "class": "HpCambriaOutputStream",
+          "stripHpId": "true",
+          "type": "out",
+          "cambria.topic": {{ .Values.ves.dmaapMrTopicVesPnfReg | quote }},
+          "cambria.hosts": {{ .Values.ves.dmaapMrHostPorts | quote }}
         }
       ]
     }
diff --git a/ric-aux/helm/ves/values.yaml b/ric-aux/helm/ves/values.yaml
index c9a1b32d..174a2a2e 100644
--- a/ric-aux/helm/ves/values.yaml
+++ b/ric-aux/helm/ves/values.yaml
@@ -28,3 +28,9 @@ ves:
     tag: 1.4.4
 
   replicaCount: 1
+  dmaapMrHostPorts: "ricaux-message-router:3904"
+  dmaapMrTopicSecMeasurement: "unauthenticated.SEC_MEASUREMENT_OUTPUT"
+  dmaapMrTopicSecFault: "unauthenticated.SEC_FAULT_OUTPUT"
+  dmaapMrTopicSecOther: "unauthenticated.SEC_OTHER_OUTPUT"
+  dmaapMrTopicVesNotification: "unauthenticated.VES_NOTIFICATION_OUTPUT"
+  dmaapMrTopicVesPnfReg: "unauthenticated.VES_PNFREG_OUTPUT"
-- 
2.16.6