X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fvespamgr%2Fconfig.go;h=12079ba74e57bea66570b8b778621cfa1735dcba;hb=refs%2Fchanges%2F30%2F7230%2F1;hp=b7779f2bd29b879e10e2f27d120d32ca18d3c722;hpb=2bfaef02e6141e5870ee0fca20b428223d00d8e9;p=ric-plt%2Fvespamgr.git

diff --git a/cmd/vespamgr/config.go b/cmd/vespamgr/config.go
index b7779f2..12079ba 100755
--- a/cmd/vespamgr/config.go
+++ b/cmd/vespamgr/config.go
@@ -188,14 +188,25 @@ func (v *VespaMgr) GetRules(vespaconf *VESAgentConfiguration, xAppConfig []byte)
 	appMetrics := make(AppMetrics)
 	metrics := v.ParseMetricsFromDescriptor(xAppConfig, appMetrics)
 
-	if pltFile := os.Getenv("VESMGR_PLT_CFG_FILE"); pltFile != "" {
-		pltConfig, err := ioutil.ReadFile(pltFile)
+	if v.pltFileCreated {
+		pltConfig, err := ioutil.ReadFile(app.Config.GetString("controls.pltFile"))
 		if err != nil {
 			app.Logger.Error("Unable to read platform config file: %v", err)
 		} else {
 			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,12 +231,12 @@ func (v *VespaMgr) GetCollectorConfiguration(vespaconf *VESAgentConfiguration) {
 }
 
 func (v *VespaMgr) CreateConfig(writer io.Writer, xAppStatus []byte) {
-	vespaconf := v.BasicVespaConf()
 
+	
+	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())
@@ -233,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"))
 }
+