Skip to content

Commit 5d8a2d6

Browse files
dervoetidervoeti
authored
Merge branch 'main' into fix/superset-412-build
2 parents 9a9cff0 + b4297ad commit 5d8a2d6

File tree

3 files changed

+235
-95
lines changed

3 files changed

+235
-95
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file.
3232
- hive: Add `4.1.0` ([#1295]).
3333
- hbase: Add `2.6.3` ([#1296]).
3434
- airflow,superset: Build from source ([#1304]).
35+
- kafka: Add updated JMX config `server.yaml` for KRaft ([#1308]).
3536

3637
### Changed
3738

@@ -99,6 +100,7 @@ All notable changes to this project will be documented in this file.
99100
[#1301]: https://github.com/stackabletech/docker-images/pull/1301
100101
[#1304]: https://github.com/stackabletech/docker-images/pull/1304
101102
[#1309]: https://github.com/stackabletech/docker-images/pull/1309
103+
[#1308]: https://github.com/stackabletech/docker-images/pull/1308
102104

103105
## [25.7.0] - 2025-07-23
104106

‎kafka/stackable/jmx/broker.yaml‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2,103 +2,103 @@
22
lowercaseOutputName: true
33

44
rules:
5-
# Special cases and very specific rules
6-
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
7-
name: kafka_server_$1_$2
8-
type: GAUGE
9-
labels:
10-
clientId: "$3"
11-
topic: "$4"
12-
partition: "$5"
13-
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
14-
name: kafka_server_$1_$2
15-
type: GAUGE
16-
labels:
17-
clientId: "$3"
18-
broker: "$4:$5"
19-
- pattern: kafka.coordinator.(\w+)<type=(.+), name=(.+)><>Value
20-
name: kafka_coordinator_$1_$2_$3
21-
type: GAUGE
5+
# Special cases and very specific rules
6+
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
7+
name: kafka_server_$1_$2
8+
type: GAUGE
9+
labels:
10+
clientId: "$3"
11+
topic: "$4"
12+
partition: "$5"
13+
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
14+
name: kafka_server_$1_$2
15+
type: GAUGE
16+
labels:
17+
clientId: "$3"
18+
broker: "$4:$5"
19+
- pattern: kafka.coordinator.(\w+)<type=(.+), name=(.+)><>Value
20+
name: kafka_coordinator_$1_$2_$3
21+
type: GAUGE
2222

23-
# Generic per-second counters with 0-2 key/value pairs
24-
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+), (.+)=(.+)><>Count
25-
name: kafka_$1_$2_$3_total
26-
type: COUNTER
27-
labels:
28-
"$4": "$5"
29-
"$6": "$7"
30-
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+)><>Count
31-
name: kafka_$1_$2_$3_total
32-
type: COUNTER
33-
labels:
34-
"$4": "$5"
35-
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*><>Count
36-
name: kafka_$1_$2_$3_total
37-
type: COUNTER
23+
# Generic per-second counters with 0-2 key/value pairs
24+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+), (.+)=(.+)><>Count
25+
name: kafka_$1_$2_$3_total
26+
type: COUNTER
27+
labels:
28+
"$4": "$5"
29+
"$6": "$7"
30+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+)><>Count
31+
name: kafka_$1_$2_$3_total
32+
type: COUNTER
33+
labels:
34+
"$4": "$5"
35+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*><>Count
36+
name: kafka_$1_$2_$3_total
37+
type: COUNTER
3838

39-
- pattern: kafka.server<type=(.+), client-id=(.+)><>([a-z-]+)
40-
name: kafka_server_quota_$3
41-
type: GAUGE
42-
labels:
43-
resource: "$1"
44-
clientId: "$2"
39+
- pattern: kafka.server<type=(.+), client-id=(.+)><>([a-z-]+)
40+
name: kafka_server_quota_$3
41+
type: GAUGE
42+
labels:
43+
resource: "$1"
44+
clientId: "$2"
4545

46-
- pattern: kafka.server<type=(.+), user=(.+), client-id=(.+)><>([a-z-]+)
47-
name: kafka_server_quota_$4
48-
type: GAUGE
49-
labels:
50-
resource: "$1"
51-
user: "$2"
52-
clientId: "$3"
46+
- pattern: kafka.server<type=(.+), user=(.+), client-id=(.+)><>([a-z-]+)
47+
name: kafka_server_quota_$4
48+
type: GAUGE
49+
labels:
50+
resource: "$1"
51+
user: "$2"
52+
clientId: "$3"
5353

54-
# Generic gauges with 0-2 key/value pairs
55-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Value
56-
name: kafka_$1_$2_$3
57-
type: GAUGE
58-
labels:
59-
"$4": "$5"
60-
"$6": "$7"
61-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Value
62-
name: kafka_$1_$2_$3
63-
type: GAUGE
64-
labels:
65-
"$4": "$5"
66-
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Value
67-
name: kafka_$1_$2_$3
68-
type: GAUGE
54+
# Generic gauges with 0-2 key/value pairs
55+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Value
56+
name: kafka_$1_$2_$3
57+
type: GAUGE
58+
labels:
59+
"$4": "$5"
60+
"$6": "$7"
61+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Value
62+
name: kafka_$1_$2_$3
63+
type: GAUGE
64+
labels:
65+
"$4": "$5"
66+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Value
67+
name: kafka_$1_$2_$3
68+
type: GAUGE
6969

70-
# Emulate Prometheus 'Summary' metrics for the exported 'Histogram's.
71-
#
72-
# Note that these are missing the '_sum' metric!
73-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Count
74-
name: kafka_$1_$2_$3_count
75-
type: COUNTER
76-
labels:
77-
"$4": "$5"
78-
"$6": "$7"
79-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*), (.+)=(.+)><>(\d+)thPercentile
80-
name: kafka_$1_$2_$3
81-
type: GAUGE
82-
labels:
83-
"$4": "$5"
84-
"$6": "$7"
85-
quantile: "0.$8"
86-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Count
87-
name: kafka_$1_$2_$3_count
88-
type: COUNTER
89-
labels:
90-
"$4": "$5"
91-
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*)><>(\d+)thPercentile
92-
name: kafka_$1_$2_$3
93-
type: GAUGE
94-
labels:
95-
"$4": "$5"
96-
quantile: "0.$6"
97-
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Count
98-
name: kafka_$1_$2_$3_count
99-
type: COUNTER
100-
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>(\d+)thPercentile
101-
name: kafka_$1_$2_$3
102-
type: GAUGE
103-
labels:
104-
quantile: "0.$4"
70+
# Emulate Prometheus 'Summary' metrics for the exported 'Histogram's.
71+
#
72+
# Note that these are missing the '_sum' metric!
73+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Count
74+
name: kafka_$1_$2_$3_count
75+
type: COUNTER
76+
labels:
77+
"$4": "$5"
78+
"$6": "$7"
79+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*), (.+)=(.+)><>(\d+)thPercentile
80+
name: kafka_$1_$2_$3
81+
type: GAUGE
82+
labels:
83+
"$4": "$5"
84+
"$6": "$7"
85+
quantile: "0.$8"
86+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Count
87+
name: kafka_$1_$2_$3_count
88+
type: COUNTER
89+
labels:
90+
"$4": "$5"
91+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*)><>(\d+)thPercentile
92+
name: kafka_$1_$2_$3
93+
type: GAUGE
94+
labels:
95+
"$4": "$5"
96+
quantile: "0.$6"
97+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Count
98+
name: kafka_$1_$2_$3_count
99+
type: COUNTER
100+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>(\d+)thPercentile
101+
name: kafka_$1_$2_$3
102+
type: GAUGE
103+
labels:
104+
quantile: "0.$4"

‎kafka/stackable/jmx/server.yaml‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
---
2+
lowercaseOutputName: true
3+
4+
rules:
5+
# Special cases and very specific rules
6+
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
7+
name: kafka_server_$1_$2
8+
type: GAUGE
9+
labels:
10+
clientId: "$3"
11+
topic: "$4"
12+
partition: "$5"
13+
- pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
14+
name: kafka_server_$1_$2
15+
type: GAUGE
16+
labels:
17+
clientId: "$3"
18+
broker: "$4:$5"
19+
- pattern: kafka.coordinator.(\w+)<type=(.+), name=(.+)><>Value
20+
name: kafka_coordinator_$1_$2_$3
21+
type: GAUGE
22+
# Kraft current state info metric rule
23+
- pattern: "kafka.server<type=raft-metrics><>current-state: ([a-z]+)"
24+
name: kafka_server_raft_metrics_current_state_info
25+
type: GAUGE
26+
value: 1
27+
labels:
28+
"state": "$1"
29+
# Kraft specific rules for raft-metrics, raft-channel-metrics, broker-metadata-metrics
30+
- pattern: kafka.server<type=(.+)><>([a-z-]+)-total
31+
name: kafka_server_$1_$2_total
32+
type: COUNTER
33+
- pattern: kafka.server<type=(.+)><>([a-z-]+)
34+
name: kafka_server_$1_$2
35+
type: GAUGE
36+
37+
# Generic per-second counters with 0-2 key/value pairs
38+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+), (.+)=(.+)><>Count
39+
name: kafka_$1_$2_$3_total
40+
type: COUNTER
41+
labels:
42+
"$4": "$5"
43+
"$6": "$7"
44+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+)><>Count
45+
name: kafka_$1_$2_$3_total
46+
type: COUNTER
47+
labels:
48+
"$4": "$5"
49+
- pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*><>Count
50+
name: kafka_$1_$2_$3_total
51+
type: COUNTER
52+
53+
# Quota specific rules
54+
- pattern: kafka.server<type=(.+), user=(.+), client-id=(.+)><>([a-z-]+)
55+
name: kafka_server_quota_$4
56+
type: GAUGE
57+
labels:
58+
resource: "$1"
59+
user: "$2"
60+
clientId: "$3"
61+
- pattern: kafka.server<type=(.+), client-id=(.+)><>([a-z-]+)
62+
name: kafka_server_quota_$3
63+
type: GAUGE
64+
labels:
65+
resource: "$1"
66+
clientId: "$2"
67+
- pattern: kafka.server<type=(.+), user=(.+)><>([a-z-]+)
68+
name: kafka_server_quota_$3
69+
type: GAUGE
70+
labels:
71+
resource: "$1"
72+
user: "$2"
73+
74+
# Generic gauges with 0-2 key/value pairs
75+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Value
76+
name: kafka_$1_$2_$3
77+
type: GAUGE
78+
labels:
79+
"$4": "$5"
80+
"$6": "$7"
81+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Value
82+
name: kafka_$1_$2_$3
83+
type: GAUGE
84+
labels:
85+
"$4": "$5"
86+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Value
87+
name: kafka_$1_$2_$3
88+
type: GAUGE
89+
90+
# Emulate Prometheus 'Summary' metrics for the exported 'Histogram's.
91+
#
92+
# Note that these are missing the '_sum' metric!
93+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Count
94+
name: kafka_$1_$2_$3_count
95+
type: COUNTER
96+
labels:
97+
"$4": "$5"
98+
"$6": "$7"
99+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*), (.+)=(.+)><>(\d+)thPercentile
100+
name: kafka_$1_$2_$3
101+
type: GAUGE
102+
labels:
103+
"$4": "$5"
104+
"$6": "$7"
105+
quantile: "0.$8"
106+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Count
107+
name: kafka_$1_$2_$3_count
108+
type: COUNTER
109+
labels:
110+
"$4": "$5"
111+
- pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*)><>(\d+)thPercentile
112+
name: kafka_$1_$2_$3
113+
type: GAUGE
114+
labels:
115+
"$4": "$5"
116+
quantile: "0.$6"
117+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>Count
118+
name: kafka_$1_$2_$3_count
119+
type: COUNTER
120+
- pattern: kafka.(\w+)<type=(.+), name=(.+)><>(\d+)thPercentile
121+
name: kafka_$1_$2_$3
122+
type: GAUGE
123+
labels:
124+
quantile: "0.$4"
125+
126+
# Generic gauges for MeanRate Percent
127+
# Ex) kafka.server<type=KafkaRequestHandlerPool, name=RequestHandlerAvgIdlePercent><>MeanRate
128+
- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*><>MeanRate
129+
name: kafka_$1_$2_$3_percent
130+
type: GAUGE
131+
- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*><>Value
132+
name: kafka_$1_$2_$3_percent
133+
type: GAUGE
134+
- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*, (.+)=(.+)><>Value
135+
name: kafka_$1_$2_$3_percent
136+
type: GAUGE
137+
labels:
138+
"$4": "$5"

0 commit comments

Comments
 (0)