This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 2074e0f1 [horus] make superior horus main and alerter (#436)
2074e0f1 is described below
commit 2074e0f1a90159b43100baf87918c3c76194d4ca
Author: mfordjody <[email protected]>
AuthorDate: Mon Oct 7 10:41:47 2024 +0800
[horus] make superior horus main and alerter (#436)
---
app/horus/base/db/{sql.tpl => table.sql} | 0
app/horus/cmd/main.go | 24 +++++++-----------------
app/horus/core/alerter/slack.go | 5 ++---
app/horus/core/alerter/slack_test.go | 1 +
4 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/app/horus/base/db/sql.tpl b/app/horus/base/db/table.sql
similarity index 100%
rename from app/horus/base/db/sql.tpl
rename to app/horus/base/db/table.sql
diff --git a/app/horus/cmd/main.go b/app/horus/cmd/main.go
index 2b579fcc..8b3e4a76 100644
--- a/app/horus/cmd/main.go
+++ b/app/horus/cmd/main.go
@@ -73,15 +73,6 @@ func main() {
}
}
})
- group.Add(func() error {
- for {
- select {
- case <-stopChan:
- cancel()
- return nil
- }
- }
- })
group.Add(func() error {
http.Handle("/metrics", promhttp.Handler())
srv := http.Server{Addr: c.Address}
@@ -92,10 +83,10 @@ func main() {
return nil
})
group.Add(func() error {
- klog.Info("horus ticker start success.")
+ klog.Info("horus ticker manager start success.")
err := ticker.Manager(ctx)
if err != nil {
- klog.Errorf("horus ticker start failed error:%v", err)
+ klog.Errorf("horus ticker manager start failed err:%v",
err)
}
return nil
})
@@ -104,7 +95,7 @@ func main() {
klog.Info("horus node recovery manager start success.")
err := horus.RecoveryManager(ctx)
if err != nil {
- klog.Errorf("horus recovery manager start
failed error:%v", err)
+ klog.Errorf("horus node recovery manager start
failed err:%v", err)
}
}
return nil
@@ -114,7 +105,7 @@ func main() {
klog.Info("horus node customize modular manager start
success.")
err := horus.CustomizeModularManager(ctx)
if err != nil {
- klog.Errorf("horus customize modular manager
start failed error:%v", err)
+ klog.Errorf("horus node customize modular
manager start failed err:%v", err)
}
}
return nil
@@ -124,7 +115,7 @@ func main() {
klog.Info("horus node downtime manager start success.")
err := horus.DownTimeManager(ctx)
if err != nil {
- klog.Errorf("horus down time manager start
failed error:%v", err)
+ klog.Errorf("horus node downtime manager start
failed err:%v", err)
}
}
return nil
@@ -134,18 +125,17 @@ func main() {
klog.Info("horus node downtime restart manager start
success.")
err := horus.DowntimeRestartManager(ctx)
if err != nil {
- klog.Errorf("horus down time restart manager
start failed error:%v", err)
+ klog.Errorf("horus node downtime restart
manager start failed err:%v", err)
}
}
return nil
-
})
group.Add(func() error {
if c.PodStagnationCleaner.Enabled {
klog.Info("horus pod stagnation clean manager start
success.")
err := horus.PodStagnationCleanManager(ctx)
if err != nil {
- klog.Errorf("horus pod stagnation clean manager
start failed error:%v", err)
+ klog.Errorf("horus pod stagnation clean manager
start failed err:%v", err)
}
}
return nil
diff --git a/app/horus/core/alerter/slack.go b/app/horus/core/alerter/slack.go
index c1d45935..0a2db187 100644
--- a/app/horus/core/alerter/slack.go
+++ b/app/horus/core/alerter/slack.go
@@ -30,11 +30,10 @@ type Text struct {
func SlackSend(sk *config.SlackConfiguration, channel string) {
skm := Text{Text: "text"}
- skm.Text = fmt.Sprintf("%s"+
- "%v", sk.Title, channel)
+ skm.Text = fmt.Sprintf("%s"+"%v", sk.Title, channel)
bs, err := json.Marshal(skm)
if err != nil {
- klog.Errorf("slack json marshal err:%v\n dtm:%v\n", err, skm)
+ klog.Errorf("slack json marshal err:%v\n skm:%v\n", err, skm)
}
res, err := http.Post(sk.WebhookUrl, "application/json",
bytes.NewBuffer(bs))
if res.StatusCode != 200 {
diff --git a/app/horus/core/alerter/slack_test.go
b/app/horus/core/alerter/slack_test.go
index f3bb4ac5..8e8378be 100644
--- a/app/horus/core/alerter/slack_test.go
+++ b/app/horus/core/alerter/slack_test.go
@@ -24,6 +24,7 @@ import (
func TestSlackSend(t *testing.T) {
im := &config.SlackConfiguration{
WebhookUrl:
"https://hooks.slack.com/services/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";,
+ Title: "",
}
alerter.SlackSend(im, "test")
}
