Skip to content

Commit 0d17b5a

Browse files
slashpaislashpai
committed
chore: check with updated logic
Signed-off-by: Jayapriya Pai <[email protected]>
1 parent 15e8219 commit 0d17b5a

15 files changed

+2846
-393
lines changed

‎assets/prometheus-operator-user-workload/cluster-role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
- thanosrulers/finalizers
2424
- thanosrulers/status
2525
- servicemonitors
26+
- servicemonitors/status
2627
- podmonitors
2728
- probes
2829
- prometheusrules

‎assets/prometheus-operator-user-workload/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
containers:
3434
- args:
3535
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
36-
- --kubelet-endpoints=false
36+
- --kubelet-endpoints=true
3737
- --kubelet-endpointslice=true
3838
- --prometheus-instance-namespaces=openshift-user-workload-monitoring
3939
- --alertmanager-instance-namespaces=openshift-user-workload-monitoring

‎assets/prometheus-operator/cluster-role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
- thanosrulers/finalizers
2424
- thanosrulers/status
2525
- servicemonitors
26+
- servicemonitors/status
2627
- podmonitors
2728
- probes
2829
- prometheusrules

‎assets/prometheus-operator/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
- args:
3535
- --kubelet-service=kube-system/kubelet
3636
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
37-
- --kubelet-endpoints=false
37+
- --kubelet-endpoints=true
3838
- --kubelet-endpointslice=true
3939
- --prometheus-instance-namespaces=openshift-monitoring
4040
- --thanos-ruler-instance-namespaces=openshift-monitoring

‎hack/build-jsonnet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ for file in "${files[@]}"; do
3737
}&
3838

3939
# wait for at least one of the jobs to finish if there are more than maxProc jobs
40-
while [[ $(jobs -r | wc -l ) -ge "$maxProc" ]]; do wait -n; done
40+
while [[ $(jobs -r | wc -l ) -ge "$maxProc" ]]; do wait ; done
4141
done
4242
# wait for all jobs to finish
4343
wait

‎jsonnet/jsonnetfile.lock.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,18 @@
245245
"subdir": "jsonnet/kube-prometheus"
246246
}
247247
},
248-
"version": "6c65499088f062bd078ae384dad2b8ef679145a3",
249-
"sum": "H+iQqVw9X3y7xaR/qF7bceHh6VB8o3PJzeqvHoUPCRA="
248+
"version": "a8542720ec22d0147fe6e7dacaddfa576d14ccae",
249+
"sum": "1M76lVs3dZGYl52Wy3vg59zyL/qGcii3E+JYsL+kF0M="
250+
},
251+
{
252+
"source": {
253+
"git": {
254+
"remote": "https://github.com/slashpai/prometheus-operator.git",
255+
"subdir": "jsonnet/prometheus-operator"
256+
}
257+
},
258+
"version": "f8960863958daef20c77e7be24d99e0d6c2aa6b6",
259+
"sum": "Afa/g9EOG+6CGLMuMHLh9IdaWQHDWXbREOHNT9ndJ2w="
250260
},
251261
{
252262
"source": {

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml

Lines changed: 900 additions & 207 deletions
Large diffs are not rendered by default.

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml

Lines changed: 371 additions & 38 deletions
Large diffs are not rendered by default.

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.81.0
10+
operator.prometheus.io/version: 0.83.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -82,6 +82,11 @@ spec:
8282
It requires Prometheus >= v2.28.0.
8383
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
8484
type: string
85+
convertClassicHistogramsToNHCB:
86+
description: |-
87+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
88+
It requires Prometheus >= v3.0.0.
89+
type: boolean
8590
fallbackScrapeProtocol:
8691
description: |-
8792
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
@@ -418,6 +423,14 @@ spec:
418423
type: string
419424
type: object
420425
type: array
426+
noProxy:
427+
description: |-
428+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
429+
that should be excluded from proxying. IP and domain names can
430+
contain port numbers.
431+
432+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
433+
type: string
421434
oauth2:
422435
description: |-
423436
`oauth2` configures the OAuth2 settings to use when scraping the target.
@@ -513,7 +526,7 @@ spec:
513526
that should be excluded from proxying. IP and domain names can
514527
contain port numbers.
515528
516-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
529+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
517530
type: string
518531
proxyConnectHeader:
519532
additionalProperties:
@@ -544,18 +557,18 @@ spec:
544557
ProxyConnectHeader optionally specifies headers to send to
545558
proxies during CONNECT requests.
546559
547-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
560+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
548561
type: object
549562
x-kubernetes-map-type: atomic
550563
proxyFromEnvironment:
551564
description: |-
552565
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
553566
554-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
567+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
555568
type: boolean
556569
proxyUrl:
557570
description: '`proxyURL` defines the HTTP proxy server to use.'
558-
pattern: ^http(s)?://.+$
571+
pattern: ^(http|https|socks5)://.+$
559572
type: string
560573
scopes:
561574
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -692,7 +705,7 @@ spec:
692705
description: |-
693706
Maximum acceptable TLS version.
694707
695-
It requires Prometheus >= v2.41.0.
708+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
696709
enum:
697710
- TLS10
698711
- TLS11
@@ -703,7 +716,7 @@ spec:
703716
description: |-
704717
Minimum acceptable TLS version.
705718
706-
It requires Prometheus >= v2.35.0.
719+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
707720
enum:
708721
- TLS10
709722
- TLS11
@@ -748,10 +761,47 @@ spec:
748761
maximum: 65535
749762
minimum: 1
750763
type: integer
751-
proxyUrl:
764+
proxyConnectHeader:
765+
additionalProperties:
766+
items:
767+
description: SecretKeySelector selects a key of a Secret.
768+
properties:
769+
key:
770+
description: The key of the secret to select from. Must be a valid secret key.
771+
type: string
772+
name:
773+
default: ""
774+
description: |-
775+
Name of the referent.
776+
This field is effectively required, but due to backwards compatibility is
777+
allowed to be empty. Instances of this type with an empty value here are
778+
almost certainly wrong.
779+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
780+
type: string
781+
optional:
782+
description: Specify whether the Secret or its key must be defined
783+
type: boolean
784+
required:
785+
- key
786+
type: object
787+
x-kubernetes-map-type: atomic
788+
type: array
752789
description: |-
753-
`proxyURL` configures the HTTP Proxy URL (e.g.
754-
"http://proxyserver:2195") to go through when scraping the target.
790+
ProxyConnectHeader optionally specifies headers to send to
791+
proxies during CONNECT requests.
792+
793+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
794+
type: object
795+
x-kubernetes-map-type: atomic
796+
proxyFromEnvironment:
797+
description: |-
798+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
799+
800+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
801+
type: boolean
802+
proxyUrl:
803+
description: '`proxyURL` defines the HTTP proxy server to use.'
804+
pattern: ^(http|https|socks5)://.+$
755805
type: string
756806
relabelings:
757807
description: |-
@@ -1005,7 +1055,7 @@ spec:
10051055
description: |-
10061056
Maximum acceptable TLS version.
10071057
1008-
It requires Prometheus >= v2.41.0.
1058+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
10091059
enum:
10101060
- TLS10
10111061
- TLS11
@@ -1016,7 +1066,7 @@ spec:
10161066
description: |-
10171067
Minimum acceptable TLS version.
10181068
1019-
It requires Prometheus >= v2.35.0.
1069+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
10201070
enum:
10211071
- TLS10
10221072
- TLS11

‎manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml

Lines changed: 63 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.81.0
10+
operator.prometheus.io/version: 0.83.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -170,6 +170,11 @@ spec:
170170
- key
171171
type: object
172172
x-kubernetes-map-type: atomic
173+
convertClassicHistogramsToNHCB:
174+
description: |-
175+
Whether to convert all scraped classic histograms into a native histogram with custom buckets.
176+
It requires Prometheus >= v3.0.0.
177+
type: boolean
173178
fallbackScrapeProtocol:
174179
description: |-
175180
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
@@ -415,7 +420,7 @@ spec:
415420
that should be excluded from proxying. IP and domain names can
416421
contain port numbers.
417422
418-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
423+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
419424
type: string
420425
proxyConnectHeader:
421426
additionalProperties:
@@ -446,18 +451,18 @@ spec:
446451
ProxyConnectHeader optionally specifies headers to send to
447452
proxies during CONNECT requests.
448453
449-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
454+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
450455
type: object
451456
x-kubernetes-map-type: atomic
452457
proxyFromEnvironment:
453458
description: |-
454459
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
455460
456-
It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
461+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
457462
type: boolean
458463
proxyUrl:
459464
description: '`proxyURL` defines the HTTP proxy server to use.'
460-
pattern: ^http(s)?://.+$
465+
pattern: ^(http|https|socks5)://.+$
461466
type: string
462467
scopes:
463468
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -594,7 +599,7 @@ spec:
594599
description: |-
595600
Maximum acceptable TLS version.
596601
597-
It requires Prometheus >= v2.41.0.
602+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
598603
enum:
599604
- TLS10
600605
- TLS11
@@ -605,7 +610,7 @@ spec:
605610
description: |-
606611
Minimum acceptable TLS version.
607612
608-
It requires Prometheus >= v2.35.0.
613+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
609614
enum:
610615
- TLS10
611616
- TLS11
@@ -630,14 +635,61 @@ spec:
630635
Specification for the prober to use for probing targets.
631636
The prober.URL parameter is required. Targets cannot be probed if left empty.
632637
properties:
638+
noProxy:
639+
description: |-
640+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
641+
that should be excluded from proxying. IP and domain names can
642+
contain port numbers.
643+
644+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
645+
type: string
633646
path:
634647
default: /probe
635648
description: |-
636649
Path to collect metrics from.
637650
Defaults to `/probe`.
638651
type: string
652+
proxyConnectHeader:
653+
additionalProperties:
654+
items:
655+
description: SecretKeySelector selects a key of a Secret.
656+
properties:
657+
key:
658+
description: The key of the secret to select from. Must be a valid secret key.
659+
type: string
660+
name:
661+
default: ""
662+
description: |-
663+
Name of the referent.
664+
This field is effectively required, but due to backwards compatibility is
665+
allowed to be empty. Instances of this type with an empty value here are
666+
almost certainly wrong.
667+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
668+
type: string
669+
optional:
670+
description: Specify whether the Secret or its key must be defined
671+
type: boolean
672+
required:
673+
- key
674+
type: object
675+
x-kubernetes-map-type: atomic
676+
type: array
677+
description: |-
678+
ProxyConnectHeader optionally specifies headers to send to
679+
proxies during CONNECT requests.
680+
681+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
682+
type: object
683+
x-kubernetes-map-type: atomic
684+
proxyFromEnvironment:
685+
description: |-
686+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
687+
688+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
689+
type: boolean
639690
proxyUrl:
640-
description: Optional ProxyURL.
691+
description: '`proxyURL` defines the HTTP proxy server to use.'
692+
pattern: ^(http|https|socks5)://.+$
641693
type: string
642694
scheme:
643695
description: |-
@@ -1099,7 +1151,7 @@ spec:
10991151
description: |-
11001152
Maximum acceptable TLS version.
11011153
1102-
It requires Prometheus >= v2.41.0.
1154+
It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
11031155
enum:
11041156
- TLS10
11051157
- TLS11
@@ -1110,7 +1162,7 @@ spec:
11101162
description: |-
11111163
Minimum acceptable TLS version.
11121164
1113-
It requires Prometheus >= v2.35.0.
1165+
It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
11141166
enum:
11151167
- TLS10
11161168
- TLS11

0 commit comments

Comments
 (0)