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 b01d46ee [horus] Change QL naming (#376)
b01d46ee is described below
commit b01d46ee2ee688bfd868fe42774af03d5bc5f227
Author: mfordjody <[email protected]>
AuthorDate: Tue Sep 24 16:07:29 2024 +0800
[horus] Change QL naming (#376)
fix typo
---
app/horus/basic/config/file.go | 4 ++--
app/horus/core/horuser/downtime.go | 4 ++--
app/horus/core/horuser/modular.go | 2 +-
deploy/horus/horus.yaml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/horus/basic/config/file.go b/app/horus/basic/config/file.go
index 2cef8000..8706ffc4 100644
--- a/app/horus/basic/config/file.go
+++ b/app/horus/basic/config/file.go
@@ -57,7 +57,7 @@ type RecoveryConfiguration struct {
type ModularConfiguration struct {
Enabled bool `yaml:"enabled"`
CordonDailyLimit map[string]int `yaml:"cordonDailyLimit"`
- CheckQL map[string]string `yaml:"checkQL"`
+ AbnormalityQL map[string]string `yaml:"abnormalityQL"`
RecoveryQL map[string]string `yaml:"recoveryQL"`
CheckIntervalSecond int `yaml:"checkIntervalSecond"`
PromQueryTimeSecond int64 `yaml:"promQueryTimeSecond"`
@@ -71,7 +71,7 @@ type DowntimeConfiguration struct {
CheckIntervalSecond int `yaml:"checkIntervalSecond"`
PromQueryTimeSecond int64 `yaml:"promQueryTimeSecond"`
KubeMultiple map[string]string `yaml:"kubeMultiple"`
- CheckQL []string `yaml:"checkQL"`
+ AbnormalityQL []string `yaml:"abnormalityQL"`
NodeNameToIPs string `yaml:"nodeNameToIPs"`
DingTalk *DingTalkConfiguration `yaml:"dingTalk"`
}
diff --git a/app/horus/core/horuser/downtime.go
b/app/horus/core/horuser/downtime.go
index 126c3a9d..16b1e7b4 100644
--- a/app/horus/core/horuser/downtime.go
+++ b/app/horus/core/horuser/downtime.go
@@ -60,8 +60,8 @@ func (h *Horuser) DownTimeCheck(ctx context.Context) {
func (h *Horuser) DownTimeNodes(clusterName, addr string) {
klog.Infof("DownTimeNodes Query Start clusterName:%v", clusterName)
nodeDownTimeRes := make(map[string]int)
- cq := len(h.cc.NodeDownTime.CheckQL)
- for _, ql := range h.cc.NodeDownTime.CheckQL {
+ cq := len(h.cc.NodeDownTime.AbnormalityQL)
+ for _, ql := range h.cc.NodeDownTime.AbnormalityQL {
ql := ql
res, err := h.InstantQuery(addr, ql, clusterName,
h.cc.NodeDownTime.PromQueryTimeSecond)
if err != nil {
diff --git a/app/horus/core/horuser/modular.go
b/app/horus/core/horuser/modular.go
index bcb6b322..e8fe19e3 100644
--- a/app/horus/core/horuser/modular.go
+++ b/app/horus/core/horuser/modular.go
@@ -50,7 +50,7 @@ func (h *Horuser) CustomizeModular(ctx context.Context) {
func (h *Horuser) CustomizeModularOnCluster(clusterName, addr string) {
klog.Infof("CustomizeModularOnCluster Start clusterName:%v",
clusterName)
- for moduleName, checkql := range h.cc.CustomModular.CheckQL {
+ for moduleName, checkql := range h.cc.CustomModular.AbnormalityQL {
ql := checkql
vecs, err := h.InstantQuery(addr, ql, clusterName,
h.cc.CustomModular.PromQueryTimeSecond)
if err != nil {
diff --git a/deploy/horus/horus.yaml b/deploy/horus/horus.yaml
index 53d6cc37..58f36fa9 100644
--- a/deploy/horus/horus.yaml
+++ b/deploy/horus/horus.yaml
@@ -55,7 +55,7 @@ customModular:
enabled: false
cordonDailyLimit:
filesystem_readonly: 1
- checkQL:
+ abnormalityQL:
filesystem_readonly: |-
node_filesystem_readonly{mountpoint="/"} != 1
recoveryQL:
@@ -77,7 +77,7 @@ nodeDownTime:
enabled: true
checkIntervalSecond: 5
promQueryTimeSecond: 60
- checkQL:
+ abnormalityQL:
- node_disk_info
- node_cpu_guest_seconds_total
nodeNameToIPs:
