optimize nodeinfo inspect and add nodeinfo html out

kubesphere · Oct 26, 2023 · c744fff · c744fff
1 parent d7cbfca
commit c744fff
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 102 deletions.
diff --git a/apis/kubeeye/v1alpha2/inspectresult_types.go b/apis/kubeeye/v1alpha2/inspectresult_types.go
@@ -69,15 +69,15 @@ type PrometheusResult struct {
 }
 
 type NodeInfoResultItem struct {
-	Name       string          `json:"name,omitempty"`
-	FileSystem FileSystemLabel `json:",inline"`
-	Value      string          `json:"value,omitempty"`
-	Assert     bool            `json:"assert,omitempty"`
-	Level      Level           `json:"level,omitempty"`
-	NodeName   string          `json:"nodeName,omitempty"`
+	Name          string        `json:"name,omitempty"`
+	ResourcesType ResourcesType `json:",inline"`
+	Value         string        `json:"value,omitempty"`
+	Assert        bool          `json:"assert,omitempty"`
+	Level         Level         `json:"level,omitempty"`
+	NodeName      string        `json:"nodeName,omitempty"`
 }
 
-type FileSystemLabel struct {
+type ResourcesType struct {
 	Mount string `json:"mount,omitempty"`
 	Type  string `json:"type,omitempty"`
 }
@@ -88,6 +88,7 @@ type FileChangeResultItem struct {
 	Path     string   `json:"path,omitempty"`
 	Level    Level    `json:"level,omitempty"`
 	NodeName string   `json:"nodeName,omitempty"`
+	Assert   bool     `json:"assert,omitempty"`
 }
 type NodeMetricsResultItem struct {
 	Name     string  `json:"name,omitempty"`

diff --git a/apis/kubeeye/v1alpha2/inspectrule_types.go b/apis/kubeeye/v1alpha2/inspectrule_types.go
@@ -59,7 +59,8 @@ type Node struct {
 type NodeInfo struct {
 	RuleItemBases `json:",inline"`
 	Node          `json:",inline"`
-	Mount         []string `json:"mount,omitempty"`
+	ResourcesType string `json:"resourcesType,omitempty"`
+	Mount         string `json:"mount,omitempty"`
 }
 
 type FileFilterRule struct {

diff --git a/apis/kubeeye/v1alpha2/zz_generated.deepcopy.go b/apis/kubeeye/v1alpha2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/kubeeye.kubesphere.io_inspectresults.yaml b/config/crd/bases/kubeeye.kubesphere.io_inspectresults.yaml
@@ -70,6 +70,8 @@ spec:
               fileChangeResult:
                 items:
                   properties:
+                    assert:
+                      type: boolean
                     fileName:
                       type: string
                     issues:
@@ -87,6 +89,8 @@ spec:
               fileFilterResult:
                 items:
                   properties:
+                    assert:
+                      type: boolean
                     fileName:
                       type: string
                     issues:

diff --git a/config/crd/bases/kubeeye.kubesphere.io_inspectrules.yaml b/config/crd/bases/kubeeye.kubesphere.io_inspectrules.yaml
@@ -117,9 +117,7 @@ spec:
                     level:
                       type: string
                     mount:
-                      items:
-                        type: string
-                      type: array
+                      type: string
                     name:
                       type: string
                     nodeName:
@@ -128,6 +126,8 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
+                    resourcesType:
+                      type: string
                     rule:
                       type: string
                   type: object

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -25,6 +25,7 @@ rules:
   resources:
   - namespaces
   - nodes
+  - secrets
   - services
   verbs:
   - get

diff --git a/deploy/kubeeye_v1alpha2_inspectplan.yaml b/deploy/kubeeye_v1alpha2_inspectplan.yaml
@@ -7,3 +7,11 @@ spec:
   ruleNames:
     - name: inspect-rule-namespace
     - name: inspect-rule-systemd
+    - name: inspect-rule-filechange
+    - name: inspect-rule-filter-file
+    - name: inspect-rule-node-info
+    - name: inspect-rule-prometheus
+    - name: inspect-rule-sbnormalpodstatus
+    - name: inspect-rule-sysctl
+  timeout: 30m
+
diff --git a/pkg/controllers/inspectresult_controller.go b/pkg/controllers/inspectresult_controller.go
@@ -140,6 +140,7 @@ func (r *InspectResultReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		klog.Error("Failed to update inspect result status", err)
 		return ctrl.Result{}, err
 	}
+
 	go r.SendMessage(ctx, result)
 	return ctrl.Result{}, nil
 }
@@ -251,7 +252,7 @@ func (r *InspectResultReconciler) SendMessage(ctx context.Context, result *kubee
 	messageHandler := message.NewEmailMessageOptions(&kc.Message.Email, r.Client)
 	dispatcher := message.RegisterHandler(messageHandler)
 	dispatcher.DispatchMessageEvent(&conf.MessageEvent{
-		Title:     fmt.Sprintf("巡检完成,共发现%d个问题", n),
+		Title:     fmt.Sprintf("%s集群巡检完成,共发现%d个问题", result.Spec.InspectCluster.Name, n),
 		Timestamp: time.Now(),
 		Content:   data.Bytes(),
 	})

diff --git a/pkg/controllers/inspecttask_controller.go b/pkg/controllers/inspecttask_controller.go
@@ -57,7 +57,7 @@ type InspectTaskReconciler struct {
 //+kubebuilder:rbac:groups=cluster.kubesphere.io,resources=clusters,verbs=get
 //+kubebuilder:rbac:groups=kubeeye.kubesphere.io,resources=inspecttasks/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=kubeeye.kubesphere.io,resources=inspecttasks/finalizers,verbs=update
-//+kubebuilder:rbac:groups="",resources=nodes;namespaces;services,verbs=list;get
+//+kubebuilder:rbac:groups="",resources=nodes;namespaces;services;secrets,verbs=list;get
 //+kubebuilder:rbac:groups="",resources=namespaces,verbs=create
 //+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete
 //+kubebuilder:rbac:groups="",resources=configmaps,verbs=deletecollection;list;get;watch

diff --git a/pkg/inspect/file_change_Inspect.go b/pkg/inspect/file_change_Inspect.go
@@ -82,6 +82,7 @@ func (o *fileChangeInspect) RunInspect(ctx context.Context, rules []kubeeyev1alp
 			klog.Errorf("Failed to open base file path:%s,error:%s", baseFile, fileErr)
 			resultItem.Issues = []string{fmt.Sprintf("%s:The file does not exist", file.Name)}
 			resultItem.Level = file.Level
+			resultItem.Assert = true
 			fileResults = append(fileResults, resultItem)
 			continue
 		}
@@ -95,6 +96,7 @@ func (o *fileChangeInspect) RunInspect(ctx context.Context, rules []kubeeyev1alp
 				if createErr != nil {
 					resultItem.Issues = []string{fmt.Sprintf("%s:create configMap failed", file.Name)}
 					resultItem.Level = file.Level
+					resultItem.Assert = true
 					fileResults = append(fileResults, resultItem)
 				}
 				continue
@@ -112,6 +114,7 @@ func (o *fileChangeInspect) RunInspect(ctx context.Context, rules []kubeeyev1alp
 		resultItem.Issues = diffResult
 		if len(resultItem.Issues) > 0 {
 			resultItem.Level = file.Level
+			resultItem.Assert = true
 		}
 		fileResults = append(fileResults, resultItem)
 	}

diff --git a/pkg/inspect/file_filter_inspect.go b/pkg/inspect/file_filter_inspect.go
@@ -78,6 +78,7 @@ func (o *fileFilterInspect) RunInspect(ctx context.Context, rules []kubeeyev1alp
 				klog.Errorf(" Failed to open file . err:%s", err)
 				filterR.Issues = append(filterR.Issues, fmt.Sprintf("Failed to open file for %s.", rule.Name))
 				filterR.Level = rule.Level
+				filterR.Assert = true
 				filterResult = append(filterResult, filterR)
 				continue
 			}
@@ -94,6 +95,7 @@ func (o *fileFilterInspect) RunInspect(ctx context.Context, rules []kubeeyev1alp
 				}
 			}
 			if len(filterR.Issues) > 0 {
+				filterR.Assert = true
 				filterR.Level = rule.Level
 			}
 			filterResult = append(filterResult, filterR)
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ rules: @@
       resources:
       - namespaces
       - nodes
+      - secrets
       - services
       verbs:
       - get
@@ Expand Down @@