floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix remote config

This commit is contained in:
medcl 2023-10-23 21:12:30 +08:00
parent 1c01ff463a
commit 7e4f3c9e4f
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/agent/api/remote_config.go
View File

@ -8,11 +8,14 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"infini.sh/framework/core/elastic" "infini.sh/framework/core/elastic"
"infini.sh/framework/core/global"
"infini.sh/framework/core/kv"
"infini.sh/framework/core/model" "infini.sh/framework/core/model"
"infini.sh/framework/core/orm" "infini.sh/framework/core/orm"
"infini.sh/framework/core/util" "infini.sh/framework/core/util"
common2 "infini.sh/framework/modules/elastic/common" common2 "infini.sh/framework/modules/elastic/common"
"infini.sh/framework/plugins/managed/common" "infini.sh/framework/plugins/managed/common"
log "github.com/cihub/seelog"
"time" "time"
) )
@ -94,12 +97,28 @@ func dynamicAgentConfigProvider(instance model.Instance) []*common.ConfigFile {
} }
} }
if len(ids) > 0 { if len(ids) > 0 {
cfg := common.ConfigFile{} cfg := common.ConfigFile{}
cfg.Name = "generated_metrics_tasks.yml" cfg.Name = "generated_metrics_tasks.yml"
cfg.Location = "generated_metrics_tasks.yml" cfg.Location = "generated_metrics_tasks.yml"
cfg.Content = getAgentIngestConfigs(ids) cfg.Content = getAgentIngestConfigs(ids)
hash:=util.MD5digest(cfg.Content)
//if local's hash is different from remote's hash, then update local's hash, update version to current timestamp
v,err:=kv.GetValue(LastAgentHash, []byte(global.Env().SystemConfig.NodeConfig.ID))
if err!=nil||v==nil||string(v)!=hash{
err:=kv.AddValue(LastAgentHash, []byte(global.Env().SystemConfig.NodeConfig.ID), []byte(hash))
if err!=nil{
panic(err)
}
latestTimestamp=time.Now().Unix()
log.Error("local hash is different from remote's hash, update local's hash, update version to current timestamp")
}
cfg.Size = int64(len(cfg.Content)) cfg.Size = int64(len(cfg.Content))
cfg.Version = latestTimestamp cfg.Version = latestTimestamp
cfg.Managed = true cfg.Managed = true
@ -107,6 +126,8 @@ func dynamicAgentConfigProvider(instance model.Instance) []*common.ConfigFile {
result = append(result, &cfg) result = append(result, &cfg)
} }
return result return result
} }
@ -161,11 +182,12 @@ func getAgentIngestConfigs(items map[string]BindingItem) string {
} }
//password: $[[keystore.$[[CLUSTER_ID]]_password]]
buffer.WriteString("\n") buffer.WriteString("\n")
buffer.WriteString(fmt.Sprintf("#MANAGED_CONFIG_VERSION: %v\n#MANAGED: true\n",latestVersion)) buffer.WriteString(fmt.Sprintf("#MANAGED_CONFIG_VERSION: %v\n#MANAGED: true\n",latestVersion))
//password: $[[keystore.$[[CLUSTER_ID]]_password]]
return buffer.String() return buffer.String()
} }
const LastAgentHash ="last_agent_hash"