Skip to content

Commit

Permalink
[bot] [main] Automated version update (#2265)
Browse files Browse the repository at this point in the history
Co-authored-by: Prometheus Operator Bot <[email protected]>
  • Loading branch information
prom-op-bot and prom-op-bot authored Nov 13, 2023
1 parent ddff48c commit 5e2890e
Show file tree
Hide file tree
Showing 29 changed files with 69 additions and 47 deletions.
4 changes: 2 additions & 2 deletions jsonnet/kube-prometheus/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"blackboxExporter": "0.24.0",
"grafana": "10.2.0",
"kubeStateMetrics": "2.9.2",
"nodeExporter": "1.6.1",
"nodeExporter": "1.7.0",
"prometheus": "2.47.2",
"prometheusAdapter": "0.11.1",
"prometheusOperator": "0.69.0",
"prometheusOperator": "0.69.1",
"kubeRbacProxy": "0.15.0",
"configmapReload": "0.5.0",
"pyrra": "0.6.4"
Expand Down
24 changes: 12 additions & 12 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "02794b00eb0e964943c91d283106072e18fdc092",
"version": "4d8eefb7e96bf2b33ec9c6d3017ad24f9ffbb82a",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
Expand Down Expand Up @@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
"version": "1fa8fdbf030cecf0c0900cda2954585f08a88b60",
"version": "a7647832fd3eaae70411bc9f697fa7504b04796c",
"sum": "aCN8uCrs2PDLR0SzRAuwZ6C5hiKt1KggCUCT7/F8yZ0="
},
{
Expand Down Expand Up @@ -98,8 +98,8 @@
"subdir": ""
}
},
"version": "acfbc128490131160fec2eff8716a625c8abb574",
"sum": "QAFPqINQVeeE35yL44D20W8Wfh9QbtsQGT8AfMYTMgw="
"version": "bcf8426b9c5ee85fdf8a6d9c62708f94e0367b21",
"sum": "1pCIS5kwa2b5JniHr3WV5wwiau29gM0fNQmqO2mXiCQ="
},
{
"source": {
Expand All @@ -108,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "a5e439a0a8df5ec51a7430a1a485dcbb34fbd076",
"version": "4e431f6d149abbb547cefdd884274c1e9a6c5c9f",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
Expand All @@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "a5e439a0a8df5ec51a7430a1a485dcbb34fbd076",
"version": "4e431f6d149abbb547cefdd884274c1e9a6c5c9f",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
Expand All @@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "ba536405154d18f3a6f312818283d671182af6f3",
"version": "79502954f995929c8b3511d533a2e34bb3ee40ca",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "ba536405154d18f3a6f312818283d671182af6f3",
"sum": "SNUqDoYLfoey4VRF2hHE6ZFKMPof0mp1NGM9FjmWbrM="
"version": "79502954f995929c8b3511d533a2e34bb3ee40ca",
"sum": "K0lvxR49VZN9odlPo+12XBjzPqeQgN/imkJq5GqexaI="
},
{
"source": {
Expand All @@ -160,8 +160,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "ed1b8e3d88851806627e4f8262ee26232ca56c2c",
"sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
"version": "81fc05c45f4e63d4fb8cb1acda016493b003b9f3",
"sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
},
{
"source": {
Expand All @@ -170,7 +170,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "b80617a248a557f6f9e7e708dafb0381ccd414a8",
"version": "acc114fe553b660cefc71a0311792ef8be4a186a",
"sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
"name": "prometheus"
},
Expand Down
14 changes: 13 additions & 1 deletion manifests/kubernetesControlPlane-prometheusRule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ spec:
- expr: |
sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"5.."}[1h]))
record: code_verb:apiserver_request_total:increase1h
- name: k8s.rules
- name: k8s.rules.container_cpu_usage_seconds_total
rules:
- expr: |
sum by (cluster, namespace, pod, container) (
Expand All @@ -1206,30 +1206,40 @@ spec:
1, max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate
- name: k8s.rules.container_memory_working_set_bytes
rules:
- expr: |
container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
* on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_working_set_bytes
- name: k8s.rules.container_memory_rss
rules:
- expr: |
container_memory_rss{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
* on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_rss
- name: k8s.rules.container_memory_cache
rules:
- expr: |
container_memory_cache{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
* on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_cache
- name: k8s.rules.container_memory_swap
rules:
- expr: |
container_memory_swap{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
* on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
)
record: node_namespace_pod_container:container_memory_swap
- name: k8s.rules.container_resource
rules:
- expr: |
kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster)
group_left() max by (namespace, pod, cluster) (
Expand Down Expand Up @@ -1298,6 +1308,8 @@ spec:
)
)
record: namespace_cpu:kube_pod_container_resource_limits:sum
- name: k8s.rules.pod_owner
rules:
- expr: |
max by (cluster, namespace, workload, pod) (
label_replace(
Expand Down
2 changes: 1 addition & 1 deletion manifests/nodeExporter-clusterRole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion manifests/nodeExporter-clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
6 changes: 3 additions & 3 deletions manifests/nodeExporter-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
namespace: monitoring
spec:
Expand All @@ -22,7 +22,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
spec:
automountServiceAccountToken: true
containers:
Expand All @@ -37,7 +37,7 @@ spec:
- --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|run/k3s/containerd/.+|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
- --collector.netclass.ignored-devices=^(veth.*|[a-f0-9]{15})$
- --collector.netdev.device-exclude=^(veth.*|[a-f0-9]{15})$
image: quay.io/prometheus/node-exporter:v1.6.1
image: quay.io/prometheus/node-exporter:v1.7.0
name: node-exporter
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion manifests/nodeExporter-networkPolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
namespace: monitoring
spec:
Expand Down
12 changes: 11 additions & 1 deletion manifests/nodeExporter-prometheusRule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
prometheus: k8s
role: alert-rules
name: node-exporter-rules
Expand Down Expand Up @@ -316,6 +316,16 @@ spec:
for: 5m
labels:
severity: warning
- alert: NodeBondingDegraded
annotations:
description: Bonding interface {{ $labels.master }} on {{ $labels.instance }} is in degraded state due to one or more slave failures.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/node/nodebondingdegraded
summary: Bonding interface is degraded
expr: |
(node_bonding_slaves - node_bonding_active) != 0
for: 5m
labels:
severity: warning
- name: node-exporter.rules
rules:
- expr: |
Expand Down
2 changes: 1 addition & 1 deletion manifests/nodeExporter-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
namespace: monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/nodeExporter-serviceAccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
namespace: monitoring
2 changes: 1 addition & 1 deletion manifests/nodeExporter-serviceMonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.6.1
app.kubernetes.io/version: 1.7.0
name: node-exporter
namespace: monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-clusterRole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
8 changes: 4 additions & 4 deletions manifests/prometheusOperator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
namespace: monitoring
spec:
Expand All @@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.69.0
app.kubernetes.io/version: 0.69.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.69.0
image: quay.io/prometheus-operator/prometheus-operator:v0.69.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.69.1
image: quay.io/prometheus-operator/prometheus-operator:v0.69.1
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-networkPolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
namespace: monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-prometheusRule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
namespace: monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/prometheusOperator-serviceAccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
namespace: monitoring
4 changes: 2 additions & 2 deletions manifests/prometheusOperator-serviceMonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.69.0
app.kubernetes.io/version: 0.69.1
name: prometheus-operator
namespace: monitoring
spec:
Expand All @@ -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.69.0
app.kubernetes.io/version: 0.69.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.69.0
operator.prometheus.io/version: 0.69.1
creationTimestamp: null
name: alertmanagerconfigs.monitoring.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/setup/0alertmanagerCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.69.0
operator.prometheus.io/version: 0.69.1
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/setup/0podmonitorCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.69.0
operator.prometheus.io/version: 0.69.1
creationTimestamp: null
name: podmonitors.monitoring.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion manifests/setup/0probeCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.69.0
operator.prometheus.io/version: 0.69.1
creationTimestamp: null
name: probes.monitoring.coreos.com
spec:
Expand Down
Loading

0 comments on commit 5e2890e

Please sign in to comment.