[DCAE] Update kpi-ms to use unauthenticated Dmaap topic

- Kpi image version bump
- Use unauthenticated Dmaap topic

Issue-ID: DCAEGEN2-3033
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: Ib8ed9e7c1b3d0a5d1d3b00985dfd7c13936585c6

diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 037dd0a..2457383 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -1,6 +1,6 @@
 # ============= LICENSE_START ================================================
 # ============================================================================
-# Copyright (C) 2021 Wipro Limited.
+# Copyright (C) 2021-2022 Wipro Limited.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.1
+image: onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.4
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -114,8 +114,6 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  aafUsername: ${AAF_IDENTITY}
-  aafPassword: ${AAF_PASSWORD}
   trust_store_path: '/opt/app/kpims/etc/cert/trust.jks'
   trust_store_pass_path: '/opt/app/kpims/etc/cert/trust.pass'
   pollingInterval: 20
@@ -130,14 +128,14 @@ applicationConfig:
       aafPassword: ${AAF_PASSWORD}
       type: message-router
       dmaap_info:
-        topic_url: https://message-router.onap.svc.cluster.local:3905/events/org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS
+        topic_url: http://message-router:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS
   streams_publishes:
     kpi_topic:
       aafUsername: ${AAF_IDENTITY}
       aafPassword: ${AAF_PASSWORD}
       type: message-router
       dmaap_info:
-        topic_url: https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.DCAE_KPI_OUTPUT
+        topic_url: http://message-router:3904/events/unauthenticated.DCAE_KPI_OUTPUT
   kpi.policy: '{"domain":"measurementsForKpi","methodForKpi":[{"eventName":"perf3gpp_CORE-AMF_pmMeasResult","controlLoopSchemaType":"SLICE","policyScope":"resource=networkSlice;type=configuration","policyName":"configuration.dcae.microservice.kpi-computation","policyVersion":"v0.0.1","kpis":[{"measType":"AMFRegNbr","operation":"SUM","operands":"RM.RegisteredSubNbrMean"}]},{"eventName":"perf3gpp_CORE-UPF_pmMeasResult","controlLoopSchemaType":"SLICE","policyScope":"resource=networkSlice;type=configuration","policyName":"configuration.dcae.microservice.kpi-computation","policyVersion":"v0.0.1","kpis":[{"measType":"UpstreamThr","operation":"SUM","operands":"GTP.InDataOctN3UPF"},{"measType":"DownstreamThr","operation":"SUM","operands":"GTP.OutDataOctN3UPF"}]}]}'
 
 applicationEnv: