Skip to content

Commit cb47218

Browse files
tremeslihongyan1jan--fdependabot[bot]PeterYurkovich
authored
sync 1.3 to main (#935)
* sync code changes from main to release-1.3 (#918) * fix: fix linter issues and add CI check for linter changes (#887) Since we call `golang-lint --fix` we should check if the linter has fixed anything. Signed-off-by: Jan Fajerski <[email protected]> * build(deps): bump github.com/grafana/tempo-operator (#915) Bumps [github.com/grafana/tempo-operator](https://github.com/grafana/tempo-operator) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/grafana/tempo-operator/releases) - [Changelog](https://github.com/grafana/tempo-operator/blob/main/CHANGELOG.md) - [Commits](grafana/tempo-operator@v0.16.0...v0.18.0) --- updated-dependencies: - dependency-name: github.com/grafana/tempo-operator dependency-version: 0.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OU-964: update incidents and TP to GA (#912) * feat: update min version for incident feature to 4.20 * feat: update incidents and tp to GA in matrix * fix: re-enable incidents on 4.19 --------- Co-authored-by: Alberto Falossi <[email protected]> * fix: set 4.19 as GA for incidents (#917) * chore: update korrel8r image to 0.8.4 for COO 1.3 (#908) --------- Signed-off-by: Jan Fajerski <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Jan Fajerski <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <[email protected]> Co-authored-by: Alberto Falossi <[email protected]> Co-authored-by: Alan Conway <[email protected]> * fix: reconcile incident related resources only in 4.19+ (#921) * fix: reconcile korrel8r backend only for troubleshooting plugin (#922) Signed-off-by: Gabriel Bernal <[email protected]> * feat: drop korrel8r and troubleshooting panel support before 4.19 (#929) Signed-off-by: Gabriel Bernal <[email protected]> * Sync accelerators fixes (#930) * fix: [COO-1304] Fix misspelled labels of accelerator metrics (#925) Fix misspelled labels in the common accelerator metrics dashboard. * fix: [COO-1305] Fix misspelled metric name in accelerators (#926) Fix the spelling of units of the accellerator temperature. --------- Co-authored-by: Vitaly E. <[email protected]> * fix: rename clusterrolebinding used for monitoring plugin to avoid clash (#931) * Sync release tag (#927) * fix: fix linter issues and add CI check for linter changes (#887) Since we call `golang-lint --fix` we should check if the linter has fixed anything. Signed-off-by: Jan Fajerski <[email protected]> * build(deps): bump github.com/grafana/tempo-operator (#915) Bumps [github.com/grafana/tempo-operator](https://github.com/grafana/tempo-operator) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/grafana/tempo-operator/releases) - [Changelog](https://github.com/grafana/tempo-operator/blob/main/CHANGELOG.md) - [Commits](grafana/tempo-operator@v0.16.0...v0.18.0) --- updated-dependencies: - dependency-name: github.com/grafana/tempo-operator dependency-version: 0.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OU-964: update incidents and TP to GA (#912) * feat: update min version for incident feature to 4.20 * feat: update incidents and tp to GA in matrix * fix: re-enable incidents on 4.19 --------- Co-authored-by: Alberto Falossi <[email protected]> * fix: set 4.19 as GA for incidents (#917) * chore: update korrel8r image to 0.8.4 for COO 1.3 (#908) * chore(release): 1.3.0 (#920) --------- Signed-off-by: Jan Fajerski <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <[email protected]> Co-authored-by: Alberto Falossi <[email protected]> Co-authored-by: Alan Conway <[email protected]> * chore: bumpt to prometheus-operator 0.86.2 (#933) Signed-off-by: Jan Fajerski <[email protected]> --------- Signed-off-by: Jan Fajerski <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Gabriel Bernal <[email protected]> Co-authored-by: lihongyan1 <[email protected]> Co-authored-by: Jan Fajerski <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <[email protected]> Co-authored-by: Alberto Falossi <[email protected]> Co-authored-by: Alan Conway <[email protected]> Co-authored-by: Gabriel Bernal <[email protected]> Co-authored-by: Vitaly E. <[email protected]>
1 parent d2b4b9d commit cb47218

21 files changed

+71
-66
lines changed

bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_alertmanagers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: Experimental-SSA
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_podmonitors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_probes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_prometheusagents.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_prometheuses.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: Experimental-SSA
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_prometheusrules.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_servicemonitors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

bundle/manifests/monitoring.rhobs_thanosrulers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.86.1-rhobs1
7+
operator.prometheus.io/version: 0.86.2-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator

0 commit comments

Comments
 (0)