Skip to content

Commit 43da88d

Browse files
schmikeiv-zhuravlev
schmikei
authored and
v-zhuravlev
committed
fix variable setting
1 parent 1305b91 commit 43da88d

File tree

9 files changed

+151
-96
lines changed

9 files changed

+151
-96
lines changed

‎clickhouse-mixin/config.libsonnet

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
11
{
2-
// Enable multi-cluster mode to use cluster-based filtering
32
enableMultiCluster: false,
4-
5-
// Base filtering selector that's always applied
63
filteringSelector: 'job="integrations/clickhouse"',
7-
8-
// Labels used for grouping and filtering
9-
groupLabels: if self.enableMultiCluster then ['instance', 'cluster'] else ['instance'],
10-
11-
// Labels that represent instances (used for single instance mode)
12-
instanceLabels: ['instance'],
13-
14-
// Labels that should be treated as pure instance labels (no multi-select in single instance mode)
4+
groupLabels: if self.enableMultiCluster then ['job', 'cluster'] else ['job'],
5+
logLabels: if self.enableMultiCluster then ['job', 'cluster', 'instance'] else ['job', 'instance'],
156
pureInstanceLabels: ['instance'],
167

17-
// Dashboard configuration
18-
dashboardTags: ['clickhouse-mixin'],
8+
dashboardTags: [self.uid],
199
uid: 'clickhouse',
2010
dashboardNamePrefix: 'ClickHouse',
2111
dashboardPeriod: 'now-30m',
2212
dashboardTimezone: 'default',
2313
dashboardRefresh: '1m',
2414

25-
// Legend configuration
15+
// Legend panel configuration
2616
legendLabels: ['instance'],
2717

2818
// Logging configuration
2919
enableLokiLogs: true,
30-
logLabels: if self.enableMultiCluster then ['instance', 'cluster', 'level'] else ['instance', 'level'],
31-
extraLogLabels: [], // Required by logs-lib
20+
extraLogLabels: ['level'], // Required by logs-lib
3221
logsVolumeGroupBy: 'level',
3322
showLogsVolume: true,
3423

‎clickhouse-mixin/dashboards.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
102102
datasourceName=this.grafana.variables.datasources.loki.name,
103103
datasourceRegex=this.grafana.variables.datasources.loki.regex,
104104
filterSelector=this.config.filteringSelector,
105-
labels=this.config.groupLabels + this.config.extraLogLabels,
105+
labels=this.config.logLabels + this.config.extraLogLabels,
106106
formatParser=null,
107107
showLogsVolume=this.config.showLogsVolume,
108108
)

‎clickhouse-mixin/dashboards_out/clickhouse-latency

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"keepTime": true,
88
"title": "ClickHouse Overview",
99
"type": "link",
10-
"url": "/d/mixin_clickhouse_overview"
10+
"url": "/d/clickhouse_clickhouse_overview"
1111
},
1212
{
1313
"keepTime": true,
1414
"title": "ClickHouse Replica",
1515
"type": "link",
16-
"url": "/d/mixin_clickhouse_replica"
16+
"url": "/d/clickhouse_clickhouse_replica"
1717
},
1818
{
1919
"keepTime": true,
2020
"title": "Logs",
2121
"type": "link",
22-
"url": "/d/mixin-logs"
22+
"url": "/d/clickhouse-logs"
2323
},
2424
{
2525
"asDropdown": true,
2626
"includeVars": true,
2727
"keepTime": true,
2828
"tags": [
29-
"clickhouse-mixin"
29+
"clickhouse"
3030
],
3131
"title": "All dashboards",
3232
"type": "dashboards"
@@ -76,7 +76,7 @@
7676
"type": "prometheus",
7777
"uid": "${prometheus_datasource}"
7878
},
79-
"expr": "increase(ClickHouseProfileEvents_DiskReadElapsedMicroseconds{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
79+
"expr": "increase(ClickHouseProfileEvents_DiskReadElapsedMicroseconds{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
8080
"interval": "30s",
8181
"legendFormat": "{{instance}} - disk read elapsed"
8282
}
@@ -127,7 +127,7 @@
127127
"type": "prometheus",
128128
"uid": "${prometheus_datasource}"
129129
},
130-
"expr": "increase(ClickHouseProfileEvents_DiskWriteElapsedMicroseconds{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
130+
"expr": "increase(ClickHouseProfileEvents_DiskWriteElapsedMicroseconds{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
131131
"interval": "30s",
132132
"legendFormat": "{{instance}} - disk write elapsed"
133133
}
@@ -178,7 +178,7 @@
178178
"type": "prometheus",
179179
"uid": "${prometheus_datasource}"
180180
},
181-
"expr": "increase(ClickHouseProfileEvents_NetworkReceiveElapsedMicroseconds{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
181+
"expr": "increase(ClickHouseProfileEvents_NetworkReceiveElapsedMicroseconds{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
182182
"interval": "30s",
183183
"legendFormat": "{{instance}} - network receive elapsed"
184184
}
@@ -229,7 +229,7 @@
229229
"type": "prometheus",
230230
"uid": "${prometheus_datasource}"
231231
},
232-
"expr": "increase(ClickHouseProfileEvents_NetworkSendElapsedMicroseconds{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
232+
"expr": "increase(ClickHouseProfileEvents_NetworkSendElapsedMicroseconds{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
233233
"interval": "30s",
234234
"legendFormat": "{{instance}} - network send elapsed"
235235
}
@@ -280,7 +280,7 @@
280280
"type": "prometheus",
281281
"uid": "${prometheus_datasource}"
282282
},
283-
"expr": "increase(ClickHouseProfileEvents_ZooKeeperWaitMicroseconds{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
283+
"expr": "increase(ClickHouseProfileEvents_ZooKeeperWaitMicroseconds{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
284284
"interval": "30s",
285285
"legendFormat": "{{instance}} - ZooKeeper wait"
286286
}
@@ -292,7 +292,7 @@
292292
"refresh": "1m",
293293
"schemaVersion": 39,
294294
"tags": [
295-
"clickhouse-mixin"
295+
"clickhouse"
296296
],
297297
"templating": {
298298
"list": [
@@ -303,6 +303,21 @@
303303
"regex": "",
304304
"type": "datasource"
305305
},
306+
{
307+
"allValue": ".+",
308+
"datasource": {
309+
"type": "prometheus",
310+
"uid": "${prometheus_datasource}"
311+
},
312+
"includeAll": true,
313+
"label": "Job",
314+
"multi": true,
315+
"name": "job",
316+
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"integrations/clickhouse\"}, job)",
317+
"refresh": 2,
318+
"sort": 1,
319+
"type": "query"
320+
},
306321
{
307322
"allValue": ".+",
308323
"datasource": {
@@ -313,7 +328,7 @@
313328
"label": "Instance",
314329
"multi": false,
315330
"name": "instance",
316-
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"$job\"}, instance)",
331+
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"integrations/clickhouse\",job=~\"$job\"}, instance)",
317332
"refresh": 2,
318333
"sort": 1,
319334
"type": "query"
@@ -334,5 +349,5 @@
334349
},
335350
"timezone": "default",
336351
"title": "ClickHouse latency",
337-
"uid": "mixin_clickhouse_latency"
352+
"uid": "clickhouse_clickhouse_latency"
338353
}

‎clickhouse-mixin/dashboards_out/clickhouse-overview

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"keepTime": true,
88
"title": "ClickHouse Latency",
99
"type": "link",
10-
"url": "/d/mixin_clickhouse_latency"
10+
"url": "/d/clickhouse_clickhouse_latency"
1111
},
1212
{
1313
"keepTime": true,
1414
"title": "ClickHouse Replica",
1515
"type": "link",
16-
"url": "/d/mixin_clickhouse_replica"
16+
"url": "/d/clickhouse_clickhouse_replica"
1717
},
1818
{
1919
"keepTime": true,
2020
"title": "Logs",
2121
"type": "link",
22-
"url": "/d/mixin-logs"
22+
"url": "/d/clickhouse-logs"
2323
},
2424
{
2525
"asDropdown": true,
2626
"includeVars": true,
2727
"keepTime": true,
2828
"tags": [
29-
"clickhouse-mixin"
29+
"clickhouse"
3030
],
3131
"title": "All dashboards",
3232
"type": "dashboards"
@@ -76,7 +76,7 @@
7676
"type": "prometheus",
7777
"uid": "${prometheus_datasource}"
7878
},
79-
"expr": "rate(ClickHouseProfileEvents_SelectQuery{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
79+
"expr": "rate(ClickHouseProfileEvents_SelectQuery{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
8080
"interval": "30s",
8181
"legendFormat": "{{instance}} - select query"
8282
},
@@ -85,7 +85,7 @@
8585
"type": "prometheus",
8686
"uid": "${prometheus_datasource}"
8787
},
88-
"expr": "rate(ClickHouseProfileEvents_InsertQuery{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
88+
"expr": "rate(ClickHouseProfileEvents_InsertQuery{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
8989
"interval": "30s",
9090
"legendFormat": "{{instance}} - insert query"
9191
},
@@ -94,7 +94,7 @@
9494
"type": "prometheus",
9595
"uid": "${prometheus_datasource}"
9696
},
97-
"expr": "rate(ClickHouseProfileEvents_AsyncInsertQuery{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
97+
"expr": "rate(ClickHouseProfileEvents_AsyncInsertQuery{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
9898
"interval": "30s",
9999
"legendFormat": "{{instance}} - async insert query"
100100
}
@@ -145,7 +145,7 @@
145145
"type": "prometheus",
146146
"uid": "${prometheus_datasource}"
147147
},
148-
"expr": "rate(ClickHouseProfileEvents_FailedSelectQuery{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
148+
"expr": "rate(ClickHouseProfileEvents_FailedSelectQuery{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
149149
"interval": "30s",
150150
"legendFormat": "{{instance}} - Failed Select Query"
151151
},
@@ -154,7 +154,7 @@
154154
"type": "prometheus",
155155
"uid": "${prometheus_datasource}"
156156
},
157-
"expr": "rate(ClickHouseProfileEvents_FailedInsertQuery{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
157+
"expr": "rate(ClickHouseProfileEvents_FailedInsertQuery{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
158158
"interval": "30s",
159159
"legendFormat": "{{instance}} - Failed Insert Query"
160160
}
@@ -205,7 +205,7 @@
205205
"type": "prometheus",
206206
"uid": "${prometheus_datasource}"
207207
},
208-
"expr": "rate(ClickHouseProfileEvents_RejectedInserts{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
208+
"expr": "rate(ClickHouseProfileEvents_RejectedInserts{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
209209
"interval": "30s",
210210
"legendFormat": "{{instance}} - Rejected Inserts"
211211
}
@@ -256,7 +256,7 @@
256256
"type": "prometheus",
257257
"uid": "${prometheus_datasource}"
258258
},
259-
"expr": "(ClickHouseMetrics_MemoryTracking{instance=~\"$instance\",job=~\"$job\"})",
259+
"expr": "(ClickHouseMetrics_MemoryTracking{job=~\"$job\",instance=~\"$instance\"})",
260260
"legendFormat": "{{instance}} - Memory Tracking"
261261
}
262262
],
@@ -307,7 +307,7 @@
307307
"type": "prometheus",
308308
"uid": "${prometheus_datasource}"
309309
},
310-
"expr": "(ClickHouseMetrics_MemoryTracking{instance=~\"$instance\",job=~\"$job\"} / ClickHouseAsyncMetrics_OSMemoryTotal{instance=~\"$instance\",job=~\"$job\"}) * 100",
310+
"expr": "(ClickHouseMetrics_MemoryTracking{job=~\"$job\",instance=~\"$instance\"} / ClickHouseAsyncMetrics_OSMemoryTotal{job=~\"$job\",instance=~\"$instance\"}) * 100",
311311
"legendFormat": "{{instance}} - Memory Tracking Percent"
312312
}
313313
],
@@ -357,31 +357,31 @@
357357
"type": "prometheus",
358358
"uid": "${prometheus_datasource}"
359359
},
360-
"expr": "ClickHouseMetrics_TCPConnection{instance=~\"$instance\",job=~\"$job\"}",
360+
"expr": "ClickHouseMetrics_TCPConnection{job=~\"$job\",instance=~\"$instance\"}",
361361
"legendFormat": "{{instance}} - TCP connection"
362362
},
363363
{
364364
"datasource": {
365365
"type": "prometheus",
366366
"uid": "${prometheus_datasource}"
367367
},
368-
"expr": "ClickHouseMetrics_HTTPConnection{instance=~\"$instance\",job=~\"$job\"}",
368+
"expr": "ClickHouseMetrics_HTTPConnection{job=~\"$job\",instance=~\"$instance\"}",
369369
"legendFormat": "{{instance}} - HTTP connection"
370370
},
371371
{
372372
"datasource": {
373373
"type": "prometheus",
374374
"uid": "${prometheus_datasource}"
375375
},
376-
"expr": "ClickHouseMetrics_MySQLConnection{instance=~\"$instance\",job=~\"$job\"}",
376+
"expr": "ClickHouseMetrics_MySQLConnection{job=~\"$job\",instance=~\"$instance\"}",
377377
"legendFormat": "{{instance}} - MySQL connection"
378378
},
379379
{
380380
"datasource": {
381381
"type": "prometheus",
382382
"uid": "${prometheus_datasource}"
383383
},
384-
"expr": "ClickHouseMetrics_PostgreSQLConnection{instance=~\"$instance\",job=~\"$job\"}",
384+
"expr": "ClickHouseMetrics_PostgreSQLConnection{job=~\"$job\",instance=~\"$instance\"}",
385385
"legendFormat": "{{instance}} - PostgreSQL connection"
386386
}
387387
],
@@ -431,7 +431,7 @@
431431
"type": "prometheus",
432432
"uid": "${prometheus_datasource}"
433433
},
434-
"expr": "rate(ClickHouseProfileEvents_NetworkReceiveBytes{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
434+
"expr": "rate(ClickHouseProfileEvents_NetworkReceiveBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
435435
"interval": "30s",
436436
"legendFormat": "{{instance}} - network receive bytes"
437437
}
@@ -482,7 +482,7 @@
482482
"type": "prometheus",
483483
"uid": "${prometheus_datasource}"
484484
},
485-
"expr": "rate(ClickHouseProfileEvents_NetworkSendBytes{instance=~\"$instance\",job=~\"$job\"}[$__rate_interval])",
485+
"expr": "rate(ClickHouseProfileEvents_NetworkSendBytes{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
486486
"interval": "30s",
487487
"legendFormat": "{{instance}} - network send bytes"
488488
}
@@ -494,7 +494,7 @@
494494
"refresh": "1m",
495495
"schemaVersion": 39,
496496
"tags": [
497-
"clickhouse-mixin"
497+
"clickhouse"
498498
],
499499
"templating": {
500500
"list": [
@@ -505,6 +505,21 @@
505505
"regex": "",
506506
"type": "datasource"
507507
},
508+
{
509+
"allValue": ".+",
510+
"datasource": {
511+
"type": "prometheus",
512+
"uid": "${prometheus_datasource}"
513+
},
514+
"includeAll": true,
515+
"label": "Job",
516+
"multi": true,
517+
"name": "job",
518+
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"integrations/clickhouse\"}, job)",
519+
"refresh": 2,
520+
"sort": 1,
521+
"type": "query"
522+
},
508523
{
509524
"allValue": ".+",
510525
"datasource": {
@@ -515,7 +530,7 @@
515530
"label": "Instance",
516531
"multi": false,
517532
"name": "instance",
518-
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"$job\"}, instance)",
533+
"query": "label_values(ClickHouseMetrics_InterserverConnection{job=~\"integrations/clickhouse\",job=~\"$job\"}, instance)",
519534
"refresh": 2,
520535
"sort": 1,
521536
"type": "query"
@@ -536,5 +551,5 @@
536551
},
537552
"timezone": "default",
538553
"title": "ClickHouse overview",
539-
"uid": "mixin_clickhouse_overview"
554+
"uid": "clickhouse_clickhouse_overview"
540555
}

0 commit comments

Comments
 (0)