Skip to content

fix: cluster variable in resources/cluster #1147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sleepyfoodie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: cluster variable in resources/cluster #1147

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce2bafa
fix: cluster variable in resources/cluster
sleepyfoodie Nov 28, 2025
c9f9f36
refactor cluster variable further
sleepyfoodie Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dashboards/resources/variables/cluster.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
local var = g.dashboard.variable;
local common = import './common.libsonnet';

{
cluster(config)::
local datasource = common.datasource(config);
local clusterVar =
common.cluster(config, datasource, 'up{%(kubeStateMetricsSelector)s}')
+ var.query.generalOptions.showOnDashboard.withLabelAndValue();
Copy link
Collaborator

@skl skl Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this go on the common variable definition instead? Otherwise this will have to be copy/pasted every time it's used.

Copy link
Contributor Author

@sleepyfoodie sleepyfoodie Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes! I'll update that

{
datasource: datasource,
cluster: common.cluster(config, datasource, 'up{%(cadvisorSelector)s}'),
cluster: clusterVar,
},
}