Merge "E2T: Prometheus integration"

diff --git a/helm/alarmadapter/templates/appconfig.yaml b/helm/alarmadapter/templates/appconfig.yaml
new file mode 100644 (file)
index 0000000..0ff0c6a
--- /dev/null
+++ b/helm/alarmadapter/templates/appconfig.yaml
@@ -0,0 +1,36 @@
+################################################################################
+#   Copyright (c) 2020 AT&T Intellectual Property.                             #
+#   Copyright (c) 2020 Nokia.                                                  #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+{{ $platformNameSpace := include "common.namespace.platform" . }}
+{{ $xAppNameSpace := include "common.namespace.xapp" . }}
+{{ $nameSpaceList := list $platformNameSpace $xAppNameSpace }}
+{{- range $nameSpaceList }}
+{{- $namespace := . }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+{{- if eq $namespace $platformNameSpace }}
+  name: {{ include "common.configmapname.alarmadapter" $ }}-appconfig
+{{- else }}
+  name: alarm-appconfig
+{{- end }}
+  namespace: {{ $namespace }}
+data:
+  ALARM_MGR_SERVICE_NAME: {{ include "common.servicename.alarmadapter.rmr" $ }}.{{ $platformNameSpace }}
+  ALARM_MGR_SERVICE_PORT: {{ include "common.serviceport.alarmadapter.rmr.data" $ | quote }}
+
+{{- end }}

diff --git a/helm/rtmgr/templates/config.yaml b/helm/rtmgr/templates/config.yaml
index a3f921c..85a6ea9 100644 (file)
--- a/helm/rtmgr/templates/config.yaml
+++ b/helm/rtmgr/templates/config.yaml
@@ -89,6 +89,8 @@ data:
           "RAN_RESTARTED=1210",
           "RAN_RECONFIGURED=1220",
           "RIC_ENB_LOAD_INFORMATION=10020",
+          "RIC_SN_STATUS_TRANSFER=10040",
+          "RIC_UE_CONTEXT_RELEASE=10050",
           "RIC_X2_SETUP_REQ=10060",
           "RIC_X2_SETUP_RESP=10061",
           "RIC_X2_SETUP_FAILURE=10062",
@@ -100,12 +102,28 @@ data:
           "RIC_RES_STATUS_REQ=10090",
           "RIC_RES_STATUS_RESP=10091",
           "RIC_RES_STATUS_FAILURE=10092",
+          "RIC_SGNB_ADDITION_REQ=10270",
+          "RIC_SGNB_ADDITION_ACK=10271",
+          "RIC_SGNB_ADDITION_REJECT=10272",
+          "RIC_SGNB_RECONF_COMPLETE=10280",
+          "RIC_SGNB_MOD_REQUEST=10290",
+          "RIC_SGNB_MOD_REQUEST_ACK=10291",
+          "RIC_SGNB_MOD_REQUEST_REJ=10292",
+          "RIC_SGNB_MOD_REQUIRED=10300",
+          "RIC_SGNB_MOD_CONFIRM=10301",
+          "RIC_SGNB_MOD_REFUSE=10302",
+          "RIC_SGNB_RELEASE_REQUEST=10310",
+          "RIC_SGNB_RELEASE_REQUEST_ACK=10311",
+          "RIC_SGNB_RELEASE_REQUIRED=10320",
+          "RIC_SGNB_RELEASE_CONFIRM=10321",
+          "RIC_RRC_TRANSFER=10350",
           "RIC_ENDC_X2_SETUP_REQ=10360",
           "RIC_ENDC_X2_SETUP_RESP=10361",
           "RIC_ENDC_X2_SETUP_FAILURE=10362",
           "RIC_ENDC_CONF_UPDATE=10370",
           "RIC_ENDC_CONF_UPDATE_ACK=10371",
           "RIC_ENDC_CONF_UPDATE_FAILURE=10372",
+          "RIC_SECONDARY_RAT_DATA_USAGE_REPORT=10380",
           "RIC_E2_SETUP_REQ=12001",
           "RIC_E2_SETUP_RESP=12002",
           "RIC_E2_SETUP_FAILURE=12003",
@@ -116,6 +134,10 @@ data:
           "RIC_SUB_DEL_REQ=12020",
           "RIC_SUB_DEL_RESP=12021",
           "RIC_SUB_DEL_FAILURE=12022",
+          "RIC_CONTROL_REQ=12040",
+          "RIC_CONTROL_ACK=12041",
+          "RIC_CONTROL_FAILURE=12042",
+          "RIC_INDICATION=12050",
           "A1_POLICY_REQ=20010",
           "A1_POLICY_RESP=20011",
           "A1_POLICY_QUERY=20012",