diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 666e1252a850b51fcd3bd59f870417610bb21812..c0177cb75b4961a84c4cae0d150afd140bd391fc 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -2,11 +2,11 @@ "alertmanager": "0.23.0", "blackboxExporter": "0.19.0", "grafana": "8.1.5", - "kubeStateMetrics": "2.2.0", + "kubeStateMetrics": "2.2.1", "nodeExporter": "1.2.2", "prometheus": "2.30.0", "prometheusAdapter": "0.9.0", - "prometheusOperator": "0.50.0", + "prometheusOperator": "0.51.1", "kubeRbacProxy": "0.11.0", "configmapReload": "0.5.0" } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 1f03ea80f6578f63a26d69dec036067d233b20c4..57807963d9bdccf462a317a0b6310a51362790b9 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "752a206da449cf3b8dcea2bc6915262ffd1b0ac5", + "version": "3df272774672366beb02c5447782805ab5fec957", "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI=" }, { @@ -68,7 +68,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "b5228e737dbedef617a8d310430f4fbab8ab6842", + "version": "cff82c8764d70a8e6d91ebbb48860f86525d2d2f", "sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "b5228e737dbedef617a8d310430f4fbab8ab6842", + "version": "cff82c8764d70a8e6d91ebbb48860f86525d2d2f", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -120,8 +120,8 @@ "subdir": "docs/node-mixin" } }, - "version": "60e9670f1485deeadb8027e16c393d74d0af6594", - "sum": "OFNs9Te1QMqSscXqNqMv0zwaJoJxaEg7NyQVNyT4VeA=" + "version": "0e6b23c338e98809c9872c70a2f5dfa8d6d370d4", + "sum": "MnfAA4+l2BkgJncnYfV8uHC7CxHZut8+ap8KkEqyB5Y=" }, { "source": { @@ -130,7 +130,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "dbbfd1ccf657e831d752932f4fdb4e847429780e", + "version": "149e36921b9246792a5114b3e36b486227c8e439", "sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=", "name": "prometheus" }, @@ -141,7 +141,7 @@ "subdir": "mixin" } }, - "version": "e1bfe9d1d2abbd0be5d186f83b671b267f94ba33", + "version": "fc8e64cc0114ed9d019de096470649cb8151db8a", "sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=", "name": "thanos-mixin" }, diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml index 9b7d81f123a5a5f01bea9480a3af6128df79cca2..31359129faf30a827296f769c2c65ee611d656c6 100644 --- a/manifests/kube-state-metrics-clusterRole.yaml +++ b/manifests/kube-state-metrics-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics rules: - apiGroups: diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml index 43243f70bdc654b8319e1f41407cc037a33dbd05..19fc3981ed31a9e92ee5efc6178931ce4b36bfd6 100644 --- a/manifests/kube-state-metrics-clusterRoleBinding.yaml +++ b/manifests/kube-state-metrics-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index caf97030142db616280357364d6eeae483efab58..44c6f04ed57f4ebd6d4fdb59d5c5c42bc6297826 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics namespace: monitoring spec: @@ -23,7 +23,7 @@ spec: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 spec: containers: - args: @@ -31,7 +31,7 @@ spec: - --port=8081 - --telemetry-host=127.0.0.1 - --telemetry-port=8082 - image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.2.0 + image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.2.1 name: kube-state-metrics resources: limits: diff --git a/manifests/kube-state-metrics-prometheusRule.yaml b/manifests/kube-state-metrics-prometheusRule.yaml index f90f6343c8aa8ee30bced1f65fbe8e61733add71..c07571cd2a087aff9e4f5c5a09780315a768fd55 100644 --- a/manifests/kube-state-metrics-prometheusRule.yaml +++ b/manifests/kube-state-metrics-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 prometheus: k8s role: alert-rules name: kube-state-metrics-rules diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml index 80bf3bdf8316fd54806f6120893ebf1b90a663ee..7864ba7206cd7f508b161b0b19e52db0f19fbb24 100644 --- a/manifests/kube-state-metrics-service.yaml +++ b/manifests/kube-state-metrics-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics namespace: monitoring spec: diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml index 248654d012caae85fa2dc651765f5f57963a0508..d4f2543b85bb8961d4230f8fc2eabc875ff2a8fa 100644 --- a/manifests/kube-state-metrics-serviceAccount.yaml +++ b/manifests/kube-state-metrics-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics namespace: monitoring diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml index 052e6b2284a7c45ed4763abf596881122925e4bc..b7ea147d838f4f6ef6749459f86d2b61ac118f31 100644 --- a/manifests/kube-state-metrics-serviceMonitor.yaml +++ b/manifests/kube-state-metrics-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.2.0 + app.kubernetes.io/version: 2.2.1 name: kube-state-metrics namespace: monitoring spec: diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml index 0a39b89035f2599914524f5e305f591a2b4ec405..91289850435079cb714abac6e5e1f92aa427d9fb 100644 --- a/manifests/node-exporter-prometheusRule.yaml +++ b/manifests/node-exporter-prometheusRule.yaml @@ -269,6 +269,16 @@ spec: - expr: | 1 - ( node_memory_MemAvailable_bytes{job="node-exporter"} + or + ( + node_memory_Buffers_bytes{job="node-exporter"} + + + node_memory_Cached_bytes{job="node-exporter"} + + + node_memory_MemFree_bytes{job="node-exporter"} + + + node_memory_Slab_bytes{job="node-exporter"} + ) / node_memory_MemTotal_bytes{job="node-exporter"} ) diff --git a/manifests/prometheus-operator-prometheusRule.yaml b/manifests/prometheus-operator-prometheusRule.yaml index 4921fe6848b7759bfaa9ff13e2148cefe6e7c099..7a428aabd826f9d25211efc8f7e98c2d10f3f14c 100644 --- a/manifests/prometheus-operator-prometheusRule.yaml +++ b/manifests/prometheus-operator-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 prometheus: k8s role: alert-rules name: prometheus-operator-rules diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml index dddeb0ac753946378721babdfe0e642ca08e4fb9..edbd1a8afedc45e6554cad4a01d2ebd0f2af3d66 100644 --- a/manifests/prometheus-operator-serviceMonitor.yaml +++ b/manifests/prometheus-operator-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator namespace: monitoring spec: @@ -21,4 +21,4 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml index 5eea2738b8e61d06f25323a90c2b5ae5fce7740a..5130c1548f2997cb49afde336ceba040c06261e7 100644 --- a/manifests/setup/prometheus-operator-clusterRole.yaml +++ b/manifests/setup/prometheus-operator-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml index 3ce2b874876404ef5c5ae52ca735dffed4e2492c..e6a0cf7f1201cdfeb9738245305ff3219c04ef2d 100644 --- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml +++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml index b832acb8dca8387baf26cf898a8b5ebb4bc268ef..79872414210cd89c654c1b63bea1e6b831f142c2 100644 --- a/manifests/setup/prometheus-operator-deployment.yaml +++ b/manifests/setup/prometheus-operator-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator namespace: monitoring spec: @@ -23,13 +23,13 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 spec: containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.50.0 - image: quay.io/prometheus-operator/prometheus-operator:v0.50.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.51.1 + image: quay.io/prometheus-operator/prometheus-operator:v0.51.1 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml index a8161b086ce80ad8e78af7b5ce396f03dc07da84..dbd6cb06eff348f7fb0b3612356d58f6f4b9069c 100644 --- a/manifests/setup/prometheus-operator-service.yaml +++ b/manifests/setup/prometheus-operator-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml index 9acb906d900d6af091c7dfac308ca9f762c49d5c..4d4b35068059e93a0b9491e90462eda08dddb5c5 100644 --- a/manifests/setup/prometheus-operator-serviceAccount.yaml +++ b/manifests/setup/prometheus-operator-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.50.0 + app.kubernetes.io/version: 0.51.1 name: prometheus-operator namespace: monitoring