Skip to content

Commit bcd09f0

Browse files
committed
apply pr feedback, including removing enableMultiCluster flag
1 parent d8ef9e8 commit bcd09f0

16 files changed

+186
-92
lines changed

clickhouse-mixin/config.libsonnet

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
local this = self,
3-
enableMultiCluster: false,
43
filteringSelector: 'job="integrations/clickhouse"',
5-
groupLabels: if self.enableMultiCluster then ['job', 'cluster'] else ['job'],
6-
logLabels: if self.enableMultiCluster then ['job', 'cluster', 'instance'] else ['job', 'instance'],
4+
groupLabels: ['job', 'cluster'],
5+
logLabels: ['job', 'cluster', 'instance'],
76
instanceLabels: ['instance'],
87

98
dashboardTags: [self.uid],

clickhouse-mixin/dashboards.libsonnet

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,14 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
1313
local period = this.config.dashboardPeriod;
1414
local timezone = this.config.dashboardTimezone;
1515
local panels = this.grafana.panels;
16+
local rows = this.grafana.rows;
1617

1718
{
1819
'clickhouse-replica.json':
1920
g.dashboard.new(prefix + ' replica')
2021
+ g.dashboard.withPanels(
2122
g.util.grid.wrapPanels(
22-
[
23-
panels.interserverConnectionsPanel { gridPos+: { w: 12 } },
24-
panels.replicaQueueSizePanel { gridPos+: { w: 12 } },
25-
panels.replicaOperationsPanel { gridPos+: { w: 12 } },
26-
panels.replicaReadOnlyPanel { gridPos+: { w: 12 } },
27-
panels.zooKeeperWatchesPanel { gridPos+: { w: 12 } },
28-
panels.zooKeeperSessionsPanel { gridPos+: { w: 12 } },
29-
panels.zooKeeperRequestsPanel { gridPos+: { w: 24 } },
30-
]
23+
rows.replicaOperationsPanels + rows.replicaZookeeperPanels,
3124
)
3225
)
3326
+ root.applyCommon(

clickhouse-mixin/dashboards_out/clickhouse-latency.json

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clickhouse-mixin/dashboards_out/clickhouse-overview.json

Lines changed: 32 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)