Skip to content

Commit 126d27d

Browse files
roboquatroboquat
committed
[bot] [main] Automated dependencies update
1 parent 326c110 commit 126d27d

21 files changed

+355
-193
lines changed

‎jsonnetfile.lock.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "472662fee06f79e68acf14d9ec4b4168dd59e490",
21+
"version": "f072712e29a2dafc92e7cfb3c76cea60e0d508b2",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "96a792181a7791302b15c3d1b21338a5d337bd33",
31+
"version": "f1c1f29e42f2956861189bf073b728c02cef376a",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "6226b75e3f026d26e56103df08b7350b26b7a183",
92+
"version": "da2e332f4ad19bc0e808fb70fcde951b0d9041e1",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,7 +99,7 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "6226b75e3f026d26e56103df08b7350b26b7a183",
102+
"version": "da2e332f4ad19bc0e808fb70fcde951b0d9041e1",
103103
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "1da53ae8652b014b34a0c2346fc67e0bbca7559c",
133-
"sum": "g1CTW1CQwszC4bhp1nHrg7bHzIttvLGPmlKUAhLDzUI="
132+
"version": "eb631d882a2c917cd9a5fc237cc2d0f37f8f890f",
133+
"sum": "7E/dvR6uooYrdb9GPx25tefet1YC1ijVcMrVntU+o+4="
134134
},
135135
{
136136
"source": {
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "4181356aa78a26f80a56c07238253e19eae374f7",
163-
"sum": "Y4zoEK4+AyASCUDOeN9eRnbIFpnuKZKMxFGQ2HPjS1U="
162+
"version": "2fe94c33794784a33b4bbe4fc074e057773b169a",
163+
"sum": "JpJEQX7aQIVrtbwqFMekRu2v1MngQIdBKnVKax8G+74="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "ba794f47ffbfa4e07f85c73d1a9138f2f01322cd",
172+
"version": "99f0cfdba694ca851bbc0d3ae478148b2e6ace09",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "ba794f47ffbfa4e07f85c73d1a9138f2f01322cd",
184-
"sum": "sXZVmJX3i3DKDE/zm6fggQ0AYV6mJCAJ62/ugCgMXz0="
183+
"version": "99f0cfdba694ca851bbc0d3ae478148b2e6ace09",
184+
"sum": "czJJUpeAtiksUzha5wkbTuswffY5fiPAFpBhEymiaWU="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "4534c9ac53d6bf502c27bc8fdd24341e9d4f2ba8",
193+
"version": "2c2c68cc969f355c09cabece00af2bd70340eaa0",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "2c04f2d7b1a7bbd260ffae70d1bd57b20c0c0d4f",
214+
"version": "789fddf25aaf1defafabadf6ce90413b9a69f72d",
215215
"sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=",
216216
"name": "prometheus"
217217
},
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "1190f25c796e57f03720f82a09b117a5ef2a8e69",
225+
"version": "9349cf03857a723a16cdfc13b7920401de6c0041",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "49a560d09dfa62d396b8070ceb9a31acc6464511",
236+
"version": "696193cc3562591c3c28394d33860ce909a66bca",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5376,15 +5376,36 @@ spec:
53765376
Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
53775377
It requires Prometheus >= v3.4.0.
53785378
type: boolean
5379+
ignoreResourceAttributes:
5380+
description: |-
5381+
List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.
5382+
5383+
It requires `promoteAllResourceAttributes` to be true.
5384+
It requires Prometheus >= v3.5.0.
5385+
items:
5386+
minLength: 1
5387+
type: string
5388+
minItems: 1
5389+
type: array
5390+
x-kubernetes-list-type: set
53795391
keepIdentifyingResourceAttributes:
53805392
description: |-
53815393
Enables adding `service.name`, `service.namespace` and `service.instance.id`
53825394
resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
53835395

53845396
It requires Prometheus >= v3.1.0.
53855397
type: boolean
5398+
promoteAllResourceAttributes:
5399+
description: |-
5400+
Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.
5401+
5402+
Cannot be true when `promoteResourceAttributes` is defined.
5403+
It requires Prometheus >= v3.5.0.
5404+
type: boolean
53865405
promoteResourceAttributes:
5387-
description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
5406+
description: |-
5407+
List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
5408+
Cannot be defined when `promoteAllResourceAttributes` is true.
53885409
items:
53895410
minLength: 1
53905411
type: string

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4649,15 +4649,36 @@ spec:
46494649
Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
46504650
It requires Prometheus >= v3.4.0.
46514651
type: boolean
4652+
ignoreResourceAttributes:
4653+
description: |-
4654+
List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.
4655+
4656+
It requires `promoteAllResourceAttributes` to be true.
4657+
It requires Prometheus >= v3.5.0.
4658+
items:
4659+
minLength: 1
4660+
type: string
4661+
minItems: 1
4662+
type: array
4663+
x-kubernetes-list-type: set
46524664
keepIdentifyingResourceAttributes:
46534665
description: |-
46544666
Enables adding `service.name`, `service.namespace` and `service.instance.id`
46554667
resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
46564668

46574669
It requires Prometheus >= v3.1.0.
46584670
type: boolean
4671+
promoteAllResourceAttributes:
4672+
description: |-
4673+
Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.
4674+
4675+
Cannot be true when `promoteResourceAttributes` is defined.
4676+
It requires Prometheus >= v3.5.0.
4677+
type: boolean
46594678
promoteResourceAttributes:
4660-
description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
4679+
description: |-
4680+
List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
4681+
Cannot be defined when `promoteAllResourceAttributes` is true.
46614682
items:
46624683
minLength: 1
46634684
type: string
@@ -10282,6 +10303,8 @@ spec:
1028210303
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.shards) && self.shards > 1)'
1028310304
- message: persistentVolumeClaimRetentionPolicy cannot be set when mode is DaemonSet
1028410305
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.persistentVolumeClaimRetentionPolicy))'
10306+
- message: scrapeConfigSelector cannot be set when mode is DaemonSet
10307+
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.scrapeConfigSelector))'
1028510308
status:
1028610309
description: |-
1028710310
Most recent observed status of the Prometheus cluster. Read-only.

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2505,6 +2505,22 @@ spec:
25052505
- Default
25062506
- None
25072507
type: string
2508+
enableFeatures:
2509+
description: |-
2510+
Enable access to Thanos Ruler feature flags. By default, no features are enabled.
2511+
2512+
Enabling features which are disabled by default is entirely outside the
2513+
scope of what the maintainers will support and by doing so, you accept
2514+
that this behaviour may break at any time without notice.
2515+
2516+
For more information see https://thanos.io/tip/components/rule.md/
2517+
2518+
It requires Thanos >= 0.39.0.
2519+
items:
2520+
minLength: 1
2521+
type: string
2522+
type: array
2523+
x-kubernetes-list-type: set
25082524
enableServiceLinks:
25092525
description: Indicates whether information about services should be injected into pod's environment variables
25102526
type: boolean
@@ -5384,6 +5400,10 @@ spec:
53845400
description: Number of thanos ruler instances to deploy.
53855401
format: int32
53865402
type: integer
5403+
resendDelay:
5404+
description: Minimum amount of time to wait before resending an alert to Alertmanager.
5405+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
5406+
type: string
53875407
resources:
53885408
description: |-
53895409
Resources defines the resource requirements for single Pods.
@@ -5466,6 +5486,13 @@ spec:
54665486
format: int32
54675487
minimum: 1
54685488
type: integer
5489+
ruleGracePeriod:
5490+
description: |-
5491+
Minimum duration between alert and restored "for" state.
5492+
This is maintained only for alerts with configured "for" time greater than grace period.
5493+
It requires Thanos >= v0.30.0.
5494+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
5495+
type: string
54695496
ruleNamespaceSelector:
54705497
description: |-
54715498
Namespaces to be selected for Rules discovery. If unspecified, only

‎monitoring-satellite/manifests/grafana/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 12.0.2
8+
app.kubernetes.io/version: 12.1.0
99
name: grafana-config
1010
namespace: monitoring-satellite
1111
stringData:

‎monitoring-satellite/manifests/grafana/dashboardDatasources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 12.0.2
8+
app.kubernetes.io/version: 12.1.0
99
name: grafana-datasources
1010
namespace: monitoring-satellite
1111
stringData:

0 commit comments

Comments
 (0)