From 420d330e19ccf6a440863f6b40714fcabf17daed Mon Sep 17 00:00:00 2001
From: dhiraj <dhiraj.verma@nokia.com>
Date: Wed, 21 Apr 2021 18:07:26 +0300
Subject: [PATCH] RIC-710: Adding E2T counters to Vespa-Manager

Change-Id: Ifc522bfca7b610860beac1dab1a757c4d22ceeb8
Signed-off-by: dhiraj <dhiraj.verma@nokia.com>
---
 Dockerfile              |  2 +-
 cmd/vespamgr/config.go  | 16 +++++++++++++-
 config/config-file.json |  5 +++--
 config/plt-counter.json | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 config/plt-counter.json

diff --git a/Dockerfile b/Dockerfile
index f91f7ed..168359b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ COPY --from=gobuild /root/go/bin /root/go/bin
 COPY --from=gobuild /root/go/bin/vespamgr /usr/local/bin/vesmgr
 COPY --from=gobuild /root/go/bin/vespamgr /vespamgr
 COPY --from=gobuild /go/src/vespamgr/config/* /cfg/
-
+COPY --from=gobuild /go/src/vespamgr/config/plt-counter.json /cfg/plt-counter.json
 RUN ldconfig
 
 ENV CFG_FILE=/cfg/config-file.json
diff --git a/cmd/vespamgr/config.go b/cmd/vespamgr/config.go
index a62b3a4..12079ba 100755
--- a/cmd/vespamgr/config.go
+++ b/cmd/vespamgr/config.go
@@ -196,6 +196,17 @@ func (v *VespaMgr) GetRules(vespaconf *VESAgentConfiguration, xAppConfig []byte)
 			metrics = v.ParseMetricsFromDescriptor(pltConfig, metrics)
 		}
 	}
+    
+	// Adding Platform Counters
+	pltCounterFile :=  app.Config.GetString("controls.pltCounterFile")
+	bytes, err := ioutil.ReadFile(pltCounterFile)
+	if err != nil{
+		app.Logger.Error("Platform Matrices Configuration File not found")
+	} else {
+
+		metrics = v.ParseMetricsFromDescriptor(bytes,metrics)
+	}
+	
 
 	vespaconf.Measurement.Prometheus.Rules.Metrics = make([]MetricRule, 0, len(metrics))
 	for key, value := range metrics {
@@ -220,10 +231,12 @@ func (v *VespaMgr) GetCollectorConfiguration(vespaconf *VESAgentConfiguration) {
 }
 
 func (v *VespaMgr) CreateConfig(writer io.Writer, xAppStatus []byte) {
+
+	
 	vespaconf := v.BasicVespaConf()
 	v.GetRules(&vespaconf, xAppStatus)
 	v.GetCollectorConfiguration(&vespaconf)
-
+    
 	err := yaml.NewEncoder(writer).Encode(vespaconf)
 	if err != nil {
 		app.Logger.Error("Cannot write vespa conf file: %s", err.Error())
@@ -231,3 +244,4 @@ func (v *VespaMgr) CreateConfig(writer io.Writer, xAppStatus []byte) {
 	}
 	app.Logger.Info("Config file written to: %s", app.Config.GetString("controls.vesagent.configFile"))
 }
+
diff --git a/config/config-file.json b/config/config-file.json
index 455cf8f..5627e86 100755
--- a/config/config-file.json
+++ b/config/config-file.json
@@ -55,6 +55,7 @@
         "host": "http://service-ricplt-vespamgr-http.ricplt.svc.cluster.local:8080",
         "measurementUrl": "/ric/v1/measurements",
         "pltFile": "/tmp/vespa-plt-meas.json",
+        "pltCounterFile": "/cfg/plt-counter.json",
         "appManager": {
             "host": "http://service-ricplt-appmgr-http.ricplt.svc.cluster.local:8080",
             "path": "/ric/v1/config",
@@ -72,7 +73,7 @@
         "collector": {
             "primaryAddr": "pod-ves-simulator",
             "secondaryAddr": "pod-ves-simulator",
-            "serverRoot": "0",
+            "serverRoot": "",
             "primaryPort": 8443,
             "primaryUser": "sample1",
             "primaryPassword": "sample1",
@@ -81,4 +82,4 @@
     },
     "faults": { },
     "metrics": []
-}
\ No newline at end of file
+}
diff --git a/config/plt-counter.json b/config/plt-counter.json
new file mode 100644
index 0000000..339cdce
--- /dev/null
+++ b/config/plt-counter.json
@@ -0,0 +1,58 @@
+[
+    {
+        "metadata": { },
+        "descriptor": { },
+        "config": {
+            "local": {
+                "host": ":8080"
+            },
+            "logger": {
+                "level": 5
+            },
+            "measurements": [
+                {
+                    "moId": "SEP-12/XAPP-1",
+                    "measType": "X2",
+                    "measId": "9001",
+                    "measInterval": "60",
+                    "metrics": [
+                        {
+                            "name": "exposer_transferred_bytes_total",
+                            "objectName": "exposer_transferred_bytes_total",
+                            "objectInstance": "exposer_transferred_bytes_total",
+                            "counterId": "0011",
+                            "type": "counter",
+                            "description": "exposer_transferred_bytes_total"
+                        },
+                        {
+                            "name": "exposer_scrapes_total",
+                            "objectName": "exposer_scrapes_total",
+                            "objectInstance": "exposer_scrapes_total",
+                            "counterId": "0012",
+                            "type": "counter",
+                            "description": "exposer_scrapes_total"
+                        },
+                        {
+                            "name": "exposer_request_latencies_count",
+                            "objectName": "exposer_request_latencies_count",
+                            "objectInstance": "exposer_request_latencies_count",
+                            "counterId": "0013",
+                            "type": "counter",
+                            "description": "exposer_request_latencies_count"
+                        },
+                        {
+                            "name": "exposer_request_latencies_sum",
+                            "objectName": "exposer_request_latencies_sum",
+                            "objectInstance": "exposer_request_latencies_sum",
+                            "counterId": "0014",
+                            "type": "counter",
+                            "description": "exposer_request_latencies_sum"
+                        }
+                    ]
+                }
+            ]
+        }
+    }
+    
+]
+
-- 
2.16.6