增加模块入口控制

CloudmindsRobot · Jan 29, 2021 · 151e351 · 151e351
1 parent eb5de3a
commit 151e351
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/backend/controllers/settings.go b/backend/controllers/settings.go
@@ -15,12 +15,13 @@ import (
 // @Success 200 {string} string	"{}"
 // @Router /api/v1/loki/settings/load/ [get]
 func LoadSettings(c *gin.Context) {
-	allowSignUp, err := runtime.Cfg.Bool("users", "allow_sign_up")
-	if err != nil {
-		c.AbortWithStatusJSON(400, gin.H{"success": false, "message": fmt.Sprintf("配置加载失败：%s", err.Error())})
+	allowSignUp, errSign := runtime.Cfg.Bool("users", "allow_sign_up")
+	alertEnabled, errAlert := runtime.Cfg.Bool("global", "alert_enabled")
+	if errSign != nil || errAlert != nil {
+		c.AbortWithStatusJSON(400, gin.H{"success": false, "message": fmt.Sprintf("配置加载失败")})
 		return
 	}
 
-	c.AbortWithStatusJSON(200, gin.H{"success": true, "data": map[string]interface{}{"allowSignUp": allowSignUp}})
+	c.AbortWithStatusJSON(200, gin.H{"success": true, "data": map[string]interface{}{"allowSignUp": allowSignUp, "alertEnabled": alertEnabled}})
 	return
 }
diff --git a/backend/dagger.ini b/backend/dagger.ini
@@ -2,6 +2,8 @@
 debug = true
 ; 邮件接收者，仅当未开启用户注册时生效
 to = 
+alert_enabled = true
+; 是否需要告警模块
 
 [users]
 ; 允许注册

diff --git a/production/config/dagger.ini b/production/config/dagger.ini
@@ -2,6 +2,8 @@
 debug = false
 ; 邮件接收者，仅当未开启用户注册时生效
 to = 
+alert_enabled = true
+; 是否需要告警模块
 
 [users]
 ; 允许注册

diff --git a/production/kubernetes/dagger-kubernetes-install.yaml b/production/kubernetes/dagger-kubernetes-install.yaml
@@ -5,6 +5,7 @@ data:
     debug = false
     ; 邮件接收者，仅当未开启用户注册时生效
     to = 
+    alert_enabled = true
 
     [users]
     ; 允许注册

diff --git a/ui/src/components/BaseSidebar.vue b/ui/src/components/BaseSidebar.vue
@@ -86,7 +86,7 @@ export default {
   computed: {
     ...mapState(['sidebar', 'app', 'settings']),
     items() {
-      return DrawerItems(this.settings.allowSignUp).children
+      return DrawerItems(this.settings).children
     },
   },
   mounted() {

diff --git a/ui/src/components/DrawerItems.js b/ui/src/components/DrawerItems.js
@@ -1,6 +1,6 @@
-function DrawerItems(signUp) {
+function DrawerItems(settings) {
   let alertBar = []
-  if (signUp) {
+  if (settings.allowSignUp) {
     alertBar = [
       {
         text: '告警事件',
@@ -42,7 +42,7 @@ function DrawerItems(signUp) {
       },
     ]
   }
-  return {
+  const items = {
     text: 'logs',
     icon: 'notes',
     children: [
@@ -79,19 +79,24 @@ function DrawerItems(signUp) {
           },
         ],
       },
-      {
-        heading: 'ALERTS',
-      },
-      {
-        icon: 'keyboard_arrow_up',
-        'icon-alt': 'warning',
-        text: '告警',
-        model: false,
-        index: 'loki-alert',
-        children: alertBar,
-      },
     ],
   }
+
+  if (settings.alertEnabled) {
+    items.children.push({
+      heading: 'ALERTS',
+    })
+    items.children.push({
+      icon: 'keyboard_arrow_up',
+      'icon-alt': 'warning',
+      text: '告警',
+      model: false,
+      index: 'loki-alert',
+      children: alertBar,
+    })
+  }
+
+  return items
 }
 
 export default DrawerItems