Merge pull request #515 from didi/master

merge master

km-console/packages/config-manager-fe/package.json

@@ -36,7 +36,8 @@
     "react-intl": "^3.2.1",
     "react-router-cache-route": "^1.11.1",
     "single-spa": "^5.8.0",
-    "single-spa-react": "^2.14.0"
+    "single-spa-react": "^2.14.0",
+    "knowdesign": "1.3.7"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.6.2",
@@ -54,7 +55,6 @@
     "@babel/preset-env": "^7.4.2",
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.14.5",
-    "knowdesign": "^1.3.6",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@types/lodash": "^4.14.138",
     "@types/react-dom": "^17.0.5",

km-console/packages/layout-clusters-fe/package.json

@@ -58,7 +58,8 @@
     "react-joyride": "^2.5.0",
     "single-spa": "5.9.3",
     "single-spa-react": "2.14.0",
-    "webpack-bundle-analyzer": "^4.5.0"
+    "webpack-bundle-analyzer": "^4.5.0",
+    "knowdesign": "1.3.7"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",
@@ -74,7 +75,6 @@
     "@babel/preset-env": "^7.4.2",
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.14.5",
-    "knowdesign": "^1.3.6",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@types/crypto-js": "^4.1.0",
     "@types/lodash": "^4.14.171",

km-dist/helm/templates/configmap.yaml

@@ -78,17 +78,17 @@ data:
     thread-pool:
       scheduled:
         thread-num: 2 # @Scheduled任务的线程池大小，默认是一个
-      collector:
-        future-util:
-          num: 1
-          thread-num: 8
-          queue-size: 10000
-          select-suitable-enable: true
-          suitable-queue-size: 1000
-      task:
-        heaven:
-          thread-num: 20
-          queue-size: 1000
+      collector:                      # 采集模块的配置
+        future-util:                  # 采集模块线程池配置
+          num: 3                      # 线程池个数
+          thread-num: 64              # 每个线程池核心线程数
+          queue-size: 10000           # 每个线程池队列大小
+          select-suitable-enable: true # 任务是否自动选择合适的线程池，非主要，可不修改
+          suitable-queue-size: 1000    # 线程池理想的队列大小，非主要，可不修改
+      task:                            # 任务模块的配置
+        heaven:                        # 采集任务配置
+          thread-num: 20               # 采集任务线程池核心线程数
+          queue-size: 1000             # 采集任务线程池队列大小
 
 
 
@@ -118,6 +118,9 @@ data:
           base-path: /metrics
           exposure:
             include: '*'
+      health:
+        elasticsearch:
+          enabled: false
       metrics:
         export:
           prometheus: