Skip to content

Commit 0a8f928

Browse files
roboquatroboquat
authored
Merge pull request #536 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents f6fe701 + ba4e6b0 commit 0a8f928

23 files changed

+804
-504
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": "333bd7bf7612a9f83cc94e8334565012e84f354f",
21+
"version": "a2ce03538f2dc6a900aefdda606a431374ccd14b",
2222
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
2323
},
2424
{
@@ -28,8 +28,8 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "9af4e75999d043ba84e59144de92b03c27482693",
32-
"sum": "oZVkD3bYX/sc2ehkntDgaOdwklfv0y1Lyevt332rGsc=",
31+
"version": "bcf779794174550cbe345b6a7493363771976489",
32+
"sum": "ib+j6kKrmwubgOtDuKIwCD6CZxl0qK8O2ipn/HnXkv8=",
3333
"name": "gitpod"
3434
},
3535
{
@@ -99,7 +99,7 @@
9999
"subdir": "grafana-builder"
100100
}
101101
},
102-
"version": "54f7f74fe61f3bd05a35f2616505305b2ae1e19a",
102+
"version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7",
103103
"sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
104104
},
105105
{
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "2b8eea4e270290520dfd616bdab5e6f2e13b86ad",
142+
"version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
143143
"sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "2b8eea4e270290520dfd616bdab5e6f2e13b86ad",
152+
"version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "71e8adada95be82c66af8262fb935346ecf27caa",
163-
"sum": "5JYMAs1FLFQ2uUEDWYdtxaofIVayNlQ3qZDDSoTaMyw="
162+
"version": "cb55161e24eee55d67f3bb7e7f1719feab66da52",
163+
"sum": "9zbJ1/VBNBXA+mU0L59i7ZBXOVF8/v054l7rsStiiag="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "11f8eb1665b7228d5752685379f24f64e658a19f",
172+
"version": "f4b82d7235daee34f41ceb3e60210759c4733525",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "11f8eb1665b7228d5752685379f24f64e658a19f",
184-
"sum": "5Lu5550Raz3BpfO07ITkUMJAZ9wjKhjCOJ3GLstF5uw="
183+
"version": "f4b82d7235daee34f41ceb3e60210759c4733525",
184+
"sum": "2oKH6voUO/qmkU8oz0lFmM4IgICfJF4R4jSRxRMkPwk="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "c9f73e3ab7d90efa8e62733b3594bfff2a80f35e",
193+
"version": "91a94f00f987048fa4f42856165d49370a3af568",
194194
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "2ecbe970668b4a6b7e528b6513ac545186a494fd",
204+
"version": "3afc0a341e3c2c6605b18a882fb045318c18c444",
205205
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
206206
},
207207
{
@@ -211,8 +211,8 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "3b8b57700c469c7cde84e1d8f9d383cb8fe11ab0",
215-
"sum": "u/Fpz2MPkezy71/q+c7mF0vc3hE9fWt2W/YbvF0LP/8=",
214+
"version": "edf5ebd84422d1f894e7d56451cdf06fd16a83dc",
215+
"sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
216216
"name": "prometheus"
217217
},
218218
{
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "2d738f0dedb99adf2c89854935138114ecc37896",
236+
"version": "9707a4f7da53efe0ca674c9e867c3936ead9ba2c",
237237
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 102 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,6 +1180,98 @@ spec:
11801180
- type: string
11811181
description: Port on which the Alertmanager API is exposed.
11821182
x-kubernetes-int-or-string: true
1183+
relabelings:
1184+
description: Relabel configuration applied to the discovered Alertmanagers.
1185+
items:
1186+
description: |-
1187+
RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
1188+
scraped samples and remote write samples.
1189+
1190+
1191+
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
1192+
properties:
1193+
action:
1194+
default: replace
1195+
description: |-
1196+
Action to perform based on the regex matching.
1197+
1198+
1199+
`Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
1200+
`DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
1201+
1202+
1203+
Default: "Replace"
1204+
enum:
1205+
- replace
1206+
- Replace
1207+
- keep
1208+
- Keep
1209+
- drop
1210+
- Drop
1211+
- hashmod
1212+
- HashMod
1213+
- labelmap
1214+
- LabelMap
1215+
- labeldrop
1216+
- LabelDrop
1217+
- labelkeep
1218+
- LabelKeep
1219+
- lowercase
1220+
- Lowercase
1221+
- uppercase
1222+
- Uppercase
1223+
- keepequal
1224+
- KeepEqual
1225+
- dropequal
1226+
- DropEqual
1227+
type: string
1228+
modulus:
1229+
description: |-
1230+
Modulus to take of the hash of the source label values.
1231+
1232+
1233+
Only applicable when the action is `HashMod`.
1234+
format: int64
1235+
type: integer
1236+
regex:
1237+
description: Regular expression against which the extracted value is matched.
1238+
type: string
1239+
replacement:
1240+
description: |-
1241+
Replacement value against which a Replace action is performed if the
1242+
regular expression matches.
1243+
1244+
1245+
Regex capture groups are available.
1246+
type: string
1247+
separator:
1248+
description: Separator is the string between concatenated SourceLabels.
1249+
type: string
1250+
sourceLabels:
1251+
description: |-
1252+
The source labels select values from existing labels. Their content is
1253+
concatenated using the configured Separator and matched against the
1254+
configured regular expression.
1255+
items:
1256+
description: |-
1257+
LabelName is a valid Prometheus label name which may only contain ASCII
1258+
letters, numbers, as well as underscores.
1259+
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
1260+
type: string
1261+
type: array
1262+
targetLabel:
1263+
description: |-
1264+
Label to which the resulting string is written in a replacement.
1265+
1266+
1267+
It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
1268+
`KeepEqual` and `DropEqual` actions.
1269+
1270+
1271+
Regex capture groups are available.
1272+
type: string
1273+
type: object
1274+
type: array
11831275
scheme:
11841276
description: Scheme to use when firing alerts.
11851277
type: string
@@ -6327,10 +6419,11 @@ spec:
63276419
properties:
63286420
default:
63296421
description: |-
6330-
Default indicates that the scrape applies to all scrape objects that don't configure an explicit scrape class name.
6422+
Default indicates that the scrape applies to all scrape objects that
6423+
don't configure an explicit scrape class name.
63316424

63326425

6333-
Only one scrape class can be set as default.
6426+
Only one scrape class can be set as the default.
63346427
type: boolean
63356428
name:
63366429
description: Name of the scrape class.
@@ -6439,7 +6532,13 @@ spec:
64396532
type: object
64406533
type: array
64416534
tlsConfig:
6442-
description: TLSConfig section for scrapes.
6535+
description: |-
6536+
TLSConfig defines the TLS settings to use for the scrape. When the
6537+
scrape objects define their own CA, certificate and/or key, they take
6538+
precedence over the corresponding scrape class fields.
6539+
6540+
6541+
For now only the `caFile`, `certFile` and `keyFile` fields are supported.
64436542
properties:
64446543
ca:
64456544
description: Certificate authority used when verifying server certificates.

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5287,10 +5287,11 @@ spec:
52875287
properties:
52885288
default:
52895289
description: |-
5290-
Default indicates that the scrape applies to all scrape objects that don't configure an explicit scrape class name.
5290+
Default indicates that the scrape applies to all scrape objects that
5291+
don't configure an explicit scrape class name.
52915292

52925293

5293-
Only one scrape class can be set as default.
5294+
Only one scrape class can be set as the default.
52945295
type: boolean
52955296
name:
52965297
description: Name of the scrape class.
@@ -5399,7 +5400,13 @@ spec:
53995400
type: object
54005401
type: array
54015402
tlsConfig:
5402-
description: TLSConfig section for scrapes.
5403+
description: |-
5404+
TLSConfig defines the TLS settings to use for the scrape. When the
5405+
scrape objects define their own CA, certificate and/or key, they take
5406+
precedence over the corresponding scrape class fields.
5407+
5408+
5409+
For now only the `caFile`, `certFile` and `keyFile` fields are supported.
54035410
properties:
54045411
ca:
54055412
description: Certificate authority used when verifying server certificates.

0 commit comments

Comments
 (0)