X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fvespamgr%2Fconfig.go;fp=cmd%2Fvespamgr%2Fconfig.go;h=12079ba74e57bea66570b8b778621cfa1735dcba;hb=420d330e19ccf6a440863f6b40714fcabf17daed;hp=a62b3a44add8b59fd64bf1aeb5c5d6fb3bb3b360;hpb=e3d0c380a0a0191c31d3b66e59747ab496d50f6e;p=ric-plt%2Fvespamgr.git 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")) } +