Skip to content

Commit f25605c

Browse files
committed
Add healthcheck for kraft controller/update jmx rules
1 parent 8440dc7 commit f25605c

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

api/assets/assets.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ var (
2525

2626
//go:embed kafka/jmx-exporter.yml
2727
KafkaJmxExporterYaml string
28+
29+
//go:embed kafka/kraft-controller-healthcheck.sh
30+
KraftControllerHealthcheckSh string
2831
)

api/assets/kafka/jmx-exporter.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ rules:
240240
# Export all other java.{lang,nio}* beans using default format
241241
- pattern: java.lang.+
242242
- pattern: java.nio.+
243-
# Export kraft metrics
244-
- pattern: "kafka.server<type=raft-metrics, name=current-state>"
245-
name: "kafka_server_raft_metrics_current_state"
243+
# Export kraft current state metrics
244+
- pattern: 'kafka.server<type=raft-metrics><>current-state: (.+)'
245+
name: "kafka_server_raft_metrics_current_state_$1"
246+
type: GAUGE
247+
value: 1

pkg/resources/kafka/pod.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/util/intstr"
2929

3030
apiutil "github.com/banzaicloud/koperator/api/util"
31+
"github.com/banzaicloud/koperator/api/assets"
3132
"github.com/banzaicloud/koperator/api/v1beta1"
3233
"github.com/banzaicloud/koperator/pkg/k8sutil"
3334
"github.com/banzaicloud/koperator/pkg/resources/kafkamonitoring"
@@ -110,14 +111,11 @@ fi`},
110111
} else {
111112
kafkaContainer.LivenessProbe = &corev1.Probe{
112113
ProbeHandler: corev1.ProbeHandler{
113-
TCPSocket: &corev1.TCPSocketAction{
114-
Port: intstr.IntOrString{
115-
Type: intstr.Int,
116-
IntVal: controllerlistenerPort,
117-
},
114+
Exec: &corev1.ExecAction{
115+
Command: []string{"/bin/bash", "-c", assets.KraftControllerHealthcheckSh},
118116
},
119117
},
120-
InitialDelaySeconds: 15,
118+
InitialDelaySeconds: 30,
121119
PeriodSeconds: 10,
122120
TimeoutSeconds: 5,
123121
FailureThreshold: 6,

0 commit comments

Comments
 (0)