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 <mariofer@redhat.com>
marioferh authored Jul 29, 2024
1 parent a57b0a5 commit 386a780
Showing 6 changed files with 303 additions and 544 deletions.
68 changes: 67 additions & 1 deletion bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
Original file line number Diff line number Diff line change
@@ -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
@@ -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.
@@ -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
Original file line number Diff line number Diff line change
@@ -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
68 changes: 67 additions & 1 deletion deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
Original file line number Diff line number Diff line change
@@ -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
@@ -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.
@@ -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
98 changes: 97 additions & 1 deletion docs/api.md
Original file line number Diff line number Diff line change
@@ -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>
@@ -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>
@@ -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>
@@ -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>

55 changes: 19 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ require (
github.com/openshift/api v0.0.0-20240301093301-ce10821dc999
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.55.0
github.com/rhobs/obo-prometheus-operator v0.74.0-rhobs1
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.74.0-rhobs1
github.com/rhobs/obo-prometheus-operator v0.75.2-rhobs1
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.75.2-rhobs1
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/mod v0.19.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools/v3 v3.5.1
@@ -22,19 +22,13 @@ require (
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
k8s.io/component-base v0.30.3
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.18.4
)

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go v1.51.25 // indirect
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -43,75 +37,64 @@ require (
github.com/distribution/reference v0.6.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/efficientgo/core v1.0.0-rc.2 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/analysis v0.22.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.21.5 // indirect
github.com/go-openapi/runtime v0.27.1 // indirect
github.com/go-openapi/spec v0.20.14 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
github.com/go-openapi/runtime v0.28.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.23.0 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus-community/prom-label-proxy v0.8.1 // indirect
github.com/prometheus-community/prom-label-proxy v0.10.0 // indirect
github.com/prometheus/alertmanager v0.27.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/prometheus v0.52.0 // indirect
github.com/rhobs/obo-prometheus-operator/pkg/client v0.74.0-rhobs1 // indirect
github.com/prometheus/prometheus v0.53.0 // indirect
github.com/rhobs/obo-prometheus-operator/pkg/client v0.75.2-rhobs1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.9.0 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
@@ -123,8 +106,8 @@ require (
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
556 changes: 52 additions & 504 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 386a780

Please sign in to comment.