Skip to content

Commit 71a9d1e

Browse files
jan--fzhujedependabot[bot]jgbernalpalanconway
authored
chore: sync main for 1.5 release (#1109)
* fix: update tls log to omit length of ciphers array (#1074) * fix: update tls log to omit length of ciphers array Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com> * fix: tls cipher logging Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com> --------- Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com> * build(deps): bump github.com/operator-framework/api (#1059) Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.38.0 to 0.42.0. - [Release notes](https://github.com/operator-framework/api/releases) - [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md) - [Commits](operator-framework/api@v0.38.0...v0.42.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/api dependency-version: 0.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: update obo-prom-op to v0.90.1 (#1077) Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * build(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring (#1060) Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.89.0 to 0.90.1. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](prometheus-operator/prometheus-operator@v0.89.0...v0.90.1) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-version: 0.90.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: update perses operand image (#1085) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * feat: coo 1.5 image tag and compat. matrix update (#1075) * fix: add 'create tokenreview' to korrel8r RBAC (#1073) Korrel8r uses 'create tokenreview' to get user names for session tokens. Need usernames for reliable session keys. Same user can get different tokens per log-in. * fix: remove ui plugin finalizers in favor of k8s garbage collection (#1084) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * NO-JIRA: remove SupportsTLSProfile (#1089) * fix: enable tls support for troubleshooting plugin * feat: remove supports tls profile flag because all uiplugin support tls now * fix: lint * chore: unpin github.com/openshift/api (#1090) This commit unpins the version of `github.com/openshift/api` to depend on the latest version. To continue supporting older OpenShift versions which require the Console v1alpha1 API (removed since 2024), we fork the `github.com/openshift/api` under `github.com/rhobs/openshift-api` and pinned to the same version that was used before this change. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * fix: use pointer-to-struct for fields with json omitempty (#1063) Use pointers for API struct fields marked "omitempty". "omitempty" does not work on non-pointer struct fields. A zero valued struct will serialize at least as "{}" and may contain zero valued fields if any fields are not "omitempty". This can cause problems with default values and round-trip (de)serialization and break even if the kubebuilder "+optional" comment is applied. Additional fixes: - Add nil-safe GetFoo() methods to avoid long !=nil tests. - Rename TracingObjectStorageSpec.GCSSTSSpec to GCSWIF to match its type and json tag - Update CEL validation rule to handle nil storage/objectStorage with has() guards - Add nil guards for Tracing, Storage, ObjectStorageSpec, and Operators in controller code - Remove spurious omitempty from required S3Spec.AccessKeySecret field - Fix ConfigMapKeySelector doc comments that incorrectly referenced "Secret" * fix: escape reserved words from perses cel validation expressions (#1091) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * chore: update [obo-]prometheus-operator to v0.91.0 (#1096) Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * chore: update [obo-]prometheus-operator to v0.91.0 (#1098) Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * feat: apply TLS profile to COO (#1088) This commit passes the TLS configuration read from the cluster TLS profile to the operator's HTTPS server. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * COO-1531: feat: expose AlertmanagerConfigMatcherStrategy on MonitoringStack (#1092) * feat: expose AlertmanagerConfigMatcherStrategy on MonitoringStack (COO-1531) AlertmanagerConfig resources automatically inject a namespace matcher into routes, forcing users to add namespace labels to PrometheusRule alerts. Expose the matcherStrategy field on MonitoringStack.Spec.AlertmanagerConfig with a default of None so routes match all alerts regardless of namespace. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * refactor: nest matcherStrategy as struct with type field Mirror the upstream prometheus-operator AlertmanagerConfigMatcherStrategy pattern by making matcherStrategy an object with a type field instead of a flat string enum. This allows future extensibility with additional strategy parameters. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix: add per-component resource fields for Alertmanager and Thanos sidecar (COO-1063) (#1094) Instead of propagating the single Resources field to all components, add dedicated resource fields: AlertmanagerConfig.Resources and PrometheusConfig.ThanosResources. The existing Resources field remains scoped to the Prometheus container only. Both new fields default to 50m/128Mi requests and 250m/256Mi limits, which are lower than Prometheus defaults since these components typically need fewer resources. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * chore(release): sync 1.4.0 version to main (#1099) The 1.4.0 release commit (PR #1023) targeted release-1.4 directly and was never synced back to main, leaving the main branch stuck at version 1.3.0. This caused prow postsubmit builds to produce bundle images with stale 1.3.0 labels. Bump VERSION, CSV, kustomization files, and CHANGELOG to 1.4.0 to match the current released version. Signed-off-by: Daniel Mellado <dmellado@fedoraproject.org> * test: update golangci-lint to v2.12.2 (#1102) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * test: refactor Thanos querier e2e tests (#1101) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * docs: logging uiplugin (#1104) * fix: Use rhobs/openshift-api for console/v1 for 4.17-4.18 (#1100) * fix: use rhobs api/v1 for 4.17 and 4.18 clusters * fix: address pr comments * chore: add Peter as a maintainer (#1106) Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * test: add e2e test for UIPlugin post-uninstall cascade cleanup (COO-1404) (#1087) Co-authored-by: Cursor <cursoragent@cursor.com> * feat: remove hardcoded perses image and set perses support level to GA (#1105) * feat: add agent-navigation feature flag and uiplugin field (#1107) uiplugin.enableFeatureNavigation bool - set via resource --features "agent-navigation" - set via command line --------- Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Daniel Mellado <dmellado@fedoraproject.org> Co-authored-by: Jenny Zhu <jenny.a.zhu@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Alan Conway <aconway@redhat.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Daniel Mellado <1313475+danielmellado@users.noreply.github.com> Co-authored-by: Evelyn Murasaki <emurasak@redhat.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: David Rajnoha <drajnoha@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent ab22ce2 commit 71a9d1e

69 files changed

Lines changed: 2245 additions & 543 deletions

File tree

Some content is hidden

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

‎.github/tools‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Autogenerated by make tools
22

3-
golangci-lint v1.63.4
3+
golangci-lint v2.12.2
44
controller-gen v0.19.0
55
kustomize v5.5.0
66
oc 4.17.12

‎.golangci.yml‎

Lines changed: 76 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,80 @@
1+
version: "2"
12
run:
2-
timeout: 10m
3-
3+
timeout: 5m
4+
tests: true
45
linters:
6+
disable-all: true
7+
enable:
8+
- depguard
9+
- errcheck
10+
- errorlint
11+
- bodyclose
12+
- govet
13+
- ineffassign
14+
- misspell
15+
- nolintlint
16+
- nosprintfhostport
17+
- staticcheck
18+
- usetesting
19+
- unconvert
20+
- unused
21+
- wastedassign
22+
- whitespace
23+
settings:
24+
errcheck:
25+
exclude-functions:
26+
- (net/http.ResponseWriter).Write
27+
- fmt.Fprintln
28+
staticcheck:
29+
checks:
30+
- "all"
31+
- "-QF*" # quickfix suggestions (style preference)
32+
- "-ST1000" # package comments (style preference)
33+
- "-ST1003" # naming conventions like API vs Api (style preference)
34+
- "-ST1005" # error string capitalization (style preference)
35+
- "-ST1019" # duplicate imports (style preference)
36+
- "-ST1020" # comment format on functions (style preference)
37+
- "-ST1021" # comment format on types (style preference)
38+
depguard:
39+
rules:
40+
# Name of a rule.
41+
main:
42+
deny:
43+
- pkg: "github.com/pkg/errors"
44+
desc: "Use 'errors' or 'fmt' instead"
45+
- pkg: "golang.org/x/exp/slices"
46+
desc: "Use 'slices' instead"
47+
exclusions:
48+
paths:
49+
- vendor
50+
- test
51+
- hack
52+
- examples
53+
rules:
54+
- path: _test\.go
55+
linters:
56+
# The list of linters below is exhaustive with respect to the linters defined above, and as such, a linter
57+
# that needs to be run on test files should be dropped from here.
58+
- depguard
59+
- errcheck
60+
- errorlint
61+
- bodyclose
62+
- ineffassign
63+
- misspell
64+
- nolintlint
65+
- nosprintfhostport
66+
- staticcheck
67+
- usetesting
68+
- unconvert
69+
- unused
70+
- wastedassign
71+
- whitespace
72+
formatters:
573
enable:
674
- gci
7-
8-
issues:
9-
exclude-rules:
10-
- path: _test.go
11-
linters:
12-
- errcheck
13-
14-
linters-settings:
15-
gci:
16-
sections:
17-
- standard
18-
- default
19-
- prefix(github.com/rhobs/observability-operator)
75+
settings:
76+
gci:
77+
sections:
78+
- standard
79+
- default
80+
- prefix(github.com/rhobs/observability-operator)

‎CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.4.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2026-03-05)
6+
7+
8+
### Features
9+
10+
* add annotation to select cluster monitoring by default ([#975](https://github.com/rhobs/monitoring-stack-operator/issues/975)) ([e81840b](https://github.com/rhobs/monitoring-stack-operator/commit/e81840ba98e1aea6243c215bff9407fef0f1ca00))
11+
* add logging plugin show timezone selector option ([#991](https://github.com/rhobs/monitoring-stack-operator/issues/991)) ([50c6a42](https://github.com/rhobs/monitoring-stack-operator/commit/50c6a42f25d95c2b6738ca9f54de0cd217ef5cc0))
12+
* allow to set replicas number for Alertmanager ([#941](https://github.com/rhobs/monitoring-stack-operator/issues/941)) ([e7a45ee](https://github.com/rhobs/monitoring-stack-operator/commit/e7a45ee644d40b9deccffc52d4779b41f5bb8894))
13+
* cluster/component healh backend & resources update ([#976](https://github.com/rhobs/monitoring-stack-operator/issues/976)) ([5321e5e](https://github.com/rhobs/monitoring-stack-operator/commit/5321e5e45b491243915a7e9eb2080e1844b6f2cb))
14+
* enable watch-referenced-objects-in-all-namespaces in Prometheus operator ([#945](https://github.com/rhobs/monitoring-stack-operator/issues/945)) ([340137c](https://github.com/rhobs/monitoring-stack-operator/commit/340137c0e892d33205bd095e02ded20ba7a9c40c))
15+
* show degraded condition when reconciling fails ([#985](https://github.com/rhobs/monitoring-stack-operator/issues/985)) ([cd13c3d](https://github.com/rhobs/monitoring-stack-operator/commit/cd13c3df220e4118b7b11ee3b55573c4d661e6f7))
16+
* support size-based retention for MonitoringStack ([#946](https://github.com/rhobs/monitoring-stack-operator/issues/946)) ([b13d7b2](https://github.com/rhobs/monitoring-stack-operator/commit/b13d7b2af662707766a3a87d8c6941b4d0360678)), closes [#890](https://github.com/rhobs/monitoring-stack-operator/issues/890)
17+
* uiplugin API - new flag for the cluster-health-analyzer ([#971](https://github.com/rhobs/monitoring-stack-operator/issues/971)) ([7502b2b](https://github.com/rhobs/monitoring-stack-operator/commit/7502b2bb40522641edbef3107f6a12e5b478a363))
18+
* update perses and perses operator versions ([#977](https://github.com/rhobs/monitoring-stack-operator/issues/977)) ([529d684](https://github.com/rhobs/monitoring-stack-operator/commit/529d6840896f9763f16063e8846ea40f6b03a3f9))
19+
* update perses and perses operator versions ([#979](https://github.com/rhobs/monitoring-stack-operator/issues/979)) ([b3ab345](https://github.com/rhobs/monitoring-stack-operator/commit/b3ab3459b66e2743ee1431762157cc2596f9b476))
20+
* update perses resources ([#1002](https://github.com/rhobs/monitoring-stack-operator/issues/1002)) ([72d153d](https://github.com/rhobs/monitoring-stack-operator/commit/72d153d870c28bb24f89ff3b7e1e86033fd7559f))
21+
22+
23+
### Bug Fixes
24+
25+
* [COO-1304] Fix misspelled labels of accelerator metrics ([#925](https://github.com/rhobs/monitoring-stack-operator/issues/925)) ([3358246](https://github.com/rhobs/monitoring-stack-operator/commit/33582461e25a4db06504c410d7c2adbd95b7844b))
26+
* [COO-1305] Fix misspelled metric name in accelerators ([#926](https://github.com/rhobs/monitoring-stack-operator/issues/926)) ([e38a3f6](https://github.com/rhobs/monitoring-stack-operator/commit/e38a3f63edaafeec57d575fe9cfe85892994ea2e))
27+
* [COO-1313] Add missing description for ObservabilityInstaller in OpenShift console ([#928](https://github.com/rhobs/monitoring-stack-operator/issues/928)) ([d2b4b9d](https://github.com/rhobs/monitoring-stack-operator/commit/d2b4b9d790021f900d3e03d8168b41b13ff17f9b))
28+
* [COO-1325] fix logging model field documentation ([#938](https://github.com/rhobs/monitoring-stack-operator/issues/938)) ([d638618](https://github.com/rhobs/monitoring-stack-operator/commit/d63861810de686fba5f26dbec830f71c308133f4))
29+
* disable unmanaged Prometheus configuration ([#944](https://github.com/rhobs/monitoring-stack-operator/issues/944)) ([5ef4238](https://github.com/rhobs/monitoring-stack-operator/commit/5ef42381f8516cd24169b06861f19f003af0016e)), closes [#932](https://github.com/rhobs/monitoring-stack-operator/issues/932)
30+
* fix & rename health-analyzer and korrel8r clusterrolebindings ([#937](https://github.com/rhobs/monitoring-stack-operator/issues/937)) ([42301f7](https://github.com/rhobs/monitoring-stack-operator/commit/42301f7b4051fb025eaa32c106238cf6c529f230))
31+
* github action olm publish ([#984](https://github.com/rhobs/monitoring-stack-operator/issues/984)) ([625b2d8](https://github.com/rhobs/monitoring-stack-operator/commit/625b2d820fdd776ae6fc1d92671decda3e186198))
32+
* github action workflow release failure ([#957](https://github.com/rhobs/monitoring-stack-operator/issues/957)) ([3878301](https://github.com/rhobs/monitoring-stack-operator/commit/387830146b8714a88cc986bdda5518e16d12dcd6))
33+
* reorder resource updates to cause fewer errors ([#998](https://github.com/rhobs/monitoring-stack-operator/issues/998)) ([d79ea06](https://github.com/rhobs/monitoring-stack-operator/commit/d79ea068f759cdf4ed126949495d682da665946a))
34+
* set correct references for perses CR for correct cleanup ([#942](https://github.com/rhobs/monitoring-stack-operator/issues/942)) ([8627d46](https://github.com/rhobs/monitoring-stack-operator/commit/8627d46e67bf24ae7f86159f6ee4a174a05c895e))
35+
* set logger warning and image ref ([#924](https://github.com/rhobs/monitoring-stack-operator/issues/924)) ([fd5645c](https://github.com/rhobs/monitoring-stack-operator/commit/fd5645c2d23e049a5f7e414a56eec1563b934e80))
36+
* uiplugin - the clusterHealthAnalyzer atr should be pointer ([#974](https://github.com/rhobs/monitoring-stack-operator/issues/974)) ([7527133](https://github.com/rhobs/monitoring-stack-operator/commit/7527133cfea47cf846dcbe3774ab80a4a01ab2af))
37+
538
## [1.3.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2025-11-03)
639

740

‎DEPENDENCY_CONSTRAINTS.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ This project depends on 2 versions of `github.com/openshift/api`:
99
* A [forked version](https://github.com/rhobs/openshift-api).
1010

1111
**Why Forked:** The observability-operator needs to support both OpenShift console API `v1` and `v1alpha1` for backward compatibility:
12-
- OpenShift >= 4.17 uses `console/v1` API
13-
- OpenShift < 4.17 uses `console/v1alpha1` API
12+
- OpenShift >= 4.19 uses `console/v1` API (openshift/api)
13+
- OpenShift 4.17 - 4.18 uses `console/v1` API (rhobs/openshift-api)
14+
- OpenShift < 4.17 uses `console/v1alpha1` API (rhobs/openshift-api)
1415

15-
Newer versions of `github.com/openshift/api` (after April 2024) have removed the `console/v1alpha1` API, breaking compatibility with older OpenShift versions. To continue supporting older versions, we forked the library under (https://github.com/rhobs/openshift-api) using the last commit including the `v1alpha1` API and renaming the Go module in `go.mod` to `github.com/rhobs/openshift-api`.
16+
Newer versions of `github.com/openshift/api` (after April 2024) have removed the `console/v1alpha1` API, breaking compatibility with older OpenShift versions. To continue supporting older versions, we forked the library under (https://github.com/rhobs/openshift-api) using the last commit including the `v1alpha1` API and renaming the Go module in `go.mod` to `github.com/rhobs/openshift-api`. The openshift/api `console/v1` adds the `ConsolePlugin.spec.ContentSecurityPolicy` field when marshalling, which is not supported in 4.17 and 4.18, so we utilize rhobs/openshift-api `console/v1` for those versions.
1617

1718
**Impact:** The codebase maintains dual API support with runtime version detection to create the appropriate Console Plugin resources.
1819

1920
**Files Affected:**
2021
- `pkg/controllers/uiplugin/controller.go` - Version detection logic
21-
- `pkg/controllers/uiplugin/components.go` - Dual Console Plugin creation
22-
- `pkg/controllers/uiplugin/plugin_info_builder.go` - Plugin info structure with LegacyProxies
22+
- `pkg/controllers/uiplugin/components.go` - Console Plugin version determination and creation
23+
- `pkg/controllers/uiplugin/proxy.go` - Plugin info structure for proxies which are different between v1 and v1alpha1 version
2324
- `pkg/operator/scheme.go` - API scheme registration
2425
- All uiplugin package files using `osv1alpha1` imports
2526

@@ -31,6 +32,9 @@ Dependabot takes care of dependency updates, the configuration is located at `.g
3132

3233
When OpenShift &lt; 4.17 support is no longer needed, we can:
3334
1. Remove `console/v1alpha1` API usage.
34-
2. Remove dual API support code.
35-
3. Remove dependency on `github.com/rhobs/openshift-api`
36-
4. Update this document
35+
4. Update this document
36+
37+
When OpenShift &lt; 4.19 support is no longer needed, we can:
38+
1. Remove dual API support code.
39+
2. Remove dependency on `github.com/rhobs/openshift-api`
40+
3. Update this document

‎Makefile.tools‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OPM=$(TOOLS_DIR)/opm
2020
OPM_VERSION = v1.57.0
2121

2222
GOLANGCI_LINT=$(TOOLS_DIR)/golangci-lint
23-
GOLANGCI_LINT_VERSION = v1.63.4
23+
GOLANGCI_LINT_VERSION = v2.12.2
2424

2525
## NOTE: promq does not have any releases, so we use a fake version starting with v0.0.1
2626
# thus to upgrade/invalidate the github cache, increment the value
@@ -50,7 +50,7 @@ $(CONTROLLER_GEN) controller-gen: $(TOOLS_DIR)
5050
$(GOLANGCI_LINT) golangci-lint: $(TOOLS_DIR)
5151
@{ \
5252
set -ex ;\
53-
GOBIN=$(TOOLS_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) ;\
53+
GOBIN=$(TOOLS_DIR) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) ;\
5454
}
5555

5656
# NOTE: kustomize does not support `go install` hence this workaround to install

‎OWNERS_ALIASES‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@ aliases:
2020
- jan--f
2121
- danielmellado
2222
- simonpasquier
23-
- slashpai
24-
- marioferh
2523
- jgbernalp
26-
- lihongyan1
24+
- PeterYurkovich

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0
1+
1.4.0

‎bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.1
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.90.1-rhobs1
7+
operator.prometheus.io/version: 0.91.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -1155,6 +1155,22 @@ spec:
11551155
This provides a fallback for email clients that don't support HTML.
11561156
minLength: 1
11571157
type: string
1158+
threading:
1159+
description: |-
1160+
threading defines the threading configuration for email receiver.
1161+
It requires Alertmanager >= v0.30.0.
1162+
properties:
1163+
threadByDate:
1164+
description: |-
1165+
threadByDate defines what granularity of current date to thread by. Accepted values: Daily, None.
1166+
(None means group by alert group key, no date).
1167+
enum:
1168+
- Daily
1169+
- None
1170+
type: string
1171+
required:
1172+
- threadByDate
1173+
type: object
11581174
tlsConfig:
11591175
description: |-
11601176
tlsConfig defines the TLS configuration for SMTP connections.
@@ -8136,6 +8152,12 @@ spec:
81368152
- key
81378153
type: object
81388154
x-kubernetes-map-type: atomic
8155+
externalId:
8156+
description: |-
8157+
externalId defines the external ID used when assuming an AWS role. Can only be used with roleArn.
8158+
It requires Prometheus >= v3.11.0 or Alertmanager >= v0.33.0. Currently not supported by Thanos.
8159+
minLength: 1
8160+
type: string
81398161
profile:
81408162
description: profile defines the named AWS profile
81418163
used to authenticate.
@@ -8180,6 +8202,10 @@ spec:
81808202
It requires Prometheus >= v2.54.0.
81818203
type: boolean
81828204
type: object
8205+
x-kubernetes-validations:
8206+
- message: externalId can only be used when roleArn is
8207+
specified
8208+
rule: '!has(self.externalId) || has(self.roleArn)'
81838209
subject:
81848210
description: |-
81858211
subject defines the subject line when the message is delivered to email endpoints.

‎bundle/manifests/monitoring.rhobs_alertmanagers.yaml‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.1
66
observability.openshift.io/api-support: Experimental-SSA
7-
operator.prometheus.io/version: 0.90.1-rhobs1
7+
operator.prometheus.io/version: 0.91.0-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -1862,6 +1862,37 @@ spec:
18621862
pattern: ^(http|https)://.+$
18631863
type: string
18641864
type: object
1865+
mattermost:
1866+
description: mattermost defines the default Mattermost Config
1867+
properties:
1868+
webhookURL:
1869+
description: |-
1870+
webhookURL defines the default Mattermost Webhook URL.
1871+
1872+
It requires Alertmanager >= v0.32.0.
1873+
properties:
1874+
key:
1875+
description: The key of the secret to select from. Must
1876+
be a valid secret key.
1877+
type: string
1878+
name:
1879+
default: ""
1880+
description: |-
1881+
Name of the referent.
1882+
This field is effectively required, but due to backwards compatibility is
1883+
allowed to be empty. Instances of this type with an empty value here are
1884+
almost certainly wrong.
1885+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1886+
type: string
1887+
optional:
1888+
description: Specify whether the Secret or its key
1889+
must be defined
1890+
type: boolean
1891+
required:
1892+
- key
1893+
type: object
1894+
x-kubernetes-map-type: atomic
1895+
type: object
18651896
opsGenieApiKey:
18661897
description: opsGenieApiKey defines the default OpsGenie API
18671898
Key.

0 commit comments

Comments
 (0)