go.d clickhouse add running queries (#17751)
Ilya Mashchenko committed
May 26, 2024 at 18:36 UTC
4eeabca6f8d7e0a73c253f86f07bd1de490a5bbc
4 files changed
+22
-7
src/go/collectors/go.d.plugin/modules/clickhouse/charts.go
+13
@@ -19,6 +19,7 @@ const (
19
20
prioDiskSpaceUsage
21
22
+ prioRunningQueries
23
prioQueries
24
prioSelectQueries
25
prioInsertQueries
@@ -95,6 +96,7 @@ var chCharts = module.Charts{
96
chartSlowReads.Copy(),
97
chartReadBackoff.Copy(),
98
99
+ chartRunningQueries.Copy(),
100
chartQueries.Copy(),
101
chartSelectQueries.Copy(),
102
chartInsertQueries.Copy(),
@@ -238,6 +240,17 @@ var (
240
)
241
242
var (
243
+ chartRunningQueries = module.Chart{
244
+ ID: "running_queries",
245
+ Title: "Running queries",
246
+ Units: "queries",
247
+ Fam: "queries",
248
+ Ctx: "clickhouse.running_queries",
249
+ Priority: prioRunningQueries,
250
+ Dims: module.Dims{
251
+ {ID: "metrics_Query", Name: "running"},
252
+ },
253
+ }
254
chartQueries = module.Chart{
255
ID: "queries",
256
Title: "Queries",
src/go/collectors/go.d.plugin/modules/clickhouse/clickhouse_test.go
+1
@@ -187,6 +187,7 @@ func TestClickHouse_Collect(t *testing.T) {
187
"metrics_DistributedSend": 0,
188
"metrics_HTTPConnection": 0,
189
"metrics_InterserverConnection": 0,
190
+ "metrics_Query": 1,
191
"metrics_MemoryTracking": 1270999152,
192
"metrics_MySQLConnection": 0,
193
"metrics_PartsActive": 25,
src/go/collectors/go.d.plugin/modules/clickhouse/collect_system_metrics.go
+1
@@ -50,6 +50,7 @@ func (c *ClickHouse) collectSystemMetrics(mx map[string]int64) error {
50
}
51
52
var wantSystemMetrics = map[string]bool{
53
+ "Query": true,
54
"TCPConnection": true,
55
"HTTPConnection": true,
56
"MySQLConnection": true,
src/go/collectors/go.d.plugin/modules/clickhouse/metadata.yaml
+7
-7
@@ -27,7 +27,7 @@ modules:
27
Specifically, it collects metrics from the following tables:
28
29
- system.metrics
30
- - systemd.async_metrics
30
+ - system.async_metrics
31
- system.events
32
- system.disks
33
- system.parts
@@ -212,6 +212,12 @@ modules:
212
chart_type: area
213
dimensions:
214
- name: used
215
+ - name: clickhouse.running_queries
216
+ description: Running queries
217
+ unit: queries
218
+ chart_type: line
219
+ dimensions:
220
+ - name: running
221
- name: clickhouse.queries
222
description: Queries
223
unit: queries/s
@@ -551,12 +557,6 @@ modules:
557
chart_type: line
558
dimensions:
559
- name: parts
554
- - name: clickhouse.database_table_parts
555
- description: Table parts
556
- unit: parts
557
- chart_type: line
558
- dimensions:
559
- - name: parts
560
- name: clickhouse.database_table_rows
561
description: Table rows
562
unit: rows