Merge pull request #1515 from prometheus-operator/automated-updates-main

This commit is contained in:
Paweł Krupa
2021-11-22 11:28:08 +01:00
committed by GitHub
26 changed files with 356 additions and 354 deletions
+3 -3
View File
@@ -1,12 +1,12 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
"grafana": "8.2.3",
"grafana": "8.2.5",
"kubeStateMetrics": "2.2.4",
"nodeExporter": "1.2.2",
"nodeExporter": "1.3.0",
"prometheus": "2.31.1",
"prometheusAdapter": "0.9.1",
"prometheusOperator": "0.52.0",
"prometheusOperator": "0.52.1",
"kubeRbacProxy": "0.11.0",
"configmapReload": "0.5.0"
}
+16 -16
View File
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "db6cd70b54dd6d0715a5314fd56fb180d51c5609",
"version": "8f17652c6096757feaf68973161508730ba2fa57",
"sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU="
},
{
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
"version": "349f3ac0ab9aae7f5e7529b9dfdaa196e967f38b",
"version": "6639a82ac03f9f8e3f6672c5de48fd9e19578e82",
"sum": "y8uA/daOROErelzoo2p1rtqABhUPArg2alsfcb0PQBk="
},
{
@@ -48,8 +48,8 @@
"subdir": ""
}
},
"version": "bcfd861fef9e3d085ad2cf5498f696c0c57c0755",
"sum": "1ZJ34n3g9CvkxgmqdUBfoB+PYt6qYdGwNXw7FLfFol8="
"version": "0c1cd2882281028c47fb06310e919dc71565bf09",
"sum": "2mH6p/tB7MYvdT+wZP3t0oIp/wh58YxhiXUOQ2VmrGk="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
"version": "bcfd861fef9e3d085ad2cf5498f696c0c57c0755",
"version": "0c1cd2882281028c47fb06310e919dc71565bf09",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "e859b280fcc2e61db05c1ddab7709c58432868a6",
"version": "0c33f919a18ba6e8fd5d18ea9ebe9ae1a8435dce",
"sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "e859b280fcc2e61db05c1ddab7709c58432868a6",
"version": "0c33f919a18ba6e8fd5d18ea9ebe9ae1a8435dce",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "6dfe2c320963277d3e6aa9da25d2a347a776535f",
"version": "987d70d3f1332cdf5b7c62bbffacf680b01c29ef",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "6dfe2c320963277d3e6aa9da25d2a347a776535f",
"sum": "YXMpklh9RgdoRWAX1BzqpbG73uJqZg8X0eo2ox1b1ZE="
"version": "987d70d3f1332cdf5b7c62bbffacf680b01c29ef",
"sum": "Rfp48pJ3uRMK4/8keqzjZjlAa/Ztb1q/do44YYlHdSQ="
},
{
"source": {
@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "30e0da475474b63c96ed15ceaa72129c41c62959",
"version": "e2a10119aaf7777fa523d216e05897c5b719134c",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "85e20238e7725960c8fc84e1299b2dcaf08eed6b",
"version": "9fbb56c9c80d5486d6de5e06a224a1eb343b28e7",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
@@ -130,8 +130,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "f678ae2146a6a54222ee16c382d6a8354473491a",
"sum": "n5Zdr/7YeRb8Y9FsXnul5K+hprHOzuSXsYdkapEhPts=",
"version": "0eac720468cf1b4bfee5cf3a4587cb5a409c1607",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
{
@@ -141,8 +141,8 @@
"subdir": "mixin"
}
},
"version": "ef1e43fda359cc4a07a31e9e04e68e1b1db5a8ad",
"sum": "ZXF6UmIrNVNjPXu1l9RmvYMB/1mpUEp1tiZtlBaHvNI=",
"version": "243526d6a7108af41ce76586832358c1a467362d",
"sum": "2mA8HiOBtNle+J81PGsXmxkVXGuVSRExZv9+xhnCeUs=",
"name": "thanos-mixin"
},
{
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana-config
namespace: monitoring
stringData:
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana-datasources
namespace: monitoring
stringData:
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana-dashboards
namespace: monitoring
+6 -6
View File
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana
namespace: monitoring
spec:
@@ -18,18 +18,18 @@ spec:
template:
metadata:
annotations:
checksum/grafana-config: b79dc1ccbe0b7bb9061f33b070644207
checksum/grafana-dashboardproviders: 9f3dea5af0d21594c8f3f300913c7d5b
checksum/grafana-datasources: f4a0ab9b93870ef81e1991c63860041a
checksum/grafana-config: 36738edb3585a7b4c59e0ba943c39c0f
checksum/grafana-dashboardproviders: 12a41272fc79f3d3ad103c8db5a7e8ed
checksum/grafana-datasources: 362f3d86f6b4437765b9d03f74316fa7
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
spec:
containers:
- env: []
image: grafana/grafana:8.2.3
image: grafana/grafana:8.2.5
name: grafana
ports:
- containerPort: 3000
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana
namespace: monitoring
spec:
+1 -1
View File
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana
namespace: monitoring
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 8.2.3
app.kubernetes.io/version: 8.2.5
name: grafana
namespace: monitoring
spec:
+4 -4
View File
@@ -1251,7 +1251,7 @@ spec:
record: node_namespace_pod_container:container_memory_swap
- expr: |
kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster)
group_left() max by (namespace, pod) (
group_left() max by (namespace, pod, cluster) (
(kube_pod_status_phase{phase=~"Pending|Running"} == 1)
)
record: cluster:namespace:pod_memory:active:kube_pod_container_resource_requests
@@ -1268,7 +1268,7 @@ spec:
record: namespace_memory:kube_pod_container_resource_requests:sum
- expr: |
kube_pod_container_resource_requests{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster)
group_left() max by (namespace, pod) (
group_left() max by (namespace, pod, cluster) (
(kube_pod_status_phase{phase=~"Pending|Running"} == 1)
)
record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests
@@ -1285,7 +1285,7 @@ spec:
record: namespace_cpu:kube_pod_container_resource_requests:sum
- expr: |
kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster)
group_left() max by (namespace, pod) (
group_left() max by (namespace, pod, cluster) (
(kube_pod_status_phase{phase=~"Pending|Running"} == 1)
)
record: cluster:namespace:pod_memory:active:kube_pod_container_resource_limits
@@ -1302,7 +1302,7 @@ spec:
record: namespace_memory:kube_pod_container_resource_limits:sum
- expr: |
kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster)
group_left() max by (namespace, pod) (
group_left() max by (namespace, pod, cluster) (
(kube_pod_status_phase{phase=~"Pending|Running"} == 1)
)
record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits
+1 -1
View File
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
rules:
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
roleRef:
+3 -3
View File
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
spec:
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
spec:
containers:
- args:
@@ -34,7 +34,7 @@ spec:
- --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|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.2.2
image: quay.io/prometheus/node-exporter:v1.3.0
name: node-exporter
resources:
limits:
+1 -1
View File
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
prometheus: k8s
role: alert-rules
name: node-exporter-rules
+1 -1
View File
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
spec:
+1 -1
View File
@@ -5,6 +5,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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
+1 -1
View File
@@ -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.2.2
app.kubernetes.io/version: 1.3.0
name: node-exporter
namespace: monitoring
spec:
@@ -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.52.0
app.kubernetes.io/version: 0.52.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
@@ -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.52.0
app.kubernetes.io/version: 0.52.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.52.0
app.kubernetes.io/version: 0.52.1
@@ -2633,7 +2633,9 @@ spec:
to true for the first-level route by the Prometheus operator.
type: boolean
groupBy:
description: List of labels to group by.
description: List of labels to group by. Labels must not be repeated
(unique list). Special label "..." (aggregate by all possible
labels), if provided, must be the only element in the list.
items:
type: string
type: array
@@ -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.52.0
app.kubernetes.io/version: 0.52.1
name: prometheus-operator
rules:
- apiGroups:
@@ -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.52.0
app.kubernetes.io/version: 0.52.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -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.52.0
app.kubernetes.io/version: 0.52.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.52.0
app.kubernetes.io/version: 0.52.1
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.52.0
image: quay.io/prometheus-operator/prometheus-operator:v0.52.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.52.1
image: quay.io/prometheus-operator/prometheus-operator:v0.52.1
name: prometheus-operator
ports:
- containerPort: 8080
@@ -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.52.0
app.kubernetes.io/version: 0.52.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -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.52.0
app.kubernetes.io/version: 0.52.1
name: prometheus-operator
namespace: monitoring