Skip to content

Commit 1dd6747

Browse files
roboquatroboquat
authored
Merge pull request #614 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents f6f7717 + 8ccf380 commit 1dd6747

File tree

12 files changed

+472
-71
lines changed

12 files changed

+472
-71
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "d3a8ea5dd5a878ec6b7660b2b249acafb915a4e4",
21+
"version": "fdf28cba6742e394019f978dfe73f1fbef8dfec7",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "76fab77f75a41791282617f177e70798ba911c13",
31+
"version": "bada41fb2456de4cb5674afb3dcaaeadc9aebd5f",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "e10cd2ae1352eaba653b52f7004e2e4a1354b014",
92+
"version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "e10cd2ae1352eaba653b52f7004e2e4a1354b014",
102+
"version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "77180e5901fd4c4a822a84722ba5253cb95a6c66",
133-
"sum": "sgjwZVw4ss4mtGXoOFJ5Cel1D0RX3hCaUrCgrKxAaZM="
132+
"version": "5dae7f6adf083639934a4a54aef451174dd84370",
133+
"sum": "St7n7FXqoobaBFI+FvC1OTbcYFZKCKblcwP9jJEV704="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "c892a3f9da523ffe04328e5c0de49b6bc37c2e86",
142+
"version": "941c6838fe19636355adbb14e0672e362f420145",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "c892a3f9da523ffe04328e5c0de49b6bc37c2e86",
152+
"version": "941c6838fe19636355adbb14e0672e362f420145",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,7 +159,7 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "94a390f5986dc34af181c03673ef3aa84ae50dba",
162+
"version": "760b786b29edb4aa917e87746cb9e2cab9cf3066",
163163
"sum": "s0i5RLx1pGrmAuN4Oat5JdusWgqv1ATAqBb3rieyAMo="
164164
},
165165
{
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "ea2b6502b7be62d9d9df9b01ee3618c0c7433781",
172+
"version": "b13fafecdd2876f5948561ccd97458f2280be935",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "ea2b6502b7be62d9d9df9b01ee3618c0c7433781",
184-
"sum": "rYL0JQBrqVIGTu7f82SBbbvOH5Ue5SPVyomen3AHlSc="
183+
"version": "b13fafecdd2876f5948561ccd97458f2280be935",
184+
"sum": "UqEghJURqk02Kz8faiOJQVYxGBM4g66zdawqg3qMHOA="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "117eb83c676d9e127161fe0f3863f792b49f09d7",
193+
"version": "17f42810382299639b34b56a01550243f2b2512a",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,8 +201,8 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "8da4825e48fcf71b026f3ca7a632fc9f732c3423",
205-
"sum": "NcpQ0Hz0qciUqmOYoAR0X8GUK5pH/QiUXm1aDNgvua0="
204+
"version": "b959d48df950d5c446660eca3354c26eb997ca44",
205+
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
206206
},
207207
{
208208
"source": {
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "594f9d63a5f9635d48d6e26b68b708e21630f9ee",
214+
"version": "d5cc5e2738e2d0bd80c9ea31ba48fae80613917c",
215215
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},

‎monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,8 +1196,101 @@ spec:
11961196
required:
11971197
- selector
11981198
type: object
1199+
status:
1200+
description: |-
1201+
status defines the status subresource. It is under active development and is updated only when the
1202+
"StatusForConfigurationResources" feature gate is enabled.
1203+
1204+
Most recent observed status of the PodMonitor. Read-only.
1205+
More info:
1206+
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
1207+
properties:
1208+
bindings:
1209+
description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
1210+
items:
1211+
description: WorkloadBinding is a link between a configuration resource and a workload resource.
1212+
properties:
1213+
conditions:
1214+
description: conditions defines the current state of the configuration resource when bound to the referenced Prometheus object.
1215+
items:
1216+
description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager, or ThanosRuler.
1217+
properties:
1218+
lastTransitionTime:
1219+
description: lastTransitionTime defines the time of the last update to the current status property.
1220+
format: date-time
1221+
type: string
1222+
message:
1223+
description: message defines the human-readable message indicating details for the condition's last transition.
1224+
type: string
1225+
observedGeneration:
1226+
description: |-
1227+
observedGeneration defines the .metadata.generation that the
1228+
condition was set based upon. For instance, if `.metadata.generation` is
1229+
currently 12, but the `.status.conditions[].observedGeneration` is 9, the
1230+
condition is out of date with respect to the current state of the object.
1231+
format: int64
1232+
type: integer
1233+
reason:
1234+
description: reason for the condition's last transition.
1235+
type: string
1236+
status:
1237+
description: status of the condition.
1238+
minLength: 1
1239+
type: string
1240+
type:
1241+
description: |-
1242+
type of the condition being reported.
1243+
Currently, only "Accepted" is supported.
1244+
enum:
1245+
- Accepted
1246+
minLength: 1
1247+
type: string
1248+
required:
1249+
- lastTransitionTime
1250+
- status
1251+
- type
1252+
type: object
1253+
type: array
1254+
x-kubernetes-list-map-keys:
1255+
- type
1256+
x-kubernetes-list-type: map
1257+
group:
1258+
description: group defines the group of the referenced resource.
1259+
enum:
1260+
- monitoring.coreos.com
1261+
type: string
1262+
name:
1263+
description: name defines the name of the referenced object.
1264+
minLength: 1
1265+
type: string
1266+
namespace:
1267+
description: namespace defines the namespace of the referenced object.
1268+
minLength: 1
1269+
type: string
1270+
resource:
1271+
description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
1272+
enum:
1273+
- prometheuses
1274+
- prometheusagents
1275+
type: string
1276+
required:
1277+
- group
1278+
- name
1279+
- namespace
1280+
- resource
1281+
type: object
1282+
type: array
1283+
x-kubernetes-list-map-keys:
1284+
- group
1285+
- resource
1286+
- name
1287+
- namespace
1288+
x-kubernetes-list-type: map
1289+
type: object
11991290
required:
12001291
- spec
12011292
type: object
12021293
served: true
12031294
storage: true
1295+
subresources:
1296+
status: {}

‎monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,8 +1197,101 @@ spec:
11971197
type: string
11981198
type: object
11991199
type: object
1200+
status:
1201+
description: |-
1202+
status defines the status subresource. It is under active development and is updated only when the
1203+
"StatusForConfigurationResources" feature gate is enabled.
1204+
1205+
Most recent observed status of the Probe. Read-only.
1206+
More info:
1207+
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
1208+
properties:
1209+
bindings:
1210+
description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
1211+
items:
1212+
description: WorkloadBinding is a link between a configuration resource and a workload resource.
1213+
properties:
1214+
conditions:
1215+
description: conditions defines the current state of the configuration resource when bound to the referenced Prometheus object.
1216+
items:
1217+
description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager, or ThanosRuler.
1218+
properties:
1219+
lastTransitionTime:
1220+
description: lastTransitionTime defines the time of the last update to the current status property.
1221+
format: date-time
1222+
type: string
1223+
message:
1224+
description: message defines the human-readable message indicating details for the condition's last transition.
1225+
type: string
1226+
observedGeneration:
1227+
description: |-
1228+
observedGeneration defines the .metadata.generation that the
1229+
condition was set based upon. For instance, if `.metadata.generation` is
1230+
currently 12, but the `.status.conditions[].observedGeneration` is 9, the
1231+
condition is out of date with respect to the current state of the object.
1232+
format: int64
1233+
type: integer
1234+
reason:
1235+
description: reason for the condition's last transition.
1236+
type: string
1237+
status:
1238+
description: status of the condition.
1239+
minLength: 1
1240+
type: string
1241+
type:
1242+
description: |-
1243+
type of the condition being reported.
1244+
Currently, only "Accepted" is supported.
1245+
enum:
1246+
- Accepted
1247+
minLength: 1
1248+
type: string
1249+
required:
1250+
- lastTransitionTime
1251+
- status
1252+
- type
1253+
type: object
1254+
type: array
1255+
x-kubernetes-list-map-keys:
1256+
- type
1257+
x-kubernetes-list-type: map
1258+
group:
1259+
description: group defines the group of the referenced resource.
1260+
enum:
1261+
- monitoring.coreos.com
1262+
type: string
1263+
name:
1264+
description: name defines the name of the referenced object.
1265+
minLength: 1
1266+
type: string
1267+
namespace:
1268+
description: namespace defines the namespace of the referenced object.
1269+
minLength: 1
1270+
type: string
1271+
resource:
1272+
description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
1273+
enum:
1274+
- prometheuses
1275+
- prometheusagents
1276+
type: string
1277+
required:
1278+
- group
1279+
- name
1280+
- namespace
1281+
- resource
1282+
type: object
1283+
type: array
1284+
x-kubernetes-list-map-keys:
1285+
- group
1286+
- resource
1287+
- name
1288+
- namespace
1289+
x-kubernetes-list-type: map
1290+
type: object
12001291
required:
12011292
- spec
12021293
type: object
12031294
served: true
12041295
storage: true
1296+
subresources:
1297+
status: {}

‎monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ spec:
12181218
type: object
12191219
status:
12201220
description: |-
1221-
status defines the status subresource is under active development and is updated only when the
1221+
status defines the status subresource. It is under active development and is updated only when the
12221222
"StatusForConfigurationResources" feature gate is enabled.
12231223
12241224
Most recent observed status of the ServiceMonitor. Read-only.

‎monitoring-satellite/manifests/kube-prometheus-rules/rules.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,9 +1017,9 @@ spec:
10171017
annotations:
10181018
description: Bonding interface {{ $labels.master }} on {{ $labels.instance }} is in degraded state due to one or more slave failures.
10191019
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/node/nodebondingdegraded
1020-
summary: Bonding interface is degraded
1020+
summary: Bonding interface is degraded.
10211021
expr: |
1022-
(node_bonding_slaves - node_bonding_active) != 0
1022+
(node_bonding_slaves{job="node-exporter"} - node_bonding_active{job="node-exporter"}) != 0
10231023
for: 5m
10241024
labels:
10251025
severity: warning

0 commit comments

Comments
 (0)