From 15540871e7a2eabab48e2f69e9dcf5bee087c648 Mon Sep 17 00:00:00 2001 From: Isaac Jimeno Date: Wed, 24 May 2023 12:24:40 +0200 Subject: [PATCH 1/2] Update documentation --- docs/gathered-data.md | 5 +++++ pkg/gatherers/clusterconfig/gather_monitoring_pvs.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docs/gathered-data.md b/docs/gathered-data.md index c064ba096..033b5399f 100644 --- a/docs/gathered-data.md +++ b/docs/gathered-data.md @@ -1085,6 +1085,11 @@ which matches with ConfigMap configuration yaml ### Released version - 4.14 +### Backported versions +- 4.13.0 +- 4.12.17 +- 4.11.41 + ### Changes None diff --git a/pkg/gatherers/clusterconfig/gather_monitoring_pvs.go b/pkg/gatherers/clusterconfig/gather_monitoring_pvs.go index 0fee7e3ae..d9525367b 100644 --- a/pkg/gatherers/clusterconfig/gather_monitoring_pvs.go +++ b/pkg/gatherers/clusterconfig/gather_monitoring_pvs.go @@ -30,6 +30,11 @@ import ( // ### Released version // - 4.14 // +// ### Backported versions +// - 4.13.0 +// - 4.12.17 +// - 4.11.41 +// // ### Changes // None func (g *Gatherer) GatherMonitoringPVs(ctx context.Context) ([]record.Record, []error) { From c38981707ac3fb1234ea33265c3114701326b669 Mon Sep 17 00:00:00 2001 From: Isaac Jimeno Date: Wed, 24 May 2023 16:35:58 +0200 Subject: [PATCH 2/2] Fix changelog script --- CHANGELOG.md | 11 +---------- cmd/changelog/main.go | 3 ++- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e00bd4ea2..374537bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,5 @@ # Note: This CHANGELOG is only for the changes in insights operator. - Please see OpenShift release notes for official changes\n -## 4.14 - -### Data Enhancement -- [#741](https://github.com/openshift/insights-operator/pull/685) Gather openshift-monitoring persistent volumes - -### Others - -- [#756](https://github.com/openshift/insights-operator/pull/756) add unit tests for cluster proxy gatherer - + Please see OpenShift release notes for official changes\n ## 4.13 ### Data Enhancement diff --git a/cmd/changelog/main.go b/cmd/changelog/main.go index 8e57d264c..c6ec9b77b 100644 --- a/cmd/changelog/main.go +++ b/cmd/changelog/main.go @@ -362,7 +362,8 @@ func sinceHashReverseGitLog(hash string) []string { "--reverse", fmt.Sprintf("%s..HEAD", hash)).CombinedOutput() if err != nil { - log.Fatal(err) + // CombinedOutput sends stderr to the 'out' variable + log.Fatalf("%s: %s", err.Error(), string(out)) } return strings.Split(string(out), "\n") }