This is an automated email from the ASF dual-hosted git repository.

gongchao pushed a commit to branch v1.6.1-update
in repository https://gitbox.apache.org/repos/asf/hertzbeat-helm-chart.git

commit 5095bc7cdd04efc48d416ba34266aab0f2c7f7db
Author: tomsun28 <[email protected]>
AuthorDate: Wed Nov 6 22:48:34 2024 +0800

    [release] release hertzbeat v1.6.1
    
    Signed-off-by: tomsun28 <[email protected]>
---
 README.md                                          |  3 +-
 charts/hertzbeat/Chart.yaml                        |  4 +--
 charts/hertzbeat/README.md                         |  3 +-
 .../hertzbeat/templates/collector/configmap.yaml   |  6 +++-
 charts/hertzbeat/templates/manager/configmap.yaml  | 33 +++++++++++-----------
 docs/README.md                                     |  3 +-
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 3cfe1c4..f5838f0 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,8 @@ helm uninstall hertzbeat
 
 ## Configuration
 
-The following table lists the configurable parameters of the HertzBeat chart 
and the default values.
+The following table lists the configurable parameters of the HertzBeat chart 
and the default values.  
+Config Parameter via `--set`, eg: `--set expose.type=NodePort`
 
 | Parameter                             | Description                          
                                                                                
                                                                                
           | Default         |
 
|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
diff --git a/charts/hertzbeat/Chart.yaml b/charts/hertzbeat/Chart.yaml
index 9bedb39..c3ee65e 100644
--- a/charts/hertzbeat/Chart.yaml
+++ b/charts/hertzbeat/Chart.yaml
@@ -29,9 +29,9 @@ icon: 
https://raw.githubusercontent.com/apache/hertzbeat/master/home/static/img/
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.0
+version: 1.6.1
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.6.0"
+appVersion: "v1.6.1"
diff --git a/charts/hertzbeat/README.md b/charts/hertzbeat/README.md
index e757cc6..b5e0437 100644
--- a/charts/hertzbeat/README.md
+++ b/charts/hertzbeat/README.md
@@ -90,7 +90,8 @@ helm uninstall hertzbeat
 
 ## Configuration
 
-The following table lists the configurable parameters of the HertzBeat chart 
and the default values.
+The following table lists the configurable parameters of the HertzBeat chart 
and the default values.  
+Config Parameter via `--set`, eg: `--set expose.type=NodePort`
 
 | Parameter                             | Description                          
                                                                                
                                                                                
           | Default         |
 
|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
diff --git a/charts/hertzbeat/templates/collector/configmap.yaml 
b/charts/hertzbeat/templates/collector/configmap.yaml
index 94345ab..34207bb 100644
--- a/charts/hertzbeat/templates/collector/configmap.yaml
+++ b/charts/hertzbeat/templates/collector/configmap.yaml
@@ -46,15 +46,19 @@ data:
           on-profile: cluster
     
     collector:
+      info:
+        version: ${COLLECTOR_VERSION:1.6.1}
+        ip: ${COLLECTOR_IP:}
       dispatch:
         entrance:
           netty:
             enabled: true
             identity: ${IDENTITY:}
             mode: ${MODE:public}
-            manager-host: ${MANAGER_HOST:127.0.0.1}
+            manager-host: ${MANAGER_HOST:}
             manager-port: ${MANAGER_PORT:1158}
     
     common:
       queue:
         type: netty
+        
diff --git a/charts/hertzbeat/templates/manager/configmap.yaml 
b/charts/hertzbeat/templates/manager/configmap.yaml
index b7f1fa7..cd83057 100644
--- a/charts/hertzbeat/templates/manager/configmap.yaml
+++ b/charts/hertzbeat/templates/manager/configmap.yaml
@@ -96,14 +96,11 @@ data:
           - classpath:db/migration/{vendor}    
       mail:
         # Attention: this is mail server address.
-        # 请注意此为邮件服务器地址:qq邮箱为 smtp.qq.com qq 企业邮箱为 smtp.exmail.qq.com
         host: smtp.qq.com
         username: [email protected]
         # Attention: this is not email account password, this requires an 
email authorization code
-        # 请注意此非邮箱账户密码 此需填写邮箱授权码
         password: your-password
         #Attention: Tencent mail smtps 465,smtp 587
-        #请注意腾讯邮箱465为smtps,587为smtp
         port: 587
         properties:
           mail:
@@ -114,18 +111,11 @@ data:
     
     common:
       queue:
-        # memory or kafka
         type: memory
-        # properties when queue type is kafka
-        kafka:
-          servers: 127.0.0.1:9092
-          metrics-data-topic: async-metrics-data
-          alerts-data-topic: async-alerts-data
     
     warehouse:
       store:
         # store history metrics data, enable only one below
-        # 存储历史数据方式, 下方只能enabled启用一种方式
         jpa:
           enabled: false
         victoria-metrics:
@@ -162,21 +152,26 @@ data:
           expire-time: '30d'
           replication: 1
     
-        # store real-time metrics data, enable only one below
-        # 存储实时数据方式, 下方只能enabled启用一种方式
+      # store real-time metrics data, enable only one below
+      real-time:
         memory:
           enabled: true
           init-size: 16
         redis:
           enabled: false
-          host: 127.0.0.1
-          port: 6379
+          # redis mode: single, sentinel, cluster. Default is single
+          mode: single
+          # separate each address with comma when using cluster mode, eg: 
127.0.0.1:6379,127.0.0.1:6380
+          address: 127.0.0.1:6379
+          # enter master name when using sentinel mode
+          masterName: mymaster
           password: 123456
+          # redis db index, default: DB0
           db: 0
     
     alerter:
       # custom console url
-      console-url: https://console.tancloud.cn
+      console-url: https://console.tancloud.io
       # we work
       we-work-webhook-url: 
https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
       # ding ding talk
@@ -187,7 +182,7 @@ data:
       telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage
       # discord
       discord-webhook-url: https://discord.com/api/v9/channels/%s/messages
-      # server酱
+      # serverChan
       server-chan-webhook-url: https://sctapi.ftqq.com/%s.send
       # gotify
       gotify-webhook-url: http://127.0.0.1/message?token=%s
@@ -196,6 +191,12 @@ data:
       server:
         enabled: true
         port: 1158
+        
+    grafana:
+      enabled: false
+      url: http://127.0.0.1:3000
+      username: admin
+      password: admin
 
         
   sureness.yml: |+
diff --git a/docs/README.md b/docs/README.md
index b0cfbe7..6e04448 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -90,7 +90,8 @@ helm uninstall hertzbeat
 
 ## Configuration
 
-The following table lists the configurable parameters of the HertzBeat chart 
and the default values.
+The following table lists the configurable parameters of the HertzBeat chart 
and the default values.  
+Config Parameter via `--set`, eg: `--set expose.type=NodePort`
 
 | Parameter                             | Description                          
                                                                                
                                                                                
           | Default         |
 
|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to