Merge pull request #222 from appuio/feat/configure-metrics-server

Add config section `metricsServer`
appuio · Dec 4, 2024 · 5b95999 · 5b95999
2 parents f0b386f + becc500
commit 5b95999
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 24 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -54,6 +54,7 @@ parameters:
       k8sPrometheusAdapter: {}
       openshiftStateMetrics: {}
       thanosQuerier: {}
+      metricsServer: {}
     configsUserWorkload:
       alertmanager:
         enabled: true

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -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].
 
@@ -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`
 |====
 

diff --git a/...ity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/...ity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/release-4.16/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.16/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/...en/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/...en/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""

diff --git a/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -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": ""