Skip to content

Commit 06b3f91

Browse files
JoaoFulatremesRicardo Lüdersrhrmoopenshift-bot
authored
Rebasing stage into master (#715)
* OCPBUGS-2249: fix the schema checking conditional gathering rules (#687) * refactor(workloads_info): improving code reability (#650) This was the first try to improve workloads_info reability. It still have space to improve, but at least it reduces the funlen. * OCPBUGS-2915: Updated info link in insights recommendations (#683) * Updated info link in insights recommendations * updated AdvisorURI in insightsreport * unit tests update * updated code in case of GetClusterVersion() error * small fix in recommendation link * reworking how info link gets cluster ID * update of GetClusterVersion() in case of error * Updated where clusterID is being set, created interface for mocking insightsClient inside unit tests * updated interface name and noop-ed function in unit tests * Use cgroups memory usage data in the archive metadata (#693) * PR template preview and changelog update (#692) * PR template preview and changelog update fixed enhancements not being collected * Enhancements in changelog fix * Update CHANGELOG * tiny changelog readme update * removing backports from changelog * OCPBUGS-3377: fix: storage/ceph path structure (#691) * fix: storage/ceph path structure * fix: archive filename path in docs * docs(storage): adding storage to sample archive * docs(gathered-data): update docs format * docs(gathered-data): update cephcluster * docs(gathered-data): update storagecluster * docs(gathered-data): fix docs * Change of kube-system namespace configmap location according to docs. (#694) * Changed the path of kube system namespace cluster config file to match the documented structure. * Update of sample archive * code updated according to review * Updating ose-insights-operator images to be consistent with ART (#700) Reconciling with https://github.com/openshift/ocp-build-data/tree/61541c1c730569d20db98c885bb07d7ee96e648c/images/ose-insights-operator.yml Co-authored-by: AOS Automation Release Team <[email protected]> * Update OpenShift versions & new Download time field (#705) * OpenShift API update * OpenShift client update * Set the new download time field * Update the CRD as well * chore(golanglint-ci) disabling some linters for *_test.go files (#703) * refactor(scheduler): move GatherSchedulerLogs to its own file (#701) * refactor(webhookconfigurations): remove asset method and split tests (#702) * OCPBUGS-5257 do not get disabled rules (#706) There are two ways to disable a rule. First is to do that for particular cluster. This would work with this original query parameter. Second is to do that for your organization (multiple clusters) and this is not currently supported by the API (and the query parameter). * Update operator name in the OWNERS file (#712) * OCPBUGS-5347: do not periodically update Available clusteroperator co… (#709) * OCPBUGS-5347: do not periodically update Available clusteroperator condition in disabled state * Make sure the conditions time are correct * PR template preview and changelog update (#692) * PR template preview and changelog update fixed enhancements not being collected * Enhancements in changelog fix * Update CHANGELOG * tiny changelog readme update * removing backports from changelog * OCPBUGS-3377: fix: storage/ceph path structure (#691) * fix: storage/ceph path structure * fix: archive filename path in docs * docs(storage): adding storage to sample archive * docs(gathered-data): update docs format * docs(gathered-data): update cephcluster * docs(gathered-data): update storagecluster * docs(gathered-data): fix docs * Change of kube-system namespace configmap location according to docs. (#694) * Changed the path of kube system namespace cluster config file to match the documented structure. * Update of sample archive * code updated according to review * Updating ose-insights-operator images to be consistent with ART (#700) Reconciling with https://github.com/openshift/ocp-build-data/tree/61541c1c730569d20db98c885bb07d7ee96e648c/images/ose-insights-operator.yml Co-authored-by: AOS Automation Release Team <[email protected]> * Update OpenShift versions & new Download time field (#705) * OpenShift API update * OpenShift client update * Set the new download time field * Update the CRD as well * chore(golanglint-ci) disabling some linters for *_test.go files (#703) * refactor(scheduler): move GatherSchedulerLogs to its own file (#701) * refactor(webhookconfigurations): remove asset method and split tests (#702) * OCPBUGS-5257 do not get disabled rules (#706) There are two ways to disable a rule. First is to do that for particular cluster. This would work with this original query parameter. Second is to do that for your organization (multiple clusters) and this is not currently supported by the API (and the query parameter). * Update operator name in the OWNERS file (#712) * OCPBUGS-5347: do not periodically update Available clusteroperator co… (#709) * OCPBUGS-5347: do not periodically update Available clusteroperator condition in disabled state * Make sure the conditions time are correct Co-authored-by: Tomas Remes <[email protected]> Co-authored-by: Ricardo Lüders <[email protected]> Co-authored-by: Richard Hrmo <[email protected]> Co-authored-by: OpenShift Bot <[email protected]> Co-authored-by: AOS Automation Release Team <[email protected]>
1 parent 109d686 commit 06b3f91

File tree

384 files changed

+29379
-8290
lines changed

Some content is hidden

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

384 files changed

+29379
-8290
lines changed

‎.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.19-openshift-4.12
4+
tag: rhel-8-release-golang-1.19-openshift-4.13

‎.github/pull_request_template.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ This PR implements a new data enhancement to...
55
<!-- Select the categories that your PR better fits on -->
66

77
- [ ] Bugfix
8-
- [X] Enhancement
8+
- [X] Data Enhancement
9+
- [ ] Feature
910
- [ ] Backporting
1011
- [ ] Others (CI, Infrastructure, Documentation)
1112

‎.golangci.precommit.yml

+6
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ issues:
7373
- linters:
7474
- lll
7575
source: "^// "
76+
# Excluding *_test.go files
77+
- path: _test\.go
78+
linters:
79+
- funlen
80+
- gosec
81+
- dupl
7682

7783
run:
7884
skip-dirs:

‎.golangci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ issues:
124124
- linters:
125125
- lll
126126
source: "^// "
127+
# Excluding *_test.go files
128+
- path: _test\.go
129+
linters:
130+
- funlen
131+
- gosec
132+
- dupl
127133

128134
run:
129135
timeout: 5m

‎CHANGELOG.md

+56-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,56 @@
11
# Note: This CHANGELOG is only for the changes in insights operator.
2-
Please see OpenShift release notes for official changes\n<!--Latest hash: 24aeaa5b82e3828883faafd351f530abddf484d7-->
2+
Please see OpenShift release notes for official changes\n<!--Latest hash: 76cc46b739c27281db0f7b2a23eb091b2a70f698-->
3+
## 4.13
4+
5+
### Others
6+
- [#693](https://github.com/openshift/insights-operator/pull/693) Use cgroups memory usage data in the archive metadata
7+
8+
## 4.12
9+
10+
### Data Enhancement
11+
- [#685](https://github.com/openshift/insights-operator/pull/685) remove name and namespace from dvo metrics
12+
- [#658](https://github.com/openshift/insights-operator/pull/658) openshift-machine-api warning events gatherer
13+
- [#646](https://github.com/openshift/insights-operator/pull/646) adding insights capability annotations
14+
- [#657](https://github.com/openshift/insights-operator/pull/657) helm upgrade and uninstall metric gathering
15+
- [#654](https://github.com/openshift/insights-operator/pull/654) Gather status of the cephclusters.ceph.rook.io resources
16+
- [#652](https://github.com/openshift/insights-operator/pull/652) Gather & store firing alerts in JSON too
17+
18+
### Bugfix
19+
- [#683](https://github.com/openshift/insights-operator/pull/683) Updated info link in insights recommendations
20+
- [#687](https://github.com/openshift/insights-operator/pull/687) fix the schema checking conditional gathering rules
21+
- [#681](https://github.com/openshift/insights-operator/pull/681) limit the size of logs loaded into memory
22+
- [#679](https://github.com/openshift/insights-operator/pull/679) Update PNCC gatherer
23+
- [#678](https://github.com/openshift/insights-operator/pull/678) do not include disabled rules in the total metric
24+
- [#670](https://github.com/openshift/insights-operator/pull/670) updated conditional gathering rules checking
25+
- [#674](https://github.com/openshift/insights-operator/pull/674) fix alert namespace label
26+
- [#672](https://github.com/openshift/insights-operator/pull/672) Explicitly clear run-level label
27+
- [#664](https://github.com/openshift/insights-operator/pull/664) update the DVO metrics gatherer
28+
- [#667](https://github.com/openshift/insights-operator/pull/667) order conditions by type to limit un-needed updates
29+
30+
### Others
31+
- [#650](https://github.com/openshift/insights-operator/pull/650) reduce cognitive complexity
32+
- [#690](https://github.com/openshift/insights-operator/pull/690) Improve GatherNodeLogs docs
33+
- [#688](https://github.com/openshift/insights-operator/pull/688) Update owners list
34+
- [#680](https://github.com/openshift/insights-operator/pull/680) read DataPolicy attribute from the config API
35+
- [#673](https://github.com/openshift/insights-operator/pull/673) read new config API and disable gatherers based on the API values
36+
- [#669](https://github.com/openshift/insights-operator/pull/669) Implement insights report updating in the insightsoperators.operator.openshift.io resource
37+
- [#671](https://github.com/openshift/insights-operator/pull/671) K8s & OpenShift version updates
38+
- [#666](https://github.com/openshift/insights-operator/pull/666) Introduce insightsoperators.openshift.io CR & implement its gather st…
39+
- [#661](https://github.com/openshift/insights-operator/pull/661) Update K8s & OpenShift versions + vendoring
40+
- [#660](https://github.com/openshift/insights-operator/pull/660) Remove Bugzilla references
41+
- [#656](https://github.com/openshift/insights-operator/pull/656) Extend the conditional gatherer docs
42+
- [#653](https://github.com/openshift/insights-operator/pull/653) Enable Insights recommendations as alerts by default
43+
- [#644](https://github.com/openshift/insights-operator/pull/644) Expose Insights recommendations as alerts
44+
- [#647](https://github.com/openshift/insights-operator/pull/647) Minor gatherer's docs & OWNERS update
45+
- [#645](https://github.com/openshift/insights-operator/pull/645) adding list of insights generated metrics
46+
47+
### Misc
48+
- [#682](https://github.com/openshift/insights-operator/pull/682) Updating ose-insights-operator images to be consistent with ART
49+
- [#649](https://github.com/openshift/insights-operator/pull/649) Updating ose-insights-operator images to be consistent with ART
50+
351
## 4.11
452

5-
### Enhancement
53+
### Data Enhancement
654
- [#625](https://github.com/openshift/insights-operator/pull/625) gather io configuration
755
- [#627](https://github.com/openshift/insights-operator/pull/627) Console helm metrics
856
- [#603](https://github.com/openshift/insights-operator/pull/603) Implement fingerprint for records
@@ -14,6 +62,7 @@
1462
- [#580](https://github.com/openshift/insights-operator/pull/580) Gather cluster images.config.openshift.io resource definition
1563

1664
### Bugfix
65+
- [#641](https://github.com/openshift/insights-operator/pull/641) insightsclient - do not format OCM error message twice
1766
- [#640](https://github.com/openshift/insights-operator/pull/640) Fix permissions for OCS for the storage gatherer
1867
- [#633](https://github.com/openshift/insights-operator/pull/633) make cluster version condition more flexible
1968
- [#620](https://github.com/openshift/insights-operator/pull/620) save conditional gatherer endpoint and firing alerts in the metadata
@@ -27,6 +76,7 @@
2776
- [#578](https://github.com/openshift/insights-operator/pull/578) defer in loop
2877

2978
### Others
79+
- [#642](https://github.com/openshift/insights-operator/pull/642) Update CHANGELOG
3080
- [#639](https://github.com/openshift/insights-operator/pull/639) Do not use the kube-rbac-proxy container
3181
- [#637](https://github.com/openshift/insights-operator/pull/637) Implement Prometheus Collector pattern
3282
- [#626](https://github.com/openshift/insights-operator/pull/626) update of the arch.md document
@@ -60,7 +110,7 @@
60110

61111
## 4.10
62112

63-
### Enhancement
113+
### Data Enhancement
64114
- [#563](https://github.com/openshift/insights-operator/pull/563) conditional log gathers into a single gather and PrometheusOperatorSyncFailed
65115
- [#557](https://github.com/openshift/insights-operator/pull/557) limit number of containers per namespace
66116
- [#558](https://github.com/openshift/insights-operator/pull/558) Collect Info about Openshift scheduler
@@ -123,7 +173,7 @@
123173

124174
## 4.9
125175

126-
### Enhancement
176+
### Data Enhancement
127177
- [#489](https://github.com/openshift/insights-operator/pull/489) Gather installed PSP names
128178
- [#487](https://github.com/openshift/insights-operator/pull/487) Conditional data gathering validation & refactoring
129179
- [#476](https://github.com/openshift/insights-operator/pull/476) Gather Openshift Logging Stack Data
@@ -168,7 +218,7 @@
168218

169219
## 4.8
170220

171-
### Enhancement
221+
### Data Enhancement
172222
- [#438](https://github.com/openshift/insights-operator/pull/438) Gather MachineAutoscalers definitions
173223
- [#442](https://github.com/openshift/insights-operator/pull/442) include full timestamps in the logs
174224
- [#432](https://github.com/openshift/insights-operator/pull/432) Replace gather-job image without FQDN
@@ -260,7 +310,7 @@
260310

261311
## 4.7
262312

263-
### Enhancement
313+
### Data Enhancement
264314
- [#327](https://github.com/openshift/insights-operator/pull/327) collect invalid resource name error from logs
265315
- [#316](https://github.com/openshift/insights-operator/pull/316) Gather list of OLM operator names and versions & minor clean up
266316
- [#319](https://github.com/openshift/insights-operator/pull/319) Gather PersistentVolume definition (if any) used in Image registry st…

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder
22
WORKDIR /go/src/github.com/openshift/insights-operator
33
COPY . .
44
RUN make build
55

6-
FROM registry.ci.openshift.org/ocp/4.12:base
6+
FROM registry.ci.openshift.org/ocp/4.13:base
77
COPY --from=builder /go/src/github.com/openshift/insights-operator/bin/insights-operator /usr/bin/
88
COPY config/pod.yaml /etc/insights-operator/server.yaml
99
COPY manifests /manifests

‎OWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ reviewers:
99
- ncaak
1010
- rhrmo
1111

12-
component: "Insights operator"
12+
component: "Insights Operator"

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ the provided time frame.
230230
```shell script
231231
go run cmd/changelog/main.go 2021-01-10 2021-01-20
232232
```
233+
In case of changelog not being generated properly, try switching to release branch you want to generate.
233234

234235
# Reported data
235236

‎cmd/changelog/main.go

+39-31
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ import (
1717

1818
// norevive
1919
const (
20-
BUGFIX = "Bugfix"
21-
ENHANCEMENT = "Enhancement"
22-
OTHER = "Others"
23-
BACKPORTING = "Backporting"
24-
MISC = "Misc"
20+
BUGFIX = "Bugfix"
21+
DATAENHANCEMENT = "Data Enhancement"
22+
ENHANCEMENT = "Enhancement"
23+
FEATURE = "Feature"
24+
OTHER = "Others"
25+
MISC = "Misc"
2526
)
2627

2728
var (
@@ -32,19 +33,21 @@ var (
3233
releaseRegexp = regexp.MustCompile(`(release-\d\.\d+)`)
3334
latestHashRegexp = regexp.MustCompile(`<!--Latest hash: (.+)-->`)
3435

35-
versionSectionRegExp = regexp.MustCompile(`^(\d.\d+)`)
36-
backportsSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, BACKPORTING))
37-
enhancementSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, ENHANCEMENT))
38-
bugfixSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, BUGFIX))
39-
otherSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, OTHER))
40-
miscSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, MISC))
36+
versionSectionRegExp = regexp.MustCompile(`^(\d.\d+)`)
37+
dataEnhancementSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, DATAENHANCEMENT))
38+
enhancementSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, ENHANCEMENT))
39+
featureSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, FEATURE))
40+
bugfixSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, BUGFIX))
41+
otherSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, OTHER))
42+
miscSectionRegExp = regexp.MustCompile(fmt.Sprintf(`### %s\n((.+\n)+)`, MISC))
4143

4244
// PR categories
4345
categories = map[string]*regexp.Regexp{
44-
BUGFIX: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, BUGFIX)),
45-
ENHANCEMENT: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, ENHANCEMENT)),
46-
OTHER: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, OTHER)),
47-
BACKPORTING: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, BACKPORTING)),
46+
BUGFIX: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, BUGFIX)),
47+
DATAENHANCEMENT: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, DATAENHANCEMENT)),
48+
ENHANCEMENT: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, ENHANCEMENT)),
49+
FEATURE: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, FEATURE)),
50+
OTHER: regexp.MustCompile(fmt.Sprintf(`- \[[xX]\] %s`, OTHER)),
4851
}
4952

5053
gitHubToken = ""
@@ -118,11 +121,11 @@ func main() {
118121
}
119122

120123
type MarkdownReleaseBlock struct {
121-
backports string
122-
enhancements string
123-
bugfixes string
124-
others string
125-
misc string
124+
dataEnhancements string
125+
features string
126+
bugfixes string
127+
others string
128+
misc string
126129
}
127130

128131
func readCHANGELOG() map[ReleaseVersion]MarkdownReleaseBlock {
@@ -142,11 +145,14 @@ func readCHANGELOG() map[ReleaseVersion]MarkdownReleaseBlock {
142145
if match := versionSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
143146
version = stringToReleaseVersion(match[1])
144147
}
145-
if match := backportsSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
146-
releaseBlock.backports = match[1]
148+
if match := dataEnhancementSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
149+
releaseBlock.dataEnhancements = match[1]
147150
}
148151
if match := enhancementSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
149-
releaseBlock.enhancements = match[1]
152+
releaseBlock.dataEnhancements = match[1]
153+
}
154+
if match := featureSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
155+
releaseBlock.features = match[1]
150156
}
151157
if match := bugfixSectionRegExp.FindStringSubmatch(versionSection); len(match) > 0 {
152158
releaseBlock.bugfixes = match[1]
@@ -177,11 +183,14 @@ func updateToMarkdownReleaseBlock(releaseBlocks map[ReleaseVersion]MarkdownRelea
177183
} else if ch.category == OTHER {
178184
tmp.others = ch.toMarkdown() + tmp.others
179185
releaseBlocks[ch.release] = tmp
186+
} else if ch.category == DATAENHANCEMENT {
187+
tmp.dataEnhancements = ch.toMarkdown() + tmp.dataEnhancements
188+
releaseBlocks[ch.release] = tmp
180189
} else if ch.category == ENHANCEMENT {
181-
tmp.enhancements = ch.toMarkdown() + tmp.enhancements
190+
tmp.dataEnhancements = ch.toMarkdown() + tmp.dataEnhancements
182191
releaseBlocks[ch.release] = tmp
183-
} else if ch.category == BACKPORTING {
184-
tmp.backports = ch.toMarkdown() + tmp.backports
192+
} else if ch.category == FEATURE {
193+
tmp.features = ch.toMarkdown() + tmp.features
185194
releaseBlocks[ch.release] = tmp
186195
} else {
187196
tmp.misc = ch.toMarkdown() + tmp.misc
@@ -206,11 +215,11 @@ func createCHANGELOG(releaseBlocks map[ReleaseVersion]MarkdownReleaseBlock) {
206215
for _, release := range releases {
207216
_, _ = file.WriteString(fmt.Sprintf("## %d.%d\n\n", release.Major, release.Minor))
208217

209-
backports := releaseBlocks[release].backports
210-
createReleaseBlock(file, backports, BACKPORTING)
218+
dataEnhancements := releaseBlocks[release].dataEnhancements
219+
createReleaseBlock(file, dataEnhancements, DATAENHANCEMENT)
211220

212-
enhancements := releaseBlocks[release].enhancements
213-
createReleaseBlock(file, enhancements, ENHANCEMENT)
221+
features := releaseBlocks[release].features
222+
createReleaseBlock(file, features, FEATURE)
214223

215224
bugfixes := releaseBlocks[release].bugfixes
216225
createReleaseBlock(file, bugfixes, BUGFIX)
@@ -285,7 +294,6 @@ func getPullRequestFromGitHub(id string) *Change {
285294
for c := range categories {
286295
cats = append(cats, c)
287296
}
288-
sort.Strings(cats) // Hacky way to make sure that Backports get matched first.
289297
for _, cat := range cats {
290298
if match := categories[cat].FindStringSubmatch(ch.description); len(match) > 0 {
291299
ch.category = cat

‎config/pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ endpoint: https://console.redhat.com/api/ingress/v1/upload
88
conditionalGathererEndpoint: https://console.redhat.com/api/gathering/gathering_rules
99
impersonate: system:serviceaccount:openshift-insights:gather
1010
pull_report:
11-
endpoint: https://console.redhat.com/api/insights-results-aggregator/v2/cluster/%s/reports?get_disabled=true
11+
endpoint: https://console.redhat.com/api/insights-results-aggregator/v2/cluster/%s/reports
1212
delay: "60s"
1313
timeout: "3000s"
1414
min_retry: "30s"

0 commit comments

Comments
 (0)