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 835e4020 [horus] Optimize directory structure (#418)
835e4020 is described below
commit 835e40204def7f54773491a870b10fb3dbb1d855
Author: mfordjody <[email protected]>
AuthorDate: Thu Oct 3 11:38:57 2024 +0800
[horus] Optimize directory structure (#418)
---
app/horus/{basic/config/file.go => base/config/config.go} | 0
app/horus/{basic/config/flag.go => base/config/parse.go} | 0
app/horus/{basic => base}/db/db.go | 2 +-
app/horus/{basic => base}/db/db_test.go | 4 ++--
app/horus/{basic => base}/db/sql.tpl | 0
app/horus/cmd/main.go | 4 ++--
app/horus/core/{alert => alerter}/dingtalk.go | 4 ++--
app/horus/core/{alert => alerter}/dingtalk_test.go | 8 ++++----
app/horus/core/{alert => alerter}/slack.go | 4 ++--
app/horus/core/{alert => alerter}/slack_test.go | 8 ++++----
app/horus/core/horuser/horuser.go | 2 +-
app/horus/core/horuser/{query.go => instant_query.go} | 0
app/horus/core/horuser/node_downtime.go | 6 +++---
app/horus/core/horuser/node_modular.go | 12 ++++++------
app/horus/core/horuser/node_recovery.go | 8 ++++----
app/horus/core/horuser/node_restart.go | 6 +++---
app/horus/core/horuser/pod_abnormal.go | 6 +++---
17 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/app/horus/basic/config/file.go b/app/horus/base/config/config.go
similarity index 100%
rename from app/horus/basic/config/file.go
rename to app/horus/base/config/config.go
diff --git a/app/horus/basic/config/flag.go b/app/horus/base/config/parse.go
similarity index 100%
rename from app/horus/basic/config/flag.go
rename to app/horus/base/config/parse.go
diff --git a/app/horus/basic/db/db.go b/app/horus/base/db/db.go
similarity index 98%
rename from app/horus/basic/db/db.go
rename to app/horus/base/db/db.go
index 50e95242..a89e0392 100644
--- a/app/horus/basic/db/db.go
+++ b/app/horus/base/db/db.go
@@ -17,7 +17,7 @@ package db
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
_ "github.com/go-sql-driver/mysql"
"time"
"xorm.io/xorm"
diff --git a/app/horus/basic/db/db_test.go b/app/horus/base/db/db_test.go
similarity index 92%
rename from app/horus/basic/db/db_test.go
rename to app/horus/base/db/db_test.go
index a0083ea9..90438c9a 100644
--- a/app/horus/basic/db/db_test.go
+++ b/app/horus/base/db/db_test.go
@@ -16,8 +16,8 @@
package db_test
import (
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
"testing"
"time"
)
diff --git a/app/horus/basic/db/sql.tpl b/app/horus/base/db/sql.tpl
similarity index 100%
rename from app/horus/basic/db/sql.tpl
rename to app/horus/base/db/sql.tpl
diff --git a/app/horus/cmd/main.go b/app/horus/cmd/main.go
index 45032156..ede39ffc 100644
--- a/app/horus/cmd/main.go
+++ b/app/horus/cmd/main.go
@@ -18,8 +18,8 @@ package main
import (
"context"
"flag"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
"github.com/apache/dubbo-kubernetes/app/horus/core/horuser"
"github.com/apache/dubbo-kubernetes/app/horus/core/ticker"
"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/app/horus/core/alert/dingtalk.go
b/app/horus/core/alerter/dingtalk.go
similarity index 96%
rename from app/horus/core/alert/dingtalk.go
rename to app/horus/core/alerter/dingtalk.go
index d012d604..8194e66c 100644
--- a/app/horus/core/alert/dingtalk.go
+++ b/app/horus/core/alerter/dingtalk.go
@@ -13,13 +13,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package alert
+package alerter
import (
"bytes"
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
"k8s.io/klog/v2"
"net/http"
)
diff --git a/app/horus/core/alert/dingtalk_test.go
b/app/horus/core/alerter/dingtalk_test.go
similarity index 85%
rename from app/horus/core/alert/dingtalk_test.go
rename to app/horus/core/alerter/dingtalk_test.go
index adfd62c4..698cdfcf 100644
--- a/app/horus/core/alert/dingtalk_test.go
+++ b/app/horus/core/alerter/dingtalk_test.go
@@ -13,11 +13,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package alert_test
+package alerter_test
import (
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"testing"
)
@@ -27,5 +27,5 @@ func TestDingTalkSend(t *testing.T) {
Title: "",
AtMobiles: nil,
}
- alert.DingTalkSend(im, "test")
+ alerter.DingTalkSend(im, "test")
}
diff --git a/app/horus/core/alert/slack.go b/app/horus/core/alerter/slack.go
similarity index 94%
rename from app/horus/core/alert/slack.go
rename to app/horus/core/alerter/slack.go
index b2f8b478..118036fb 100644
--- a/app/horus/core/alert/slack.go
+++ b/app/horus/core/alerter/slack.go
@@ -13,13 +13,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package alert
+package alerter
import (
"bytes"
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
"k8s.io/klog/v2"
"net/http"
)
diff --git a/app/horus/core/alert/slack_test.go
b/app/horus/core/alerter/slack_test.go
similarity index 85%
rename from app/horus/core/alert/slack_test.go
rename to app/horus/core/alerter/slack_test.go
index 48325861..f3bb4ac5 100644
--- a/app/horus/core/alert/slack_test.go
+++ b/app/horus/core/alerter/slack_test.go
@@ -13,11 +13,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package alert_test
+package alerter_test
import (
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"testing"
)
@@ -25,5 +25,5 @@ func TestSlackSend(t *testing.T) {
im := &config.SlackConfiguration{
WebhookUrl:
"https://hooks.slack.com/services/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";,
}
- alert.SlackSend(im, "test")
+ alerter.SlackSend(im, "test")
}
diff --git a/app/horus/core/horuser/horuser.go
b/app/horus/core/horuser/horuser.go
index fa1c66b8..a1021d99 100644
--- a/app/horus/core/horuser/horuser.go
+++ b/app/horus/core/horuser/horuser.go
@@ -17,7 +17,7 @@ package horuser
import (
"context"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/config"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/config"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
diff --git a/app/horus/core/horuser/query.go
b/app/horus/core/horuser/instant_query.go
similarity index 100%
rename from app/horus/core/horuser/query.go
rename to app/horus/core/horuser/instant_query.go
diff --git a/app/horus/core/horuser/node_downtime.go
b/app/horus/core/horuser/node_downtime.go
index 5451b83b..571904e2 100644
--- a/app/horus/core/horuser/node_downtime.go
+++ b/app/horus/core/horuser/node_downtime.go
@@ -18,8 +18,8 @@ package horuser
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
@@ -150,7 +150,7 @@ func (h *Horuser) DownTimeNodes(clusterName, addr string) {
newfound++
if newfound > 0 {
klog.Infof("DownTimeNodes get
WithDownNodeIPs【集群:%v】【节点:%v】【IP:%v】", clusterName, nodeName, nodeIP)
- alert.DingTalkSend(h.cc.NodeDownTime.DingTalk, msg)
+ alerter.DingTalkSend(h.cc.NodeDownTime.DingTalk, msg)
}
msg += fmt.Sprintf("node:%v ip:%v", nodeName, nodeIP)
write.Reason = NODE_DOWN_REASON
diff --git a/app/horus/core/horuser/node_modular.go
b/app/horus/core/horuser/node_modular.go
index c2abf777..7a178231 100644
--- a/app/horus/core/horuser/node_modular.go
+++ b/app/horus/core/horuser/node_modular.go
@@ -18,8 +18,8 @@ package horuser
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
"sync"
@@ -117,15 +117,15 @@ func (h *Horuser) CustomizeModularNodes(clusterName,
moduleName, nodeName, ip st
}
msg := fmt.Sprintf("\n【集群:%v】\n【发现 %s 达到禁止调度条件】\n【禁止调度节点:%v】\n 【处理结果:
%v】\n 【今日操作次数:%v】\n",
clusterName, moduleName, nodeName, res, len(data)+1)
- alert.DingTalkSend(h.cc.CustomModular.DingTalk, msg)
- alert.SlackSend(h.cc.CustomModular.Slack, msg)
+ alerter.DingTalkSend(h.cc.CustomModular.DingTalk, msg)
+ alerter.SlackSend(h.cc.CustomModular.Slack, msg)
dailyLimit := h.cc.CustomModular.CordonDailyLimit[moduleName]
if len(data) > dailyLimit {
msg := fmt.Sprintf("\n【日期:%v】\n【集群:%v\n】\n【今日 Cordon 节点数:
%v】\n【已达到今日上限: %v】\n【节点:%v】",
data, clusterName, len(data), dailyLimit, nodeName)
- alert.DingTalkSend(h.cc.CustomModular.DingTalk, msg)
- alert.SlackSend(h.cc.CustomModular.Slack, msg)
+ alerter.DingTalkSend(h.cc.CustomModular.DingTalk, msg)
+ alerter.SlackSend(h.cc.CustomModular.Slack, msg)
return
}
diff --git a/app/horus/core/horuser/node_recovery.go
b/app/horus/core/horuser/node_recovery.go
index a4df7e6b..9aff74e9 100644
--- a/app/horus/core/horuser/node_recovery.go
+++ b/app/horus/core/horuser/node_recovery.go
@@ -18,8 +18,8 @@ package horuser
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"github.com/gammazero/workerpool"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
@@ -80,8 +80,8 @@ func (h *Horuser) recoveryNodes(n db.NodeDataInfo) {
res = fmt.Sprintf("failed:%v", err)
}
msg := fmt.Sprintf("\n【集群: %v】\n【封锁节点恢复调度】\n【已恢复调度节点:
%v】\n【处理结果：%v】\n【日期: %v】\n", n.ClusterName, n.NodeName, res, n.CreateTime)
- alert.DingTalkSend(h.cc.NodeRecovery.DingTalk, msg)
- alert.SlackSend(h.cc.CustomModular.Slack, msg)
+ alerter.DingTalkSend(h.cc.NodeRecovery.DingTalk, msg)
+ alerter.SlackSend(h.cc.CustomModular.Slack, msg)
pass, err := n.RecoveryMarker()
klog.Infof("RecoveryMarker result pass:%v err:%v", pass, err)
diff --git a/app/horus/core/horuser/node_restart.go
b/app/horus/core/horuser/node_restart.go
index c4eb13a9..cb9f3963 100644
--- a/app/horus/core/horuser/node_restart.go
+++ b/app/horus/core/horuser/node_restart.go
@@ -18,8 +18,8 @@ package horuser
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"github.com/gammazero/workerpool"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
@@ -68,7 +68,7 @@ func (h *Horuser) TryRestart(node db.NodeDataInfo) {
if pass {
msg :=
fmt.Sprintf("\n【等待宕机节点腾空后重启】\n【节点:%v】\n【日期:%v】\n【集群:%v】\n", node.NodeName,
node.FirstDate, node.ClusterName)
- alert.DingTalkSend(h.cc.NodeDownTime.DingTalk, msg)
+ alerter.DingTalkSend(h.cc.NodeDownTime.DingTalk, msg)
cmd := exec.Command("/bin/bash", "core/horuser/restart.sh",
node.NodeIP, h.cc.NodeDownTime.AllSystemUser,
h.cc.NodeDownTime.AllSystemPassword)
output, err := cmd.CombinedOutput()
diff --git a/app/horus/core/horuser/pod_abnormal.go
b/app/horus/core/horuser/pod_abnormal.go
index 6dd626a4..e925a302 100644
--- a/app/horus/core/horuser/pod_abnormal.go
+++ b/app/horus/core/horuser/pod_abnormal.go
@@ -18,8 +18,8 @@ package horuser
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/app/horus/basic/db"
- "github.com/apache/dubbo-kubernetes/app/horus/core/alert"
+ "github.com/apache/dubbo-kubernetes/app/horus/base/db"
+ "github.com/apache/dubbo-kubernetes/app/horus/core/alerter"
"github.com/gammazero/workerpool"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/wait"
@@ -113,7 +113,7 @@ func (h *Horuser) PodSingle(pod corev1.Pod, clusterName
string) {
}
today := time.Now().Format("2006-01-02")
msg := fmt.Sprintf("\n【集群：%v】\n【Pod：%v】\n【Namespace：%v】\n【清除
finalizer:%v】\n", clusterName, pod.Name, pod.Namespace, res)
- alert.DingTalkSend(h.cc.PodAbnormal.DingTalk, msg)
+ alerter.DingTalkSend(h.cc.PodAbnormal.DingTalk, msg)
write := db.PodDataInfo{
PodName: pod.Name,
PodIP: pod.Status.PodIP,
