Skip to content
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

Allow specifying custom selector label for control-plane components #1255

Merged
merged 1 commit into from
Feb 20, 2025
Merged

Allow specifying custom selector label for control-plane components #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions charts/k8s-monitoring/charts/feature-cluster-metrics/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
| kubeControllerManager.metricsTuning.includeMetrics | list | `[]` | Metrics to keep. Can use regular expressions. An empty list means keep all. |
| kubeControllerManager.port | int | `10257` | Port number used by the Kube Controller Manager, set by `--secure-port.` |
| kubeControllerManager.scrapeInterval | string | 60s | How frequently to scrape metrics from the Kube Controller Manager Overrides metrics.scrapeInterval |
| kubeControllerManager.selectorLabel | string | `"component=kube-controller-manager"` | Selector label. |

### KubeDNS

Expand All @@ -247,6 +248,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
| kubeProxy.metricsTuning.includeMetrics | list | `[]` | Metrics to keep. Can use regular expressions. An empty list means keep all. |
| kubeProxy.port | int | `10249` | Port number used by the Kube Proxy, set in `--metrics-bind-address`. |
| kubeProxy.scrapeInterval | string | 60s | How frequently to scrape metrics from the Kube Proxy Overrides metrics.scrapeInterval |
| kubeProxy.selectorLabel | string | `"k8s-app=kube-proxy"` | Selector label. |

### Kube Scheduler

Expand All @@ -261,6 +263,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
| kubeScheduler.metricsTuning.includeMetrics | list | `[]` | Metrics to keep. Can use regular expressions. An empty list means keep all. |
| kubeScheduler.port | int | `10259` | Port number used by the Kube Scheduler, set by `--secure-port`. |
| kubeScheduler.scrapeInterval | string | 60s | How frequently to scrape metrics from the Kube Scheduler Overrides metrics.scrapeInterval |
| kubeScheduler.selectorLabel | string | `"component=kube-scheduler"` | Selector label. |

### Kubelet

Expand Down
2 changes: 1 addition & 1 deletion ...8s-monitoring/charts/feature-cluster-metrics/templates/_kube_controller_manager.alloy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ discovery.kubernetes "kube_controller_manager" {
}
selectors {
role = "pod"
label = "component=kube-controller-manager"
label = {{ .Values.kubeControllerManager.selectorLabel | quote }}
}
}

Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/charts/feature-cluster-metrics/templates/_kube_proxy.alloy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ discovery.kubernetes "kube_proxy" {
}
selectors {
role = "pod"
label = "k8s-app=kube-proxy"
label = {{ .Values.kubeProxy.selectorLabel | quote }}
}
}

Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/charts/feature-cluster-metrics/templates/_kube_scheduler.alloy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ discovery.kubernetes "kube_scheduler" {
}
selectors {
role = "pod"
label = "component=kube-scheduler"
label = {{ .Values.kubeScheduler.selectorLabel | quote }}
}
}

Expand Down
9 changes: 9 additions & 0 deletions charts/k8s-monitoring/charts/feature-cluster-metrics/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@
},
"scrapeInterval": {
"type": "string"
},
"selectorLabel": {
"type": "string"
}
}
},
Expand Down Expand Up @@ -478,6 +481,9 @@
},
"scrapeInterval": {
"type": "string"
},
"selectorLabel": {
"type": "string"
}
}
},
Expand Down Expand Up @@ -518,6 +524,9 @@
},
"scrapeInterval": {
"type": "string"
},
"selectorLabel": {
"type": "string"
}
}
},
Expand Down
12 changes: 12 additions & 0 deletions charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ kubeControllerManager:
# @section -- Kube Controller Manager
jobLabel: "kube-controller-manager"

# -- Selector label.
# @section -- Kube Controller Manager
selectorLabel: "component=kube-controller-manager"

# -- Port number used by the Kube Controller Manager, set by `--secure-port.`
# @section -- Kube Controller Manager
port: 10257
Expand Down Expand Up @@ -323,6 +327,10 @@ kubeProxy:
# @section -- Kube Proxy
jobLabel: "integrations/kubernetes/kube-proxy"

# -- Selector label.
# @section -- Kube Proxy
selectorLabel: "k8s-app=kube-proxy"

# -- Port number used by the Kube Proxy, set in `--metrics-bind-address`.
# @section -- Kube Proxy
port: 10249
Expand Down Expand Up @@ -374,6 +382,10 @@ kubeScheduler:
# @section -- Kube Scheduler
jobLabel: "kube-scheduler"

# -- Selector label.
# @section -- Kube Scheduler
selectorLabel: "component=kube-scheduler"

# -- Port number used by the Kube Scheduler, set by `--secure-port`.
# @section -- Kube Scheduler
port: 10259
Expand Down