Skip to content

Commit 1ef7df5

Browse files
committed
[bot] [main] Automated dependencies update
1 parent 1dd6747 commit 1ef7df5

22 files changed

+282
-49
lines changed

jsonnetfile.lock.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "fdf28cba6742e394019f978dfe73f1fbef8dfec7",
21+
"version": "353107914b9fa18b9d2e0477bb18b7eec5e210ce",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "bada41fb2456de4cb5674afb3dcaaeadc9aebd5f",
31+
"version": "9e34aea982f3b935dfbf172fe59fb69d0b6af213",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
92+
"version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
102+
"version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "760b786b29edb4aa917e87746cb9e2cab9cf3066",
163-
"sum": "s0i5RLx1pGrmAuN4Oat5JdusWgqv1ATAqBb3rieyAMo="
162+
"version": "68619d9afe02555c25b784ed2e73e907380f0876",
163+
"sum": "zXJkWr2Fv+XINGqfp1KSMiaB1mbQkxWuT5P24wrW+rg="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "b13fafecdd2876f5948561ccd97458f2280be935",
172+
"version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "b13fafecdd2876f5948561ccd97458f2280be935",
184-
"sum": "UqEghJURqk02Kz8faiOJQVYxGBM4g66zdawqg3qMHOA="
183+
"version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
184+
"sum": "6TSrvGOx2RUMfEI/0sq4tLO2kPfJPjor+gxeZYMIH2Q="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "17f42810382299639b34b56a01550243f2b2512a",
193+
"version": "28d3f86811b1cd4e8a17f45cf90a1db357092589",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "b959d48df950d5c446660eca3354c26eb997ca44",
204+
"version": "b6112eac8af48aceb75691416ce66a5056e7f258",
205205
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
206206
},
207207
{
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "d5cc5e2738e2d0bd80c9ea31ba48fae80613917c",
214+
"version": "c9e0e36701bcd1a7a6ccc372834e227fda31e616",
215215
"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
216216
"name": "prometheus"
217217
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "3f26e056719e4310daa7f1fbe6c7ce5033305051",
236+
"version": "d997eed1749e4d91243efc0137f6a20cb659841b",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ spec:
25722572
type: object
25732573
type: array
25742574
name:
2575-
description: name defiens the name of the receiver. Must be unique across all items from the list.
2575+
description: name defines the name of the receiver. Must be unique across all items from the list.
25762576
minLength: 1
25772577
type: string
25782578
opsgenieConfigs:

monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6213,7 +6213,7 @@ spec:
62136213
description: |-
62146214
serviceName defines the service name used by the underlying StatefulSet(s) as the governing service.
62156215
If defined, the Service must be created before the Alertmanager resource in the same namespace and it must define a selector that matches the pod labels.
6216-
If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alermanager resources.
6216+
If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alertmanager resources.
62176217
When deploying multiple Alertmanager resources in the same namespace, it is recommended to specify a different value for each.
62186218
See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
62196219
minLength: 1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ spec:
12061206
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
12071207
properties:
12081208
bindings:
1209-
description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
1209+
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
12101210
items:
12111211
description: WorkloadBinding is a link between a configuration resource and a workload resource.
12121212
properties:
@@ -1268,10 +1268,11 @@ spec:
12681268
minLength: 1
12691269
type: string
12701270
resource:
1271-
description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
1271+
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
12721272
enum:
12731273
- prometheuses
12741274
- prometheusagents
1275+
- thanosrulers
12751276
type: string
12761277
required:
12771278
- group

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ spec:
653653
x-kubernetes-list-type: map
654654
prober:
655655
description: |-
656-
prober defines the pecification for the prober to use for probing targets.
656+
prober defines the specification for the prober to use for probing targets.
657657
The prober.URL parameter is required. Targets cannot be probed if left empty.
658658
properties:
659659
noProxy:
@@ -1207,7 +1207,7 @@ spec:
12071207
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
12081208
properties:
12091209
bindings:
1210-
description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
1210+
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
12111211
items:
12121212
description: WorkloadBinding is a link between a configuration resource and a workload resource.
12131213
properties:
@@ -1269,10 +1269,11 @@ spec:
12691269
minLength: 1
12701270
type: string
12711271
resource:
1272-
description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
1272+
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
12731273
enum:
12741274
- prometheuses
12751275
- prometheusagents
1276+
- thanosrulers
12761277
type: string
12771278
required:
12781279
- group

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5606,6 +5606,12 @@ spec:
56065606
minItems: 1
56075607
type: array
56085608
x-kubernetes-list-type: set
5609+
promoteScopeMetadata:
5610+
description: |-
5611+
promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
5612+
As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
5613+
It requires Prometheus >= v3.6.0.
5614+
type: boolean
56095615
translationStrategy:
56105616
description: |-
56115617
translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
@@ -5615,14 +5621,15 @@ spec:
56155621
- NoUTF8EscapingWithSuffixes
56165622
- UnderscoreEscapingWithSuffixes
56175623
- NoTranslation
5624+
- UnderscoreEscapingWithoutSuffixes
56185625
type: string
56195626
type: object
56205627
overrideHonorLabels:
56215628
description: |-
56225629
overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
56235630
to “exported_” for all targets created from ServiceMonitor, PodMonitor and
56245631
ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
5625-
In practice,`overrideHonorLaels:true` enforces `honorLabels:false`
5632+
In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
56265633
for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
56275634
type: boolean
56285635
overrideHonorTimestamps:
@@ -5953,7 +5960,7 @@ spec:
59535960
type: object
59545961
type: array
59555962
query:
5956-
description: query defines the configuration of the Promethus query service.
5963+
description: query defines the configuration of the Prometheus query service.
59575964
properties:
59585965
lookbackDelta:
59595966
description: lookbackDelta defines the delta difference allowed for retrieving metrics during expression evaluations.

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4879,6 +4879,12 @@ spec:
48794879
minItems: 1
48804880
type: array
48814881
x-kubernetes-list-type: set
4882+
promoteScopeMetadata:
4883+
description: |-
4884+
promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
4885+
As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
4886+
It requires Prometheus >= v3.6.0.
4887+
type: boolean
48824888
translationStrategy:
48834889
description: |-
48844890
translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
@@ -4888,14 +4894,15 @@ spec:
48884894
- NoUTF8EscapingWithSuffixes
48894895
- UnderscoreEscapingWithSuffixes
48904896
- NoTranslation
4897+
- UnderscoreEscapingWithoutSuffixes
48914898
type: string
48924899
type: object
48934900
overrideHonorLabels:
48944901
description: |-
48954902
overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
48964903
to “exported_” for all targets created from ServiceMonitor, PodMonitor and
48974904
ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
4898-
In practice,`overrideHonorLaels:true` enforces `honorLabels:false`
4905+
In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
48994906
for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
49004907
type: boolean
49014908
overrideHonorTimestamps:

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,102 @@ spec:
147147
- name
148148
x-kubernetes-list-type: map
149149
type: object
150+
status:
151+
description: |-
152+
status defines the status subresource. It is under active development and is updated only when the
153+
"StatusForConfigurationResources" feature gate is enabled.
154+
155+
Most recent observed status of the PrometheusRule. Read-only.
156+
More info:
157+
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
158+
properties:
159+
bindings:
160+
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
161+
items:
162+
description: WorkloadBinding is a link between a configuration resource and a workload resource.
163+
properties:
164+
conditions:
165+
description: conditions defines the current state of the configuration resource when bound to the referenced Prometheus object.
166+
items:
167+
description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager, or ThanosRuler.
168+
properties:
169+
lastTransitionTime:
170+
description: lastTransitionTime defines the time of the last update to the current status property.
171+
format: date-time
172+
type: string
173+
message:
174+
description: message defines the human-readable message indicating details for the condition's last transition.
175+
type: string
176+
observedGeneration:
177+
description: |-
178+
observedGeneration defines the .metadata.generation that the
179+
condition was set based upon. For instance, if `.metadata.generation` is
180+
currently 12, but the `.status.conditions[].observedGeneration` is 9, the
181+
condition is out of date with respect to the current state of the object.
182+
format: int64
183+
type: integer
184+
reason:
185+
description: reason for the condition's last transition.
186+
type: string
187+
status:
188+
description: status of the condition.
189+
minLength: 1
190+
type: string
191+
type:
192+
description: |-
193+
type of the condition being reported.
194+
Currently, only "Accepted" is supported.
195+
enum:
196+
- Accepted
197+
minLength: 1
198+
type: string
199+
required:
200+
- lastTransitionTime
201+
- status
202+
- type
203+
type: object
204+
type: array
205+
x-kubernetes-list-map-keys:
206+
- type
207+
x-kubernetes-list-type: map
208+
group:
209+
description: group defines the group of the referenced resource.
210+
enum:
211+
- monitoring.coreos.com
212+
type: string
213+
name:
214+
description: name defines the name of the referenced object.
215+
minLength: 1
216+
type: string
217+
namespace:
218+
description: namespace defines the namespace of the referenced object.
219+
minLength: 1
220+
type: string
221+
resource:
222+
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
223+
enum:
224+
- prometheuses
225+
- prometheusagents
226+
- thanosrulers
227+
type: string
228+
required:
229+
- group
230+
- name
231+
- namespace
232+
- resource
233+
type: object
234+
type: array
235+
x-kubernetes-list-map-keys:
236+
- group
237+
- resource
238+
- name
239+
- namespace
240+
x-kubernetes-list-type: map
241+
type: object
150242
required:
151243
- spec
152244
type: object
153245
served: true
154246
storage: true
247+
subresources:
248+
status: {}

monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10032,7 +10032,7 @@ spec:
1003210032
type: string
1003310033
applicationCredentialSecret:
1003410034
description: |-
10035-
applicationCredentialSecret defines the requiered field if using an application
10035+
applicationCredentialSecret defines the required field if using an application
1003610036
credential to authenticate.
1003710037
properties:
1003810038
key:
@@ -10118,7 +10118,7 @@ spec:
1011810118
type: string
1011910119
projectName:
1012010120
description: |-
10121-
projectName defines an ptional field for the Identity V2 API.
10121+
projectName defines an optional field for the Identity V2 API.
1012210122
Some providers allow you to specify a ProjectName instead of the ProjectId.
1012310123
Some require both. Your provider's authentication policies will determine
1012410124
how these fields influence authentication.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ spec:
12261226
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
12271227
properties:
12281228
bindings:
1229-
description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
1229+
description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
12301230
items:
12311231
description: WorkloadBinding is a link between a configuration resource and a workload resource.
12321232
properties:
@@ -1288,10 +1288,11 @@ spec:
12881288
minLength: 1
12891289
type: string
12901290
resource:
1291-
description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
1291+
description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
12921292
enum:
12931293
- prometheuses
12941294
- prometheusagents
1295+
- thanosrulers
12951296
type: string
12961297
required:
12971298
- group

0 commit comments

Comments
 (0)