Skip to content

Commit 51ce383

Browse files
roboquatroboquat
authored
Merge pull request #588 from gitpod-io/roboquat/automated-dependency-update-main
[bot] [main] Automated dependencies update
2 parents 6da7a23 + 78f19ba commit 51ce383

File tree

43 files changed

+847
-306
lines changed

Some content is hidden

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

43 files changed

+847
-306
lines changed

‎jsonnetfile.lock.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "eae9a91a20086fba779231ed076f2ed9cbe5a7dc",
21+
"version": "2044e2450301bf68e52a094f6f2d6af0468e56e9",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,7 +28,7 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "83a98beb497237150481145fb9764616c7853c33",
31+
"version": "ffe6bb13350f6991d848906f982961497bc78aab",
3232
"sum": "m0HuOFGTj2J4HMjHxahFeNsKDXutPju29gIjVTc+eMM=",
3333
"name": "gitpod"
3434
},
@@ -89,7 +89,7 @@
8989
"subdir": "grafana-builder"
9090
}
9191
},
92-
"version": "e338662d07e9bba0090dce00e81f037e6787b034",
92+
"version": "254dfb6a7e4468dd16a5c40fcc5370c20a5a011e",
9393
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
9494
},
9595
{
@@ -99,8 +99,8 @@
9999
"subdir": "mixin-utils"
100100
}
101101
},
102-
"version": "e338662d07e9bba0090dce00e81f037e6787b034",
103-
"sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA="
102+
"version": "254dfb6a7e4468dd16a5c40fcc5370c20a5a011e",
103+
"sum": "iu4NT+YOgpxQnxElKML76cSxgTA0cwTmFfI0hOfHHmw="
104104
},
105105
{
106106
"source": {
@@ -129,8 +129,8 @@
129129
"subdir": ""
130130
}
131131
},
132-
"version": "8ea074c438febb8880e5539a1f035eb651a64b37",
133-
"sum": "/nL1T+lDNVF5CiSxgW6Jl0wo510VwRSU6fMX5NdjP8o="
132+
"version": "b131a7323f04fc4de88fc2a730833b03885f2c43",
133+
"sum": "B80KfK03VoU0M5Cx+DokrvMa34ZPKJTcM7nclMZMJhY="
134134
},
135135
{
136136
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "0b01e3abce1da521b5e620b8aaa76774bb0fda87",
142+
"version": "9ea1495953853751b7affc0360e3f493d4318b55",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "0b01e3abce1da521b5e620b8aaa76774bb0fda87",
152+
"version": "9ea1495953853751b7affc0360e3f493d4318b55",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/kube-prometheus"
160160
}
161161
},
162-
"version": "29bdfe458eec8a85cfcccf36a3657f15c8be543d",
163-
"sum": "fBkfTHGnlBM22cgWXj58pE4fbHagf3Up6hSRFGJDpAM="
162+
"version": "9bf26583e305e22ce76edc022f6f86c93017ae80",
163+
"sum": "TcZkmKlJ6QTaSoe45yIEx4fHo2yjui0jTj3+1zDti64="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "b3317a65f810b38ec7df68d93bddc1e248081769",
172+
"version": "f58ed26dd451cbc7970ed22d19a68f677c4a23ff",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "b3317a65f810b38ec7df68d93bddc1e248081769",
184-
"sum": "p12q3AVid+40sY+D7uGYWG3gay03I3I4QkEVZH5jCXI="
183+
"version": "f58ed26dd451cbc7970ed22d19a68f677c4a23ff",
184+
"sum": "g6N1i3VuwXnfWPqCPaj7A1wPGMMCX4GtD2vVh2o47Tg="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "doc/alertmanager-mixin"
191191
}
192192
},
193-
"version": "e060127980825a83511f651d1eb48660fc74efd6",
193+
"version": "b49dfc0e826093d91937ddd4dc9bdcfcca544071",
194194
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
195195
"name": "alertmanager"
196196
},
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "c3ce1f1927483364cae2503ba8c1a2e9693d721e",
214+
"version": "8b0d33e5b20475318a1a72857ed8a9947b13e1aa",
215215
"sum": "2c+wttfee9TwuQJZIkNV7Tekem74Qgc7iZ842P28rNw=",
216216
"name": "prometheus"
217217
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "2a5a856e34adb2653dda700c4d87637236afb2dd",
236+
"version": "aa3e4199dbb745d6d9cc23389e8dcb260041e261",
237237
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
238238
"name": "thanos-mixin"
239239
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: alertmanagerconfigs.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 151 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: alertmanagers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -1883,6 +1883,156 @@ spec:
18831883
- host
18841884
- port
18851885
type: object
1886+
tlsConfig:
1887+
description: The default TLS configuration for SMTP receivers
1888+
properties:
1889+
ca:
1890+
description: Certificate authority used when verifying server certificates.
1891+
properties:
1892+
configMap:
1893+
description: ConfigMap containing data to use for the targets.
1894+
properties:
1895+
key:
1896+
description: The key to select.
1897+
type: string
1898+
name:
1899+
default: ""
1900+
description: |-
1901+
Name of the referent.
1902+
This field is effectively required, but due to backwards compatibility is
1903+
allowed to be empty. Instances of this type with an empty value here are
1904+
almost certainly wrong.
1905+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1906+
type: string
1907+
optional:
1908+
description: Specify whether the ConfigMap or its key must be defined
1909+
type: boolean
1910+
required:
1911+
- key
1912+
type: object
1913+
x-kubernetes-map-type: atomic
1914+
secret:
1915+
description: Secret containing data to use for the targets.
1916+
properties:
1917+
key:
1918+
description: The key of the secret to select from. Must be a valid secret key.
1919+
type: string
1920+
name:
1921+
default: ""
1922+
description: |-
1923+
Name of the referent.
1924+
This field is effectively required, but due to backwards compatibility is
1925+
allowed to be empty. Instances of this type with an empty value here are
1926+
almost certainly wrong.
1927+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1928+
type: string
1929+
optional:
1930+
description: Specify whether the Secret or its key must be defined
1931+
type: boolean
1932+
required:
1933+
- key
1934+
type: object
1935+
x-kubernetes-map-type: atomic
1936+
type: object
1937+
cert:
1938+
description: Client certificate to present when doing client-authentication.
1939+
properties:
1940+
configMap:
1941+
description: ConfigMap containing data to use for the targets.
1942+
properties:
1943+
key:
1944+
description: The key to select.
1945+
type: string
1946+
name:
1947+
default: ""
1948+
description: |-
1949+
Name of the referent.
1950+
This field is effectively required, but due to backwards compatibility is
1951+
allowed to be empty. Instances of this type with an empty value here are
1952+
almost certainly wrong.
1953+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1954+
type: string
1955+
optional:
1956+
description: Specify whether the ConfigMap or its key must be defined
1957+
type: boolean
1958+
required:
1959+
- key
1960+
type: object
1961+
x-kubernetes-map-type: atomic
1962+
secret:
1963+
description: Secret containing data to use for the targets.
1964+
properties:
1965+
key:
1966+
description: The key of the secret to select from. Must be a valid secret key.
1967+
type: string
1968+
name:
1969+
default: ""
1970+
description: |-
1971+
Name of the referent.
1972+
This field is effectively required, but due to backwards compatibility is
1973+
allowed to be empty. Instances of this type with an empty value here are
1974+
almost certainly wrong.
1975+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1976+
type: string
1977+
optional:
1978+
description: Specify whether the Secret or its key must be defined
1979+
type: boolean
1980+
required:
1981+
- key
1982+
type: object
1983+
x-kubernetes-map-type: atomic
1984+
type: object
1985+
insecureSkipVerify:
1986+
description: Disable target certificate validation.
1987+
type: boolean
1988+
keySecret:
1989+
description: Secret containing the client key file for the targets.
1990+
properties:
1991+
key:
1992+
description: The key of the secret to select from. Must be a valid secret key.
1993+
type: string
1994+
name:
1995+
default: ""
1996+
description: |-
1997+
Name of the referent.
1998+
This field is effectively required, but due to backwards compatibility is
1999+
allowed to be empty. Instances of this type with an empty value here are
2000+
almost certainly wrong.
2001+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2002+
type: string
2003+
optional:
2004+
description: Specify whether the Secret or its key must be defined
2005+
type: boolean
2006+
required:
2007+
- key
2008+
type: object
2009+
x-kubernetes-map-type: atomic
2010+
maxVersion:
2011+
description: |-
2012+
Maximum acceptable TLS version.
2013+
2014+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
2015+
enum:
2016+
- TLS10
2017+
- TLS11
2018+
- TLS12
2019+
- TLS13
2020+
type: string
2021+
minVersion:
2022+
description: |-
2023+
Minimum acceptable TLS version.
2024+
2025+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
2026+
enum:
2027+
- TLS10
2028+
- TLS11
2029+
- TLS12
2030+
- TLS13
2031+
type: string
2032+
serverName:
2033+
description: Used to verify the hostname for the targets.
2034+
type: string
2035+
type: object
18862036
type: object
18872037
type: object
18882038
name:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: podmonitors.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: probes.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: prometheuses.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -8687,6 +8687,10 @@ spec:
86878687
Users can define their own sharding implementation by setting the
86888688
`__tmp_hash` label during the target discovery with relabeling
86898689
configuration (either in the monitoring resources or via scrape class).
8690+
8691+
You can also disable sharding on a specific target by setting the
8692+
`__tmp_disable_sharding` label with relabeling configuration. When
8693+
the label value isn't empty, all Prometheus shards will scrape the target.
86908694
format: int32
86918695
type: integer
86928696
storage:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.17.3
6-
operator.prometheus.io/version: 0.82.0
6+
operator.prometheus.io/version: 0.82.1
77
name: prometheusagents.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -7040,6 +7040,10 @@ spec:
70407040
Users can define their own sharding implementation by setting the
70417041
`__tmp_hash` label during the target discovery with relabeling
70427042
configuration (either in the monitoring resources or via scrape class).
7043+
7044+
You can also disable sharding on a specific target by setting the
7045+
`__tmp_disable_sharding` label with relabeling configuration. When
7046+
the label value isn't empty, all Prometheus shards will scrape the target.
70437047
format: int32
70447048
type: integer
70457049
storage:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: prometheusrules.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.17.3
6-
operator.prometheus.io/version: 0.82.0
6+
operator.prometheus.io/version: 0.82.1
77
name: scrapeconfigs.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: servicemonitors.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
argocd.argoproj.io/sync-options: Replace=true
66
controller-gen.kubebuilder.io/version: v0.17.3
7-
operator.prometheus.io/version: 0.82.0
7+
operator.prometheus.io/version: 0.82.1
88
name: thanosrulers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

0 commit comments

Comments
 (0)