Skip to content

Commit 6d10807

Browse files
authored
Merge pull request #590 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 4e27d5e + 4382ba2 commit 6d10807

File tree

5 files changed

+100
-12
lines changed

5 files changed

+100
-12
lines changed

jsonnetfile.lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "592c195ae21e8d58b7e2fef355e7067499d70edd",
21+
"version": "9349b23f0fb49fd8ea57b823572b5781fb25154d",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "7183b9e8adddaa27408d619d2cee18e38085e3a1",
31+
"version": "f88268c88903ae95efd71751803df7e009c40bcd",
3232
"sum": "m0HuOFGTj2J4HMjHxahFeNsKDXutPju29gIjVTc+eMM=",
3333
"name": "gitpod"
3434
},
@@ -159,7 +159,7 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "1e4df581de8897f16108bc4881be26e2a98c02b8",
162+
"version": "2c1dffebb7419f092b8eea40983f86e74fe41860",
163163
"sum": "8FKBFchMql/nAB7aIHpdCX1t9XD5CjunCPBGfJjb4ws="
164164
},
165165
{
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "8187c80aecbc98add3674312e0d4d2574a68dee9",
172+
"version": "8c9b53f53a347f3e2a1f4ccfa64a670c5d4bcb4b",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "8187c80aecbc98add3674312e0d4d2574a68dee9",
184-
"sum": "h0OqwZc+lM3wmZIeT2k3HntHpXxMGPqwMAXtfrtdk3Q="
183+
"version": "8c9b53f53a347f3e2a1f4ccfa64a670c5d4bcb4b",
184+
"sum": "yri/B9UZ7LyE8fwbpNVbZL8WHoWGS5/07wHC709DMsQ="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "b49dfc0e826093d91937ddd4dc9bdcfcca544071",
193+
"version": "0ce3cfb962db3cbb1649d3e816a49a13c4036cd1",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "67ebd4c4ffc652649fd3b348655d216fe4f832d1",
204+
"version": "e942bae99fc1054c62cf6735ed8566e78bed6beb",
205205
"sum": "NcpQ0Hz0qciUqmOYoAR0X8GUK5pH/QiUXm1aDNgvua0="
206206
},
207207
{
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "8e6b008608e64a1e706854a7aaf849ca62439e22",
214+
"version": "14fc57e4cfdb8de6affd0f58e885edbbd16812ea",
215215
"sum": "2c+wttfee9TwuQJZIkNV7Tekem74Qgc7iZ842P28rNw=",
216216
"name": "prometheus"
217217
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "88092449cd92ef51e9ef1027715349fd8db89d02",
236+
"version": "da421eaffeddaebdc000222cecbad56d557c6ac8",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3416,6 +3416,12 @@ spec:
34163416
- name
34173417
type: object
34183418
type: array
3419+
convertClassicHistogramsToNHCB:
3420+
description: |-
3421+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
3422+
3423+
It requires Prometheus >= v3.4.0.
3424+
type: boolean
34193425
disableCompaction:
34203426
description: |-
34213427
When true, the Prometheus compaction is disabled.
@@ -5282,6 +5288,19 @@ spec:
52825288
enabling the StatefulSetMinReadySeconds feature gate.
52835289
format: int32
52845290
type: integer
5291+
nameEscapingScheme:
5292+
description: |-
5293+
Specifies the character escaping scheme that will be requested when scraping
5294+
for metric and label names that do not conform to the legacy Prometheus
5295+
character set.
5296+
5297+
It requires Prometheus >= v3.4.0.
5298+
enum:
5299+
- AllowUTF8
5300+
- Underscores
5301+
- Dots
5302+
- Values
5303+
type: string
52855304
nameValidationScheme:
52865305
description: Specifies the validation scheme for metric and label names.
52875306
enum:
@@ -5298,6 +5317,11 @@ spec:
52985317
Settings related to the OTLP receiver feature.
52995318
It requires Prometheus >= v2.55.0.
53005319
properties:
5320+
convertHistogramsToNHCB:
5321+
description: |-
5322+
Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
5323+
It requires Prometheus >= v3.4.0.
5324+
type: boolean
53015325
keepIdentifyingResourceAttributes:
53025326
description: |-
53035327
Enables adding `service.name`, `service.namespace` and `service.instance.id`
@@ -5321,6 +5345,7 @@ spec:
53215345
enum:
53225346
- NoUTF8EscapingWithSuffixes
53235347
- UnderscoreEscapingWithSuffixes
5348+
- NoTranslation
53245349
type: string
53255350
type: object
53265351
overrideHonorLabels:

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,6 +2722,12 @@ spec:
27222722
- name
27232723
type: object
27242724
type: array
2725+
convertClassicHistogramsToNHCB:
2726+
description: |-
2727+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
2728+
2729+
It requires Prometheus >= v3.4.0.
2730+
type: boolean
27252731
dnsConfig:
27262732
description: Defines the DNS configuration for the pods.
27272733
properties:
@@ -4555,6 +4561,19 @@ spec:
45554561
- StatefulSet
45564562
- DaemonSet
45574563
type: string
4564+
nameEscapingScheme:
4565+
description: |-
4566+
Specifies the character escaping scheme that will be requested when scraping
4567+
for metric and label names that do not conform to the legacy Prometheus
4568+
character set.
4569+
4570+
It requires Prometheus >= v3.4.0.
4571+
enum:
4572+
- AllowUTF8
4573+
- Underscores
4574+
- Dots
4575+
- Values
4576+
type: string
45584577
nameValidationScheme:
45594578
description: Specifies the validation scheme for metric and label names.
45604579
enum:
@@ -4571,6 +4590,11 @@ spec:
45714590
Settings related to the OTLP receiver feature.
45724591
It requires Prometheus >= v2.55.0.
45734592
properties:
4593+
convertHistogramsToNHCB:
4594+
description: |-
4595+
Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
4596+
It requires Prometheus >= v3.4.0.
4597+
type: boolean
45744598
keepIdentifyingResourceAttributes:
45754599
description: |-
45764600
Enables adding `service.name`, `service.namespace` and `service.instance.id`
@@ -4594,6 +4618,7 @@ spec:
45944618
enum:
45954619
- NoUTF8EscapingWithSuffixes
45964620
- UnderscoreEscapingWithSuffixes
4621+
- NoTranslation
45974622
type: string
45984623
type: object
45994624
overrideHonorLabels:

vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json

Lines changed: 20 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json

Lines changed: 20 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)