Skip to content

Commit 69196e8

Browse files
authored
Add current all to clickhouse-mixin (#1354)
* Add current all to clickhouse-mixin * Add allValues
1 parent a8fc213 commit 69196e8

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

clickhouse-mixin/dashboards/clickhouse-latency.libsonnet

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ local zooKeeperWaitTimePanel(matcher) =
458458
label='job',
459459
datasource=promDatasource,
460460
query='label_values(ClickHouseProfileEvents_DiskReadElapsedMicroseconds,job)',
461-
current='',
461+
current='all',
462462
refresh=2,
463463
includeAll=true,
464464
multi=true,
@@ -470,7 +470,8 @@ local zooKeeperWaitTimePanel(matcher) =
470470
label='instance',
471471
datasource=promDatasource,
472472
query='label_values(ClickHouseProfileEvents_DiskReadElapsedMicroseconds{job=~"$job"}, instance)',
473-
current='',
473+
current='all',
474+
allValues='.+',
474475
refresh=2,
475476
includeAll=true,
476477
sort=1
@@ -480,10 +481,11 @@ local zooKeeperWaitTimePanel(matcher) =
480481
promDatasource,
481482
'label_values(ClickHouseProfileEvents_DiskReadElapsedMicroseconds{job=~"$job"}, cluster)',
482483
label='Cluster',
484+
current='all',
483485
refresh=2,
484486
includeAll=true,
485487
multi=true,
486-
allValues='',
488+
allValues='.*',
487489
hide=if $._config.enableMultiCluster then '' else 'variable',
488490
sort=0
489491
),

clickhouse-mixin/dashboards/clickhouse-overview.libsonnet

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ local networkTransmittedPanel(matcher) =
747747
label='job',
748748
datasource='$prometheus_datasource',
749749
query='label_values(ClickHouseProfileEvents_DiskReadElapsedMicroseconds,job)',
750-
current='',
750+
current='all',
751751
refresh=2,
752752
includeAll=true,
753753
multi=true,
@@ -759,7 +759,8 @@ local networkTransmittedPanel(matcher) =
759759
label='instance',
760760
datasource='$prometheus_datasource',
761761
query='label_values(ClickHouseProfileEvents_Query{job=~"$job"}, instance)',
762-
current='',
762+
current='all',
763+
allValues='.+',
763764
refresh=2,
764765
includeAll=true,
765766
sort=1
@@ -769,10 +770,11 @@ local networkTransmittedPanel(matcher) =
769770
promDatasource,
770771
'label_values(ClickHouseProfileEvents_Query{job=~"$job"}, cluster)',
771772
label='Cluster',
773+
current='all',
772774
refresh=2,
773775
includeAll=true,
774776
multi=true,
775-
allValues='',
777+
allValues='.*',
776778
hide=if $._config.enableMultiCluster then '' else 'variable',
777779
sort=0
778780
),

clickhouse-mixin/dashboards/clickhouse-replica.libsonnet

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ local zooKeeperRequestsPanel(matcher) =
639639
label='job',
640640
datasource=promDatasource,
641641
query='label_values(ClickHouseMetrics_InterserverConnection,job)',
642-
current='',
642+
current='all',
643643
refresh=2,
644644
includeAll=true,
645645
multi=true,
@@ -651,7 +651,8 @@ local zooKeeperRequestsPanel(matcher) =
651651
label='instance',
652652
datasource=promDatasource,
653653
query='label_values(ClickHouseMetrics_InterserverConnection{job=~"$job"}, instance)',
654-
current='',
654+
current='all',
655+
allValues='.+',
655656
refresh=2,
656657
includeAll=true,
657658
sort=1
@@ -661,10 +662,11 @@ local zooKeeperRequestsPanel(matcher) =
661662
promDatasource,
662663
'label_values(ClickHouseMetrics_InterserverConnection{job=~"$job"}, cluster)',
663664
label='Cluster',
665+
current='all',
664666
refresh=2,
665667
includeAll=true,
666668
multi=true,
667-
allValues='',
669+
allValues='.*',
668670
hide=if $._config.enableMultiCluster then '' else 'variable',
669671
sort=0
670672
),

0 commit comments

Comments
 (0)