Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve e2e logs #1435

Merged
merged 8 commits into from
May 22, 2024
Merged

Improve e2e logs #1435

merged 8 commits into from
May 22, 2024

Conversation

thibaultmg
Copy link
Contributor

No description provided.

Copy link

openshift-ci bot commented May 14, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
@thibaultmg
Copy link
Contributor Author

/test test-e2e

Copy link
Contributor

@philipgough philipgough left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link

openshift-ci bot commented May 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: philipgough, thibaultmg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@thibaultmg
Copy link
Contributor Author

I am waiting to make e2e pass and check the logging results before merging. Yesterday e2e did not work...

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
@openshift-ci openshift-ci bot removed the lgtm label May 22, 2024
Copy link

openshift-ci bot commented May 22, 2024

New changes are detected. LGTM label has been removed.

Copy link

sonarcloud bot commented May 22, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@thibaultmg thibaultmg merged commit f13d35f into stolostron:main May 22, 2024
13 of 14 checks passed
@thibaultmg thibaultmg deleted the improve_e2e_logs branch May 22, 2024 09:57
coleenquadros pushed a commit to coleenquadros/multicluster-observability-operator that referenced this pull request May 23, 2024
* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
jacobbaungard pushed a commit to jacobbaungard/multicluster-observability-operator that referenced this pull request May 30, 2024
* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
jacobbaungard pushed a commit to jacobbaungard/multicluster-observability-operator that referenced this pull request May 30, 2024
* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
jacobbaungard pushed a commit to jacobbaungard/multicluster-observability-operator that referenced this pull request May 30, 2024
* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
jacobbaungard pushed a commit to jacobbaungard/multicluster-observability-operator that referenced this pull request May 30, 2024
* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
jacobbaungard added a commit that referenced this pull request May 30, 2024
* Tests: Improve getting snapshots from Quay

- Get the version from `COMPONENT_VERSION` instead of hardcoding it in
  two places
- Improve the regex so it explicitly sets the z version number to 1-2
  digits avoiding mistakes in matches (i.e 2.10.* could match 2.2.10)
- Don't differentiate between how we get snapshot between release and
  other branches (just always get the latest snapshot we can find for
  the release we want)
- Since Quay returns multiple pages of tags, we might get unlikly and
  not get any tags for the release we actually want. Therefore we add
  quay side filtering as well to ensure we only get snapshots for a
  specific release, and also ensure we get the most number of results we
  can (100 is the max)

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>

* Tests: Always use CI generated images

Prior to this commit, we would try to determine which components have
changed, and only if a component changed, we would use the CI generated
image. Otherwise we would try to get the latest snapshot from Quay.

However, the way we get the latest snapshot from Quay is not guranteed
to give us the very latest version (it will give us probably a resonably
recent one), so to make sure we always test the latest change, just use
all the images built using CI.

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>

* E2e tests (#1400)

* fix e2e tests

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* [ACM-10511] Update hub collector with the whole obs addon spec (#1386)

* Update hub collector with the whole obs addon spec

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fetch OA spec from MCO on collector if in the hub

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Refactor bool far assignment

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove unnecessary global variable

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

---------

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* [ACM-10511] Improve robustness when listing MCO CRs from the collector (#1390)

* Improve robustness when listing MCO CRs from the collector

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix assignment

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove unused vars

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

---------

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* [ACM-6112] Fix invalid uwl service monitors for hypershift hosted etcd and api-server (#1352)

* Fix hypershift servicemon

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fixes

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* avoid reconcile failure if hypershift smon fail

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add cluster labels relabelling

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add missing copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix empty newline

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove top level logs

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* clean test CRDs

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix error message

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* clean logs in openshift pkg

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix merge

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* fix e2e

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* typo

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* typo

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* allow prometheus to be installed in kind

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* annotate version

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* ensure controller ref is not set for hub prometheus resources  in kind

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor for hub

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor for hub

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor for hub

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* chnage resource limits

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* endpointmetrics: Do not add genereted resources as volumes on ocp3 clusters (#1384)

Signed-off-by: Philip Gough <philip.p.gough@gmail.com>

* [ACM-10511] Update hub collector with the whole obs addon spec (#1386)

* Update hub collector with the whole obs addon spec

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fetch OA spec from MCO on collector if in the hub

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Refactor bool far assignment

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove unnecessary global variable

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

---------

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* [ACM-10511] Improve robustness when listing MCO CRs from the collector (#1390)

* Improve robustness when listing MCO CRs from the collector

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix assignment

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove unused vars

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

---------

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* [ACM-6112] Fix invalid uwl service monitors for hypershift hosted etcd and api-server (#1352)

* Fix hypershift servicemon

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fixes

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* avoid reconcile failure if hypershift smon fail

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add cluster labels relabelling

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add missing copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix empty newline

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove top level logs

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* clean test CRDs

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix error message

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* clean logs in openshift pkg

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix merge

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* typo

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* typo

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* allow prometheus to be installed in kind

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor for hub

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* remove duplicates

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* remove duplicates

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* ensure hubclient scheme is correct

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* update prometheus role

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* resource limit

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* resource

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* Add resource for init-config-reloader in prom

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* test build

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* trigger build

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* chnage namespace in rolebinding

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* correct namespace in role and rolebindings

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* revert for e2e

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* refactor

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* test SA reconcile

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* remove file

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* comments

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* remove logs

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

---------

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
Co-authored-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Philip Gough <philip.p.gough@gmail.com>

* Tests: Don't check remote_write_requests on spokes  (#1433)

* Tests: Don't check remote_write_requests on spokes

Previously the test "Should have acm_remote_write_requests_total
metrics with correct labels/value" looked for the metric for both the
hub cluster and any spokes. However, the spokes isn't supposed to expose
this metric, hence the test would always fail if any managed clusters
were added to the test setup.

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>

* Examples: remove `cleanupInterval`

This configuration option no longer exists, so removing from example
files used in tests. Avoids the following warnings:

```
W0513 07:54:14.364463   11051 warnings.go:70] unknown field "spec.advanced.retentionConfig.cleanupInterval"
```

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>

---------

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>

* Improve e2e logs (#1435)

* change test ContainManagedClusterMetric

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* improve e2e test logging

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add kube_debug file

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* remove unused functions

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* reduce log lines

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* log statefulsets and daemonsets

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* add copyright

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

* fix pods list, add cm and secrets list

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>

---------

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Co-authored-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com>
Co-authored-by: Philip Gough <philip.p.gough@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants