This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hertzbeat-helm-chart.git
The following commit(s) were added to refs/heads/main by this push:
new 9ce6a77 [release] release hertzbeat v1.6.1 (#7)
9ce6a77 is described below
commit 9ce6a771c18ad19a4ff6b2494d9ba71204bbac49
Author: tomsun28 <[email protected]>
AuthorDate: Thu Nov 7 23:10:41 2024 +0800
[release] release hertzbeat v1.6.1 (#7)
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
* [release] release hertzbeat v1.6.1
Signed-off-by: tomsun28 <[email protected]>
---------
Signed-off-by: tomsun28 <[email protected]>
---
.github/workflows/ci.yaml | 7 ++
README.md | 3 +-
charts/hertzbeat/Chart.yaml | 6 +-
charts/hertzbeat/README.md | 3 +-
.../hertzbeat/templates/collector/configmap.yaml | 6 +-
charts/hertzbeat/templates/manager/configmap.yaml | 33 +++++-----
charts/hertzbeat/values.yaml | 72 ++++++++++-----------
docs/README.md | 3 +-
docs/hertzbeat-1.6.1.tgz | Bin 0 -> 12748 bytes
docs/index.yaml | 22 ++++++-
10 files changed, 94 insertions(+), 61 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f0cfb77..5fd9f45 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -55,5 +55,12 @@ jobs:
echo "::set-output name=changed::true"
fi
+ - name: Install k8s
+ run: |
+ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.6+k3s2
K3S_KUBECONFIG_MODE=777 sh -
+ cat /etc/rancher/k3s/k3s.yaml
+ mkdir -p ~/.kube
+ cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
+
- name: Run chart-testing (install)
run: ct install --config ct.yaml
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..48875ed 100644
--- a/charts/hertzbeat/Chart.yaml
+++ b/charts/hertzbeat/Chart.yaml
@@ -23,15 +23,15 @@ home: https://hertzbeat.apache.org/
sources:
- https://github.com/apache/hertzbeat
maintainers:
- - name: hertzbeat-dev
+ - name: hertzbeat
email: [email protected]
icon:
https://raw.githubusercontent.com/apache/hertzbeat/master/home/static/img/hertzbeat-logo.png
# 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/charts/hertzbeat/values.yaml b/charts/hertzbeat/values.yaml
index 49ff444..6614c0b 100644
--- a/charts/hertzbeat/values.yaml
+++ b/charts/hertzbeat/values.yaml
@@ -27,16 +27,16 @@ manager:
username: "admin"
password: "hertzbeat"
jwtSecretKey: "CyaFv0bwq2Eik0jdrKUtsA6dx3sDJeFV143R
- LnfKefTjsIfJLBa2YkhEqEGtcHDTNe4CU6+9
- 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5
- dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp"
- podAnnotations: { }
- podSecurityContext: { }
- securityContext: { }
- resources: { }
- nodeSelector: { }
- tolerations: [ ]
- affinity: { }
+ LnfKefTjsIfJLBa2YkhEqEGtcHDTNe4CU6+9
+ 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5
+ dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp"
+ podAnnotations: {}
+ podSecurityContext: {}
+ securityContext: {}
+ resources: {}
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
collector:
image:
@@ -51,14 +51,14 @@ collector:
maxReplicas: 20
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
-
- podAnnotations: { }
- podSecurityContext: { }
- securityContext: { }
- resources: { }
- nodeSelector: { }
- tolerations: [ ]
- affinity: { }
+
+ podAnnotations: {}
+ podSecurityContext: {}
+ securityContext: {}
+ resources: {}
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
database:
image:
@@ -77,14 +77,14 @@ database:
size: 4Gi
annotations: {}
resourcePolicy: "keep"
-
- podAnnotations: { }
- podSecurityContext: { }
- securityContext: { }
- resources: { }
- nodeSelector: { }
- tolerations: [ ]
- affinity: { }
+
+ podAnnotations: {}
+ podSecurityContext: {}
+ securityContext: {}
+ resources: {}
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
tsdb:
image:
@@ -102,14 +102,14 @@ tsdb:
size: 4Gi
annotations: {}
resourcePolicy: "keep"
-
- podAnnotations: { }
- podSecurityContext: { }
- securityContext: { }
- resources: { }
- nodeSelector: { }
- tolerations: [ ]
- affinity: { }
+
+ podAnnotations: {}
+ podSecurityContext: {}
+ securityContext: {}
+ resources: {}
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
# Expose Network
expose:
@@ -132,12 +132,12 @@ expose:
ports:
# The service port Harbor listens on when serving HTTP
port: 1157
- sourceRanges: [ ]
+ sourceRanges: []
ingress:
enabled: true
ingressClassName: ""
host: "hertzbeat.domain"
- annotations: {}
+ annotations: {}
tls:
enabled: true
secretName: your-tls-secret
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 |
|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
diff --git a/docs/hertzbeat-1.6.1.tgz b/docs/hertzbeat-1.6.1.tgz
new file mode 100644
index 0000000..eea9981
Binary files /dev/null and b/docs/hertzbeat-1.6.1.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index 50237bd..eea2f0e 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,9 +1,27 @@
apiVersion: v1
entries:
hertzbeat:
+ - apiVersion: v2
+ appVersion: v1.6.1
+ created: "2024-11-07T09:56:20.972003+08:00"
+ description: An open-source, real-time monitoring system with custom
monitoring,
+ high performance cluster and agentless capabilities.
+ digest: e9dcc170aa497b566687f0358262ed7e9358a47ef689ad4f81aa2f2822fc815f
+ home: https://hertzbeat.apache.org/
+ icon:
https://raw.githubusercontent.com/apache/hertzbeat/master/home/static/img/hertzbeat-logo.png
+ maintainers:
+ - email: [email protected]
+ name: hertzbeat
+ name: hertzbeat
+ sources:
+ - https://github.com/apache/hertzbeat
+ type: application
+ urls:
+ - hertzbeat-1.6.1.tgz
+ version: 1.6.1
- apiVersion: v2
appVersion: v1.6.0
- created: "2024-09-10T10:30:54.898335+08:00"
+ created: "2024-11-07T09:56:20.971266+08:00"
description: An open-source, real-time monitoring system with custom
monitoring,
high performance cluster and agentless capabilities.
digest: 5124d17485fce48621af0ed7fe27dfddd3d7c77d04b2a7372867331cd3ed13af
@@ -19,4 +37,4 @@ entries:
urls:
- hertzbeat-1.6.0.tgz
version: 1.6.0
-generated: "2024-09-10T10:30:54.897078+08:00"
+generated: "2024-11-07T09:56:20.969841+08:00"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
