Skip to content

Commit ad14954

Browse files
renovate[bot]timebertt
renovate[bot]
and
timebertt
authored
Update dependency prometheus-operator/kube-prometheus to v0.16.0 (#657)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tim Ebert <[email protected]>
1 parent d1fba4c commit ad14954

File tree

67 files changed

+1784
-202
lines changed

Some content is hidden

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

67 files changed

+1784
-202
lines changed

‎hack/config/monitoring/crds/0alertmanagerConfigCustomResourceDefinition.yaml‎

Lines changed: 778 additions & 1 deletion
Large diffs are not rendered by default.

‎hack/config/monitoring/crds/0alertmanagerCustomResourceDefinition.yaml‎

Lines changed: 182 additions & 11 deletions
Large diffs are not rendered by default.

‎hack/config/monitoring/crds/0podmonitorCustomResourceDefinition.yaml‎

Lines changed: 51 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.18.0
6-
operator.prometheus.io/version: 0.83.0
6+
operator.prometheus.io/version: 0.85.0
77
name: podmonitors.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -416,6 +416,14 @@ spec:
416416
type: string
417417
type: object
418418
type: array
419+
noProxy:
420+
description: |-
421+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
422+
that should be excluded from proxying. IP and domain names can
423+
contain port numbers.
424+
425+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
426+
type: string
419427
oauth2:
420428
description: |-
421429
`oauth2` configures the OAuth2 settings to use when scraping the target.
@@ -746,10 +754,47 @@ spec:
746754
maximum: 65535
747755
minimum: 1
748756
type: integer
749-
proxyUrl:
757+
proxyConnectHeader:
758+
additionalProperties:
759+
items:
760+
description: SecretKeySelector selects a key of a Secret.
761+
properties:
762+
key:
763+
description: The key of the secret to select from. Must be a valid secret key.
764+
type: string
765+
name:
766+
default: ""
767+
description: |-
768+
Name of the referent.
769+
This field is effectively required, but due to backwards compatibility is
770+
allowed to be empty. Instances of this type with an empty value here are
771+
almost certainly wrong.
772+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
773+
type: string
774+
optional:
775+
description: Specify whether the Secret or its key must be defined
776+
type: boolean
777+
required:
778+
- key
779+
type: object
780+
x-kubernetes-map-type: atomic
781+
type: array
750782
description: |-
751-
`proxyURL` configures the HTTP Proxy URL (e.g.
752-
"http://proxyserver:2195") to go through when scraping the target.
783+
ProxyConnectHeader optionally specifies headers to send to
784+
proxies during CONNECT requests.
785+
786+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
787+
type: object
788+
x-kubernetes-map-type: atomic
789+
proxyFromEnvironment:
790+
description: |-
791+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
792+
793+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
794+
type: boolean
795+
proxyUrl:
796+
description: '`proxyURL` defines the HTTP proxy server to use.'
797+
pattern: ^(http|https|socks5)://.+$
753798
type: string
754799
relabelings:
755800
description: |-
@@ -1056,6 +1101,8 @@ spec:
10561101
description: |-
10571102
Whether to scrape a classic histogram that is also exposed as a native histogram.
10581103
It requires Prometheus >= v2.45.0.
1104+
1105+
Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
10591106
type: boolean
10601107
scrapeProtocols:
10611108
description: |-

‎hack/config/monitoring/crds/0probeCustomResourceDefinition.yaml‎

Lines changed: 78 additions & 2 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.18.0
6-
operator.prometheus.io/version: 0.83.0
6+
operator.prometheus.io/version: 0.85.0
77
name: probes.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -623,19 +623,93 @@ spec:
623623
- clientSecret
624624
- tokenUrl
625625
type: object
626+
params:
627+
description: |-
628+
The list of HTTP query parameters for the scrape.
629+
Please note that the `.spec.module` field takes precedence over the `module` parameter from this list when both are defined.
630+
The module name must be added using Module under ProbeSpec.
631+
items:
632+
description: ProbeParam defines specification of extra parameters for a Probe.
633+
properties:
634+
name:
635+
description: The parameter name
636+
minLength: 1
637+
type: string
638+
values:
639+
description: The parameter values
640+
items:
641+
minLength: 1
642+
type: string
643+
minItems: 1
644+
type: array
645+
required:
646+
- name
647+
type: object
648+
minItems: 1
649+
type: array
650+
x-kubernetes-list-map-keys:
651+
- name
652+
x-kubernetes-list-type: map
626653
prober:
627654
description: |-
628655
Specification for the prober to use for probing targets.
629656
The prober.URL parameter is required. Targets cannot be probed if left empty.
630657
properties:
658+
noProxy:
659+
description: |-
660+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
661+
that should be excluded from proxying. IP and domain names can
662+
contain port numbers.
663+
664+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
665+
type: string
631666
path:
632667
default: /probe
633668
description: |-
634669
Path to collect metrics from.
635670
Defaults to `/probe`.
636671
type: string
672+
proxyConnectHeader:
673+
additionalProperties:
674+
items:
675+
description: SecretKeySelector selects a key of a Secret.
676+
properties:
677+
key:
678+
description: The key of the secret to select from. Must be a valid secret key.
679+
type: string
680+
name:
681+
default: ""
682+
description: |-
683+
Name of the referent.
684+
This field is effectively required, but due to backwards compatibility is
685+
allowed to be empty. Instances of this type with an empty value here are
686+
almost certainly wrong.
687+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
688+
type: string
689+
optional:
690+
description: Specify whether the Secret or its key must be defined
691+
type: boolean
692+
required:
693+
- key
694+
type: object
695+
x-kubernetes-map-type: atomic
696+
type: array
697+
description: |-
698+
ProxyConnectHeader optionally specifies headers to send to
699+
proxies during CONNECT requests.
700+
701+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
702+
type: object
703+
x-kubernetes-map-type: atomic
704+
proxyFromEnvironment:
705+
description: |-
706+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
707+
708+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
709+
type: boolean
637710
proxyUrl:
638-
description: Optional ProxyURL.
711+
description: '`proxyURL` defines the HTTP proxy server to use.'
712+
pattern: ^(http|https|socks5)://.+$
639713
type: string
640714
scheme:
641715
description: |-
@@ -664,6 +738,8 @@ spec:
664738
description: |-
665739
Whether to scrape a classic histogram that is also exposed as a native histogram.
666740
It requires Prometheus >= v2.45.0.
741+
742+
Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
667743
type: boolean
668744
scrapeProtocols:
669745
description: |-

0 commit comments

Comments
 (0)