Skip to content

Commit cdc2138

Browse files
roboquatroboquat
authored
Merge pull request #600 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 05d77a6 + 48832f6 commit cdc2138

24 files changed

+922
-78
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "d744c19762d691b294493ffdc6859904692c6988",
21+
"version": "fe91daaf83461ad54b5a4a85d100c34ca46b9d5b",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "2b23aeb0ef8dbab0186a67cad6174e0ef70b4aa6",
31+
"version": "e93eb6cc8c60bfe29700bbc6c7c62b92b625bc04",
3232
"sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "b9f4106427646e3cff5da71b963c1117632153cc",
92+
"version": "1cd23af7f31e8ee2f4e6abe16b466c7bfc0ce82a",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,8 +99,8 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "b9f4106427646e3cff5da71b963c1117632153cc",
103-
"sum": "iu4NT+YOgpxQnxElKML76cSxgTA0cwTmFfI0hOfHHmw="
102+
"version": "1cd23af7f31e8ee2f4e6abe16b466c7bfc0ce82a",
103+
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
104104
},
105105
{
106106
"source": {
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "69046b1aeeeae90f57df7eef4bf88a1790243a05",
133-
"sum": "BcApE/DIT0jl4CyMO8moq+tf1ueMnl0d6UBbXsfrXdA="
132+
"version": "cc7c60b9182346be662703df319e4ea56e317208",
133+
"sum": "ij0NZqctn1iOw3wNr3ul3D6QjFZgvNmTNt6gu8/6oac="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "9576360078ee485df89b471c146f0e2a9f0753c3",
142+
"version": "56d3b561e6954e0055ea0d6f2d7034f6d898b6c6",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "9576360078ee485df89b471c146f0e2a9f0753c3",
152+
"version": "56d3b561e6954e0055ea0d6f2d7034f6d898b6c6",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "d74d33581a070f98fb66bb170f502f4d8b53bdf3",
163-
"sum": "7e7VS+AiHShvwUgPa8EIO/ODob7mjbPBBv81KhJ3Pps="
162+
"version": "f0abeaf2c817f8ec51f8e6ca0497d0d87b5a1c0c",
163+
"sum": "ClY5bR72mU4gIQiWfvcZ+dT2uzqJAOb4oFbXD1h2vQE="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "86b81493bac854506bd310bbbdb7d1d963d3800a",
172+
"version": "43d133b211ace353579c21bc5d050bcd2f90b5ef",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "86b81493bac854506bd310bbbdb7d1d963d3800a",
184-
"sum": "4EnQgGk6kj2G7g/6D4PWw6QHL5gdoHJ9Adw31QrFB+I="
183+
"version": "43d133b211ace353579c21bc5d050bcd2f90b5ef",
184+
"sum": "TLDa8AVPj+FXYtYSz/+tOSs5TGzDFLJEClNQUDiKkDA="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "0ce3cfb962db3cbb1649d3e816a49a13c4036cd1",
193+
"version": "c653800ffe4af31f4c3f9d81708301f3dd5600fa",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -211,8 +211,8 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "c3276ea40c2241b85ee35da30048bb6fc4b6d63b",
215-
"sum": "lT5n+8i4q20LuvlmtIs/GXdlX6fQiwwuZkeOtnAPT50=",
214+
"version": "938e5cb62b0749123d003fa171937ea213736450",
215+
"sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=",
216216
"name": "prometheus"
217217
},
218218
{
@@ -222,7 +222,7 @@
222222
"subdir": "jsonnet/controller-gen"
223223
}
224224
},
225-
"version": "eb8e7d40502d6598b7d2fb7a08c83be8a0934345",
225+
"version": "d31e021e01525a2629401b226bedff600f881757",
226226
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
227227
"name": "pyrra"
228228
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "3727363b495d2b47382de5eb73e37a4ba6eaf1ad",
236+
"version": "ddd5ff85f4594e6970b0df3813d31c8f3024fe5f",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@ spec:
992992
The default value is `OnNamespace`.
993993
enum:
994994
- OnNamespace
995+
- OnNamespaceExceptForAlertmanagerNamespace
995996
- None
996997
type: string
997998
type: object
@@ -1785,6 +1786,67 @@ spec:
17851786
This has no impact on alerts from Prometheus, as they always include EndsAt.
17861787
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
17871788
type: string
1789+
rocketChat:
1790+
description: The default configuration for Rocket Chat.
1791+
properties:
1792+
apiURL:
1793+
description: |-
1794+
The default Rocket Chat API URL.
1795+
1796+
It requires Alertmanager >= v0.28.0.
1797+
pattern: ^(http|https)://.+$
1798+
type: string
1799+
token:
1800+
description: |-
1801+
The default Rocket Chat token.
1802+
1803+
It requires Alertmanager >= v0.28.0.
1804+
properties:
1805+
key:
1806+
description: The key of the secret to select from. Must be a valid secret key.
1807+
type: string
1808+
name:
1809+
default: ""
1810+
description: |-
1811+
Name of the referent.
1812+
This field is effectively required, but due to backwards compatibility is
1813+
allowed to be empty. Instances of this type with an empty value here are
1814+
almost certainly wrong.
1815+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1816+
type: string
1817+
optional:
1818+
description: Specify whether the Secret or its key must be defined
1819+
type: boolean
1820+
required:
1821+
- key
1822+
type: object
1823+
x-kubernetes-map-type: atomic
1824+
tokenID:
1825+
description: |-
1826+
The default Rocket Chat Token ID.
1827+
1828+
It requires Alertmanager >= v0.28.0.
1829+
properties:
1830+
key:
1831+
description: The key of the secret to select from. Must be a valid secret key.
1832+
type: string
1833+
name:
1834+
default: ""
1835+
description: |-
1836+
Name of the referent.
1837+
This field is effectively required, but due to backwards compatibility is
1838+
allowed to be empty. Instances of this type with an empty value here are
1839+
almost certainly wrong.
1840+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1841+
type: string
1842+
optional:
1843+
description: Specify whether the Secret or its key must be defined
1844+
type: boolean
1845+
required:
1846+
- key
1847+
type: object
1848+
x-kubernetes-map-type: atomic
1849+
type: object
17881850
slackApiUrl:
17891851
description: The default Slack API URL.
17901852
properties:
@@ -2048,6 +2110,53 @@ spec:
20482110
pattern: ^(http|https)://.+$
20492111
type: string
20502112
type: object
2113+
webex:
2114+
description: The default configuration for Jira.
2115+
properties:
2116+
apiURL:
2117+
description: |-
2118+
The default Webex API URL.
2119+
2120+
It requires Alertmanager >= v0.25.0.
2121+
pattern: ^(http|https)://.+$
2122+
type: string
2123+
type: object
2124+
wechat:
2125+
description: The default WeChat Config
2126+
properties:
2127+
apiCorpID:
2128+
description: The default WeChat API Corporate ID.
2129+
minLength: 1
2130+
type: string
2131+
apiSecret:
2132+
description: The default WeChat API Secret.
2133+
properties:
2134+
key:
2135+
description: The key of the secret to select from. Must be a valid secret key.
2136+
type: string
2137+
name:
2138+
default: ""
2139+
description: |-
2140+
Name of the referent.
2141+
This field is effectively required, but due to backwards compatibility is
2142+
allowed to be empty. Instances of this type with an empty value here are
2143+
almost certainly wrong.
2144+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2145+
type: string
2146+
optional:
2147+
description: Specify whether the Secret or its key must be defined
2148+
type: boolean
2149+
required:
2150+
- key
2151+
type: object
2152+
x-kubernetes-map-type: atomic
2153+
apiURL:
2154+
description: |-
2155+
The default WeChat API URL.
2156+
The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
2157+
pattern: ^(http|https)://.+$
2158+
type: string
2159+
type: object
20512160
type: object
20522161
name:
20532162
description: |-

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

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,14 @@ spec:
417417
type: string
418418
type: object
419419
type: array
420+
noProxy:
421+
description: |-
422+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
423+
that should be excluded from proxying. IP and domain names can
424+
contain port numbers.
425+
426+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
427+
type: string
420428
oauth2:
421429
description: |-
422430
`oauth2` configures the OAuth2 settings to use when scraping the target.
@@ -747,10 +755,47 @@ spec:
747755
maximum: 65535
748756
minimum: 1
749757
type: integer
750-
proxyUrl:
758+
proxyConnectHeader:
759+
additionalProperties:
760+
items:
761+
description: SecretKeySelector selects a key of a Secret.
762+
properties:
763+
key:
764+
description: The key of the secret to select from. Must be a valid secret key.
765+
type: string
766+
name:
767+
default: ""
768+
description: |-
769+
Name of the referent.
770+
This field is effectively required, but due to backwards compatibility is
771+
allowed to be empty. Instances of this type with an empty value here are
772+
almost certainly wrong.
773+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
774+
type: string
775+
optional:
776+
description: Specify whether the Secret or its key must be defined
777+
type: boolean
778+
required:
779+
- key
780+
type: object
781+
x-kubernetes-map-type: atomic
782+
type: array
783+
description: |-
784+
ProxyConnectHeader optionally specifies headers to send to
785+
proxies during CONNECT requests.
786+
787+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
788+
type: object
789+
x-kubernetes-map-type: atomic
790+
proxyFromEnvironment:
751791
description: |-
752-
`proxyURL` configures the HTTP Proxy URL (e.g.
753-
"http://proxyserver:2195") to go through when scraping the target.
792+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
793+
794+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
795+
type: boolean
796+
proxyUrl:
797+
description: '`proxyURL` defines the HTTP proxy server to use.'
798+
pattern: ^(http|https|socks5)://.+$
754799
type: string
755800
relabelings:
756801
description: |-

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,14 +629,61 @@ spec:
629629
Specification for the prober to use for probing targets.
630630
The prober.URL parameter is required. Targets cannot be probed if left empty.
631631
properties:
632+
noProxy:
633+
description: |-
634+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
635+
that should be excluded from proxying. IP and domain names can
636+
contain port numbers.
637+
638+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
639+
type: string
632640
path:
633641
default: /probe
634642
description: |-
635643
Path to collect metrics from.
636644
Defaults to `/probe`.
637645
type: string
646+
proxyConnectHeader:
647+
additionalProperties:
648+
items:
649+
description: SecretKeySelector selects a key of a Secret.
650+
properties:
651+
key:
652+
description: The key of the secret to select from. Must be a valid secret key.
653+
type: string
654+
name:
655+
default: ""
656+
description: |-
657+
Name of the referent.
658+
This field is effectively required, but due to backwards compatibility is
659+
allowed to be empty. Instances of this type with an empty value here are
660+
almost certainly wrong.
661+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
662+
type: string
663+
optional:
664+
description: Specify whether the Secret or its key must be defined
665+
type: boolean
666+
required:
667+
- key
668+
type: object
669+
x-kubernetes-map-type: atomic
670+
type: array
671+
description: |-
672+
ProxyConnectHeader optionally specifies headers to send to
673+
proxies during CONNECT requests.
674+
675+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
676+
type: object
677+
x-kubernetes-map-type: atomic
678+
proxyFromEnvironment:
679+
description: |-
680+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
681+
682+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
683+
type: boolean
638684
proxyUrl:
639-
description: Optional ProxyURL.
685+
description: '`proxyURL` defines the HTTP proxy server to use.'
686+
pattern: ^(http|https|socks5)://.+$
640687
type: string
641688
scheme:
642689
description: |-

0 commit comments

Comments
 (0)