Skip to content

Commit

Permalink
fix: bump obo-prometheus-operator to v0.75.2-rhobs (#537)
Browse files Browse the repository at this point in the history 
Signed-off-by: Mario Fernandez <[email protected]>
  • Loading branch information
@marioferh
marioferh authored Jul 29, 2024
1 parent a57b0a5 commit 386a780
Show file tree
Hide file tree
Showing 6 changed files with 303 additions and 544 deletions.
68 changes: 67 additions & 1 deletion bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,13 @@ spec:
enableHTTP2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
It requires Prometheus >= v2.26.0.
type: boolean
headers:
additionalProperties:
type: string
Expand Down Expand Up @@ -599,6 +606,15 @@ spec:
It requires Prometheus >= v2.15.0.
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
that should be excluded from proxying. IP and domain names can
contain port numbers.
It requires Prometheus >= v2.43.0.
type: string
oauth2:
description: |-
OAuth2 configuration for the URL.
Expand Down Expand Up @@ -719,8 +735,58 @@ spec:
- clientSecret
- tokenUrl
type: object
proxyConnectHeader:
additionalProperties:
items:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
TODO: Add other useful fields. apiVersion, kind, uid?
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
type: string
optional:
description: Specify whether the Secret or its key
must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
It requires Prometheus >= v2.43.0.
type: object
x-kubernetes-map-type: atomic
proxyFromEnvironment:
description: |-
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
description: Optional ProxyURL.
description: |-
`proxyURL` defines the HTTP proxy server to use.
It requires Prometheus >= v2.43.0.
pattern: ^http(s)?://.+$
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:0.3.3
createdAt: "2024-06-28T13:18:35Z"
createdAt: "2024-07-29T09:38:02Z"
description: A Go based Kubernetes operator to setup and manage highly available
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
operators.operatorframework.io/builder: operator-sdk-v1.34.1
Expand Down
68 changes: 67 additions & 1 deletion deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,13 @@ spec:
enableHTTP2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
It requires Prometheus >= v2.26.0.
type: boolean
headers:
additionalProperties:
type: string
Expand Down Expand Up @@ -599,6 +606,15 @@ spec:
It requires Prometheus >= v2.15.0.
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
that should be excluded from proxying. IP and domain names can
contain port numbers.
It requires Prometheus >= v2.43.0.
type: string
oauth2:
description: |-
OAuth2 configuration for the URL.
Expand Down Expand Up @@ -719,8 +735,58 @@ spec:
- clientSecret
- tokenUrl
type: object
proxyConnectHeader:
additionalProperties:
items:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
TODO: Add other useful fields. apiVersion, kind, uid?
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
type: string
optional:
description: Specify whether the Secret or its key
must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
It requires Prometheus >= v2.43.0.
type: object
x-kubernetes-map-type: atomic
proxyFromEnvironment:
description: |-
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
description: Optional ProxyURL.
description: |-
`proxyURL` defines the HTTP proxy server to use.
It requires Prometheus >= v2.43.0.
pattern: ^http(s)?://.+$
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write
Expand Down
98 changes: 97 additions & 1 deletion docs/api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,16 @@ Deprecated: this will be removed in a future release. Prefer using `authorizatio
Whether to enable HTTP2.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>followRedirects</b></td>
<td>boolean</td>
<td>
Configure whether HTTP requests follow HTTP 3xx redirects.


It requires Prometheus >= v2.26.0.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>headers</b></td>
<td>map[string]string</td>
Expand Down Expand Up @@ -839,6 +849,18 @@ name is used in metrics and logging in order to differentiate queues.
It requires Prometheus >= v2.15.0.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>noProxy</b></td>
<td>string</td>
<td>
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
that should be excluded from proxying. IP and domain names can
contain port numbers.


It requires Prometheus >= v2.43.0.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#monitoringstackspecprometheusconfigremotewriteindexoauth2">oauth2</a></b></td>
<td>object</td>
Expand All @@ -852,11 +874,36 @@ It requires Prometheus >= v2.27.0.
Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#monitoringstackspecprometheusconfigremotewriteindexproxyconnectheaderkeyindex">proxyConnectHeader</a></b></td>
<td>map[string][]object</td>
<td>
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.


It requires Prometheus >= v2.43.0.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>proxyFromEnvironment</b></td>
<td>boolean</td>
<td>
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
If unset, Prometheus uses its default value.


It requires Prometheus >= v2.43.0.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>proxyUrl</b></td>
<td>string</td>
<td>
Optional ProxyURL.<br/>
`proxyURL` defines the HTTP proxy server to use.


It requires Prometheus >= v2.43.0.<br/>
</td>
<td>false</td>
</tr><tr>
Expand Down Expand Up @@ -1669,6 +1716,55 @@ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://git
</table>


### MonitoringStack.spec.prometheusConfig.remoteWrite[index].proxyConnectHeader[key][index]
<sup><sup>[↩ Parent](#monitoringstackspecprometheusconfigremotewriteindex)</sup></sup>



SecretKeySelector selects a key of a Secret.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>key</b></td>
<td>string</td>
<td>
The key of the secret to select from. Must be a valid secret key.<br/>
</td>
<td>true</td>
</tr><tr>
<td><b>name</b></td>
<td>string</td>
<td>
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
TODO: Add other useful fields. apiVersion, kind, uid?
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.<br/>
<br/>
<i>Default</i>: <br/>
</td>
<td>false</td>
</tr><tr>
<td><b>optional</b></td>
<td>boolean</td>
<td>
Specify whether the Secret or its key must be defined<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### MonitoringStack.spec.prometheusConfig.remoteWrite[index].queueConfig
<sup><sup>[↩ Parent](#monitoringstackspecprometheusconfigremotewriteindex)</sup></sup>

Expand Down
Loading

0 comments on commit 386a780

Please sign in to comment.