Code Review
/
ric-plt
/
vespamgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update RMR version v4.4.6
[ric-plt/vespamgr.git]
/
cmd
/
vespamgr
/
config.go
diff --git
a/cmd/vespamgr/config.go
b/cmd/vespamgr/config.go
index
b7779f2
..
a62b3a4
100755
(executable)
--- a/
cmd/vespamgr/config.go
+++ b/
cmd/vespamgr/config.go
@@
-188,8
+188,8
@@
func (v *VespaMgr) GetRules(vespaconf *VESAgentConfiguration, xAppConfig []byte)
appMetrics := make(AppMetrics)
metrics := v.ParseMetricsFromDescriptor(xAppConfig, appMetrics)
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 {
if err != nil {
app.Logger.Error("Unable to read platform config file: %v", err)
} else {
@@
-221,9
+221,7
@@
func (v *VespaMgr) GetCollectorConfiguration(vespaconf *VESAgentConfiguration) {
func (v *VespaMgr) CreateConfig(writer io.Writer, xAppStatus []byte) {
vespaconf := v.BasicVespaConf()
func (v *VespaMgr) CreateConfig(writer io.Writer, xAppStatus []byte) {
vespaconf := v.BasicVespaConf()
-
v.GetRules(&vespaconf, xAppStatus)
v.GetRules(&vespaconf, xAppStatus)
-
v.GetCollectorConfiguration(&vespaconf)
err := yaml.NewEncoder(writer).Encode(vespaconf)
v.GetCollectorConfiguration(&vespaconf)
err := yaml.NewEncoder(writer).Encode(vespaconf)