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

Add config section metricsServer #222

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Add config section metricsServer #222

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
1 change: 1 addition & 0 deletions class/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ parameters:
k8sPrometheusAdapter: {}
openshiftStateMetrics: {}
thanosQuerier: {}
metricsServer: {}
configsUserWorkload:
alertmanager:
enabled: true
Expand Down
27 changes: 3 additions & 24 deletions docs/modules/ROOT/pages/references/parameters.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,29 +81,7 @@ A parameter to enable https://docs.openshift.com/container-platform/latest/monit

[horizontal]
type:: dictionary
default::
+
[source,yaml]
----
prometheusK8s:
remoteWrite: []
_remoteWrite: {}
externalLabels:
cluster_id: ${cluster:name}
tenant_id: ${cluster:tenant}
retention: 8d
volumeClaimTemplate:
spec:
resources:
requests:
storage: 50Gi
alertmanagerMain:
volumeClaimTemplate:
spec:
resources:
requests:
storage: 2Gi
----
default:: https://github.com/appuio/component-openshift4-monitoring/blob/master/class/defaults.yml[See `class/defaults.yml`]

A dictionary holding the configurations for the https://docs.openshift.com/container-platform/latest/monitoring/configuring-the-monitoring-stack.html#configuring-the-monitoring-stack_configuring-the-monitoring-stack[monitoring components].

Expand All @@ -123,7 +101,8 @@ This table shows the monitoring components you can configure and the keys used t
|openshift-state-metrics|`openshiftStateMetrics`
|Grafana|`grafana`
|Telemeter Client|`telemeterClient`
|Prometheus Adapter|`k8sPrometheusAdapter`
|Prometheus Adapter (for OpenShift 4.15 and older)|`k8sPrometheusAdapter`
|Metrics Server (for OpenShift 4.16 and newer)|`metricsServer`
|Thanos Querier|`thanosQuerier`
|====

Expand Down
3 changes: 3 additions & 0 deletions ...ity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/release-4.16/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions ...en/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
3 changes: 3 additions & 0 deletions tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ data:
"kubeStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"metricsServer":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
"openshiftStateMetrics":
"nodeSelector":
"node-role.kubernetes.io/infra": ""
Expand Down
Loading