Skip to content

Commit 145ea68

Browse files
committed
[bot] [main] Automated dependencies update
1 parent b32a819 commit 145ea68

File tree

448 files changed

+25200
-33359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+25200
-33359
lines changed

jsonnetfile.lock.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "52fb28c1a8db4e66c547b7975bf6dc1e0b17f8bf",
21+
"version": "bb701b9265f31d61db5906325e0a7e2abf7d3627",
2222
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
2323
},
2424
{
@@ -28,8 +28,8 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "5fdedd96443f204b301e5e975a93e031fc478ef6",
32-
"sum": "W/EJz6gxBgggO8qFOpHCjZ4oO754p3OwORr2Rx1LTUQ=",
31+
"version": "504189b123f6d7024a9d5db0607972a2cef1b5fd",
32+
"sum": "99I5DKpjdO4d978XycsznmK41XIjzTHKL2wdx2bXPSU=",
3333
"name": "gitpod"
3434
},
3535
{
@@ -69,8 +69,8 @@
6969
"subdir": "gen/grafonnet-latest"
7070
}
7171
},
72-
"version": "1c56af39815c4903e47c27194444456f005f65df",
73-
"sum": "GxEO83uxgsDclLp/fmlUJZDbSGpeUZY6Ap3G2cgdL1g="
72+
"version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
73+
"sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
7474
},
7575
{
7676
"source": {
@@ -79,18 +79,18 @@
7979
"subdir": "gen/grafonnet-v10.0.0"
8080
}
8181
},
82-
"version": "1c56af39815c4903e47c27194444456f005f65df",
82+
"version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
8383
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
8484
},
8585
{
8686
"source": {
8787
"git": {
8888
"remote": "https://github.com/grafana/grafonnet.git",
89-
"subdir": "gen/grafonnet-v10.4.0"
89+
"subdir": "gen/grafonnet-v11.0.0"
9090
}
9191
},
92-
"version": "1c56af39815c4903e47c27194444456f005f65df",
93-
"sum": "DKj+Sn+rlI48g/aoJpzkfPge46ya0jLk5kcZoiZ2X/I="
92+
"version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
93+
"sum": "6ycXhBvq/k7j01vaNiDSZcVsKikh01pfNH+2oauHgJg="
9494
},
9595
{
9696
"source": {
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "033a6fb33be80d381045dc570fc53f0b7750e8b6",
133-
"sum": "mrmfolXgp1MNMX5Svdbro8/L5v6VDh8UIpsQ9KwU39M="
132+
"version": "de834e9a291b49396125768f041e2078763f48b5",
133+
"sum": "E6z1j4MS6/NnIVZkUuk+gb0m9FvRmZ77H6SSopIZEa8="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
142+
"version": "d8dd6e0704c6008bc40b112bb10cbd3f8be9dd43",
143143
"sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
152+
"version": "d8dd6e0704c6008bc40b112bb10cbd3f8be9dd43",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "cb55161e24eee55d67f3bb7e7f1719feab66da52",
163-
"sum": "9zbJ1/VBNBXA+mU0L59i7ZBXOVF8/v054l7rsStiiag="
162+
"version": "65922b9fd8c3869c06686b44f5f3aa9f96560666",
163+
"sum": "DtatPRLo28DgT9wMG5PKZWodiMLxx7saV6aKuqXd9gM="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
172+
"version": "4c1706c4cf97c9e2db07635b3e517c1e0a949ec7",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
184-
"sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA="
183+
"version": "4c1706c4cf97c9e2db07635b3e517c1e0a949ec7",
184+
"sum": "53aMSZkXBOvXsbF3nuxrUjmvx5B69lOjkDtM428VsBk="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "91a94f00f987048fa4f42856165d49370a3af568",
193+
"version": "fd37ce9c95898ca68be1ab4d4529517174b73c33",
194194
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
195195
"name": "alertmanager"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "docs/node-mixin"
202202
}
203203
},
204-
"version": "3afc0a341e3c2c6605b18a882fb045318c18c444",
204+
"version": "0d3400ebc976e14d5b87db276bb2ec32f55b4052",
205205
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
206206
},
207207
{
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d",
214+
"version": "8894d65cd6135635c4ac9cf100464e6aacd29593",
215215
"sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
216216
"name": "prometheus"
217217
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a",
236+
"version": "447cb96ad27378c0470d84f55f363e7fae71d05a",
237237
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,6 +2024,9 @@ spec:
20242024
severity:
20252025
description: Severity of the incident.
20262026
type: string
2027+
source:
2028+
description: Unique location of the affected system.
2029+
type: string
20272030
url:
20282031
description: The URL to send requests to.
20292032
type: string

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

Lines changed: 103 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4933,7 +4933,7 @@ spec:
49334933
podMonitorNamespaceSelector:
49344934
description: |-
49354935
Namespaces to match for PodMonitors discovery. An empty label selector
4936-
matches all namespaces. A null label selector matches the current
4936+
matches all namespaces. A null label selector (default value) matches the current
49374937
namespace only.
49384938
properties:
49394939
matchExpressions:
@@ -6533,6 +6533,107 @@ spec:
65336533

65346534
Only one scrape class can be set as the default.
65356535
type: boolean
6536+
metricRelabelings:
6537+
description: |-
6538+
MetricRelabelings configures the relabeling rules to apply to all samples before ingestion.
6539+
6540+
6541+
The Operator adds the scrape class metric relabelings defined here.
6542+
Then the Operator adds the target-specific metric relabelings defined in ServiceMonitors, PodMonitors, Probes and ScrapeConfigs.
6543+
Then the Operator adds namespace enforcement relabeling rule, specified in '.spec.enforcedNamespaceLabel'.
6544+
6545+
6546+
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
6547+
items:
6548+
description: |-
6549+
RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
6550+
scraped samples and remote write samples.
6551+
6552+
6553+
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
6554+
properties:
6555+
action:
6556+
default: replace
6557+
description: |-
6558+
Action to perform based on the regex matching.
6559+
6560+
6561+
`Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
6562+
`DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
6563+
6564+
6565+
Default: "Replace"
6566+
enum:
6567+
- replace
6568+
- Replace
6569+
- keep
6570+
- Keep
6571+
- drop
6572+
- Drop
6573+
- hashmod
6574+
- HashMod
6575+
- labelmap
6576+
- LabelMap
6577+
- labeldrop
6578+
- LabelDrop
6579+
- labelkeep
6580+
- LabelKeep
6581+
- lowercase
6582+
- Lowercase
6583+
- uppercase
6584+
- Uppercase
6585+
- keepequal
6586+
- KeepEqual
6587+
- dropequal
6588+
- DropEqual
6589+
type: string
6590+
modulus:
6591+
description: |-
6592+
Modulus to take of the hash of the source label values.
6593+
6594+
6595+
Only applicable when the action is `HashMod`.
6596+
format: int64
6597+
type: integer
6598+
regex:
6599+
description: Regular expression against which the extracted value is matched.
6600+
type: string
6601+
replacement:
6602+
description: |-
6603+
Replacement value against which a Replace action is performed if the
6604+
regular expression matches.
6605+
6606+
6607+
Regex capture groups are available.
6608+
type: string
6609+
separator:
6610+
description: Separator is the string between concatenated SourceLabels.
6611+
type: string
6612+
sourceLabels:
6613+
description: |-
6614+
The source labels select values from existing labels. Their content is
6615+
concatenated using the configured Separator and matched against the
6616+
configured regular expression.
6617+
items:
6618+
description: |-
6619+
LabelName is a valid Prometheus label name which may only contain ASCII
6620+
letters, numbers, as well as underscores.
6621+
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
6622+
type: string
6623+
type: array
6624+
targetLabel:
6625+
description: |-
6626+
Label to which the resulting string is written in a replacement.
6627+
6628+
6629+
It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
6630+
`KeepEqual` and `DropEqual` actions.
6631+
6632+
6633+
Regex capture groups are available.
6634+
type: string
6635+
type: object
6636+
type: array
65366637
name:
65376638
description: Name of the scrape class.
65386639
minLength: 1
@@ -7106,7 +7207,7 @@ spec:
71067207
serviceMonitorNamespaceSelector:
71077208
description: |-
71087209
Namespaces to match for ServicedMonitors discovery. An empty label selector
7109-
matches all namespaces. A null label selector matches the current
7210+
matches all namespaces. A null label selector (default value) matches the current
71107211
namespace only.
71117212
properties:
71127213
matchExpressions:

0 commit comments

Comments
 (0)