Skip to content

Commit b32a819

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

24 files changed

+338
-306
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": "a2ce03538f2dc6a900aefdda606a431374ccd14b",
21+
"version": "52fb28c1a8db4e66c547b7975bf6dc1e0b17f8bf",
2222
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
2323
},
2424
{
@@ -28,8 +28,8 @@
2828
"subdir": "operations/observability/mixins"
2929
}
3030
},
31-
"version": "bcf779794174550cbe345b6a7493363771976489",
32-
"sum": "ib+j6kKrmwubgOtDuKIwCD6CZxl0qK8O2ipn/HnXkv8=",
31+
"version": "5fdedd96443f204b301e5e975a93e031fc478ef6",
32+
"sum": "W/EJz6gxBgggO8qFOpHCjZ4oO754p3OwORr2Rx1LTUQ=",
3333
"name": "gitpod"
3434
},
3535
{
@@ -99,8 +99,8 @@
9999
"subdir": "grafana-builder"
100100
}
101101
},
102-
"version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7",
103-
"sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
102+
"version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
103+
"sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
104104
},
105105
{
106106
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "jsonnet/mixin"
170170
}
171171
},
172-
"version": "f4b82d7235daee34f41ceb3e60210759c4733525",
172+
"version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
173173
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
174174
"name": "prometheus-operator-mixin"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "jsonnet/prometheus-operator"
181181
}
182182
},
183-
"version": "f4b82d7235daee34f41ceb3e60210759c4733525",
184-
"sum": "2oKH6voUO/qmkU8oz0lFmM4IgICfJF4R4jSRxRMkPwk="
183+
"version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
184+
"sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA="
185185
},
186186
{
187187
"source": {
@@ -211,7 +211,7 @@
211211
"subdir": "documentation/prometheus-mixin"
212212
}
213213
},
214-
"version": "edf5ebd84422d1f894e7d56451cdf06fd16a83dc",
214+
"version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d",
215215
"sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
216216
"name": "prometheus"
217217
},
@@ -233,7 +233,7 @@
233233
"subdir": "mixin"
234234
}
235235
},
236-
"version": "9707a4f7da53efe0ca674c9e867c3936ead9ba2c",
236+
"version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a",
237237
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
88
name: alertmanagerconfigs.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

‎monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
88
name: alertmanagers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

‎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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
88
name: probes.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

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

Lines changed: 112 additions & 4 deletions
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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
88
name: prometheuses.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com
@@ -1060,6 +1060,100 @@ spec:
10601060
AlertmanagerEndpoints defines a selection of a single Endpoints object
10611061
containing Alertmanager IPs to fire alerts against.
10621062
properties:
1063+
alertRelabelings:
1064+
description: |-
1065+
Relabeling configs applied before sending alerts to a specific Alertmanager.
1066+
It requires Prometheus >= v2.51.0.
1067+
items:
1068+
description: |-
1069+
RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
1070+
scraped samples and remote write samples.
1071+
1072+
1073+
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
1074+
properties:
1075+
action:
1076+
default: replace
1077+
description: |-
1078+
Action to perform based on the regex matching.
1079+
1080+
1081+
`Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
1082+
`DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
1083+
1084+
1085+
Default: "Replace"
1086+
enum:
1087+
- replace
1088+
- Replace
1089+
- keep
1090+
- Keep
1091+
- drop
1092+
- Drop
1093+
- hashmod
1094+
- HashMod
1095+
- labelmap
1096+
- LabelMap
1097+
- labeldrop
1098+
- LabelDrop
1099+
- labelkeep
1100+
- LabelKeep
1101+
- lowercase
1102+
- Lowercase
1103+
- uppercase
1104+
- Uppercase
1105+
- keepequal
1106+
- KeepEqual
1107+
- dropequal
1108+
- DropEqual
1109+
type: string
1110+
modulus:
1111+
description: |-
1112+
Modulus to take of the hash of the source label values.
1113+
1114+
1115+
Only applicable when the action is `HashMod`.
1116+
format: int64
1117+
type: integer
1118+
regex:
1119+
description: Regular expression against which the extracted value is matched.
1120+
type: string
1121+
replacement:
1122+
description: |-
1123+
Replacement value against which a Replace action is performed if the
1124+
regular expression matches.
1125+
1126+
1127+
Regex capture groups are available.
1128+
type: string
1129+
separator:
1130+
description: Separator is the string between concatenated SourceLabels.
1131+
type: string
1132+
sourceLabels:
1133+
description: |-
1134+
The source labels select values from existing labels. Their content is
1135+
concatenated using the configured Separator and matched against the
1136+
configured regular expression.
1137+
items:
1138+
description: |-
1139+
LabelName is a valid Prometheus label name which may only contain ASCII
1140+
letters, numbers, as well as underscores.
1141+
pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
1142+
type: string
1143+
type: array
1144+
targetLabel:
1145+
description: |-
1146+
Label to which the resulting string is written in a replacement.
1147+
1148+
1149+
It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
1150+
`KeepEqual` and `DropEqual` actions.
1151+
1152+
1153+
Regex capture groups are available.
1154+
type: string
1155+
type: object
1156+
type: array
10631157
apiVersion:
10641158
description: |-
10651159
Version of the Alertmanager API that Prometheus uses to send alerts.
@@ -5588,7 +5682,7 @@ spec:
55885682
managedIdentity:
55895683
description: |-
55905684
ManagedIdentity defines the Azure User-assigned Managed identity.
5591-
Cannot be set at the same time as `oauth`.
5685+
Cannot be set at the same time as `oauth` or `sdk`.
55925686
properties:
55935687
clientId:
55945688
description: The client id
@@ -5599,7 +5693,7 @@ spec:
55995693
oauth:
56005694
description: |-
56015695
OAuth defines the oauth config that is being used to authenticate.
5602-
Cannot be set at the same time as `managedIdentity`.
5696+
Cannot be set at the same time as `managedIdentity` or `sdk`.
56035697

56045698

56055699
It requires Prometheus >= v2.48.0.
@@ -5628,7 +5722,7 @@ spec:
56285722
type: object
56295723
x-kubernetes-map-type: atomic
56305724
tenantId:
5631-
description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
5725+
description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
56325726
minLength: 1
56335727
pattern: ^[0-9a-zA-Z-.]+$
56345728
type: string
@@ -5637,6 +5731,20 @@ spec:
56375731
- clientSecret
56385732
- tenantId
56395733
type: object
5734+
sdk:
5735+
description: |-
5736+
SDK defines the Azure SDK config that is being used to authenticate.
5737+
See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
5738+
Cannot be set at the same time as `oauth` or `managedIdentity`.
5739+
5740+
5741+
It requires Prometheus >= 2.52.0.
5742+
properties:
5743+
tenantId:
5744+
description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
5745+
pattern: ^[0-9a-zA-Z-.]+$
5746+
type: string
5747+
type: object
56405748
type: object
56415749
basicAuth:
56425750
description: |-

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

Lines changed: 18 additions & 4 deletions
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.14.0
6-
operator.prometheus.io/version: 0.73.2
6+
operator.prometheus.io/version: 0.74.0
77
name: prometheusagents.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -4588,7 +4588,7 @@ spec:
45884588
managedIdentity:
45894589
description: |-
45904590
ManagedIdentity defines the Azure User-assigned Managed identity.
4591-
Cannot be set at the same time as `oauth`.
4591+
Cannot be set at the same time as `oauth` or `sdk`.
45924592
properties:
45934593
clientId:
45944594
description: The client id
@@ -4599,7 +4599,7 @@ spec:
45994599
oauth:
46004600
description: |-
46014601
OAuth defines the oauth config that is being used to authenticate.
4602-
Cannot be set at the same time as `managedIdentity`.
4602+
Cannot be set at the same time as `managedIdentity` or `sdk`.
46034603

46044604

46054605
It requires Prometheus >= v2.48.0.
@@ -4628,7 +4628,7 @@ spec:
46284628
type: object
46294629
x-kubernetes-map-type: atomic
46304630
tenantId:
4631-
description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
4631+
description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
46324632
minLength: 1
46334633
pattern: ^[0-9a-zA-Z-.]+$
46344634
type: string
@@ -4637,6 +4637,20 @@ spec:
46374637
- clientSecret
46384638
- tenantId
46394639
type: object
4640+
sdk:
4641+
description: |-
4642+
SDK defines the Azure SDK config that is being used to authenticate.
4643+
See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
4644+
Cannot be set at the same time as `oauth` or `managedIdentity`.
4645+
4646+
4647+
It requires Prometheus >= 2.52.0.
4648+
properties:
4649+
tenantId:
4650+
description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
4651+
pattern: ^[0-9a-zA-Z-.]+$
4652+
type: string
4653+
type: object
46404654
type: object
46414655
basicAuth:
46424656
description: |-

‎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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
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.14.0
6-
operator.prometheus.io/version: 0.73.2
6+
operator.prometheus.io/version: 0.74.0
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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
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.14.0
7-
operator.prometheus.io/version: 0.73.2
7+
operator.prometheus.io/version: 0.74.0
88
name: thanosrulers.monitoring.coreos.com
99
spec:
1010
group: monitoring.coreos.com

0 commit comments

Comments
 (0)