Skip to content

🌱 Add prometheus to e2e workflow - #1928

Merged
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
dtfranz:prometheus-e2e
Jun 24, 2025
Merged

🌱 Add prometheus to e2e workflow#1928
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
dtfranz:prometheus-e2e

Conversation

@dtfranz

@dtfranzdtfranz commented Apr 17, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Closes#1902 and #1903

Adds prometheus to the test-e2e Makefile target, which stands up a barebones prometheus scraper to gather metrics from the operator-controller and catalogd pods during the e2e test run. When finished, the prometheus server is queried for a raw output of the metrics and stores it in ARTIFACTS_PATH/metrics.out. These metrics will be analyzed in a later PR.

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

@dtfranz
dtfranz requested a review from a team as a code ownerApril 17, 2025 16:24
@netlify

netlifyBot commented Apr 17, 2025•
edited
Loading

Copy link
Copy Markdown

✅ Deploy Preview for olmv1 ready!

NameLink
🔨 Latest commit90c6b46
🔍 Latest deploy loghttps://app.netlify.com/projects/olmv1/deploys/684ad8958c8328000810ef5e
😎 Deploy Previewhttps://deploy-preview-1928--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@codecov

codecovBot commented Apr 17, 2025•
edited
Loading

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.26%. Comparing base (44de6f2) to head (90c6b46).
Report is 20 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #1928 +/- ##
==========================================
+ Coverage 69.21% 69.26% +0.04% 
==========================================
Files 79 79 Lines 7037 7051 +14 ==========================================
+ Hits 4871 4884 +13 
Misses 1885 1885 - Partials 281 282 +1
FlagCoverage Δ
e2e42.94% <ø> (-0.12%)⬇️
unit60.17% <ø> (+0.10%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@tmshort

tmshort commented Apr 18, 2025

Copy link
Copy Markdown
Contributor

So, this adds a new e2e that isn't run downstream? There's no workflow to run it in upstream CI?

tmshort
tmshort reviewed Apr 18, 2025
View reviewed changes
Comment threadMakefile Outdated
@dtfranz

dtfranz commented Apr 21, 2025

Copy link
Copy Markdown
ContributorAuthor

So, this adds a new e2e that isn't run downstream? There's no workflow to run it in upstream CI?

Yes - it currently only adds prometheus to the environment when you run the new e2e target, so I've kept the workflow the same for now. If you'd prefer I'm happy to make that change here - it doesn't add much overhead to the e2e at all.

@dtfranz
dtfranzforce-pushed the prometheus-e2e branch 2 times, most recently from 6c32ce6 to b51c814CompareApril 25, 2025 01:50
joelanford
joelanford reviewed Apr 25, 2025
View reviewed changes
Comment threadMakefile Outdated
@dtfranz
dtfranzforce-pushed the prometheus-e2e branch 2 times, most recently from 2daa74b to e8b18c9CompareJune 2, 2025 07:40
@dtfranz
dtfranzforce-pushed the prometheus-e2e branch 3 times, most recently from bb99737 to b7e65a7CompareJune 11, 2025 04:18
camilamacedo86
camilamacedo86 reviewed Jun 11, 2025
View reviewed changes
Comment threadMakefile Outdated
camilamacedo86
camilamacedo86 reviewed Jun 12, 2025
View reviewed changes
Comment threadhack/test/setup-monitoring.sh
egress:
- {} # Allows all egress traffic for metrics requests
ingress:
- {} # Allows us to query prometheus

@camilamacedo86camilamacedo86Jun 12, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I understand that we need this NP to allow us to get data from Prometheus integrate it with Grafana and etc. So, I am OK with 👍

camilamacedo86
camilamacedo86 previously approved these changes Jun 12, 2025
View reviewed changes

@camilamacedo86camilamacedo86 left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@dtfranz

Thank you for the nice work. 🎉

I understand that we will need to improve it in the long run and that is just teh first step for we have the targets and quick start.

So, I just added a nit: #1928 (comment) but otherwise I am OK with it. LGTM

We might also want to have a second look and help from @tmshort too

@openshift-ciopenshift-ciBot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 12, 2025
@camilamacedo86
camilamacedo86 dismissed their stale reviewJune 12, 2025 08:05

failing on the e2e tests

@openshift-ciopenshift-ciBot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2025
@dtfranz

dtfranz commented Jun 12, 2025

Copy link
Copy Markdown
ContributorAuthor

I reran it and it passed, seems a test flaked 🫤

@dtfranz
Prometheus Metrics
90c6b46
Adds prometheus to the test-e2e Makefile target, which stands up a barebones prometheus scraper to gather metrics from the operator-controller and catalogd pods during the e2e test run. When finished, the prometheus server is queried for a raw output of the metrics and stores it in metrics.out. These metrics will be analyzed in a later PR.
Signed-off-by: Daniel Franz <dfranz@redhat.com>
@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2025
@camilamacedo86

camilamacedo86 commented Jun 23, 2025

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2025
@tmshort

tmshort commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ciBot commented Jun 24, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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

The pull request process is described here

Details 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

@openshift-ciopenshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2025
@openshift-merge-bot
openshift-merge-botBot merged commit 302d2df into operator-framework:mainJun 24, 2025
@dtfranzdtfranz mentioned this pull request Jul 8, 2025
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joelanfordjoelanfordjoelanford left review comments
@tmshorttmshorttmshort left review comments
@camilamacedo86camilamacedo86camilamacedo86 left review comments
@bentitobentitoAwaiting requested review from bentito
@gavinmbellgavinmbellAwaiting requested review from gavinmbell

Assignees

@camilamacedo86camilamacedo86

Labels

approvedIndicates a PR has been approved by an approver from all required OWNERS files.lgtmIndicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Install Prometheus on e2e cluster

5 participants

@dtfranz@tmshort@camilamacedo86@joelanford@bentito