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.

Sign up for GitHub

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

Jump to bottom

pra: add test for prometheus federation #2169

Merged
7 commits merged into from
Nov 19, 2024
Merged

pra: add test for prometheus federation #2169

7 commits merged into from
Nov 19, 2024

Conversation

francoisferrand
Copy link
Contributor

@francoisferrand francoisferrand commented Nov 15, 2024 •
edited
Loading

  • Add artesca-root-ca-issuer cluster issuer
  • Test that federated metrics are retrieved
  • Set federated prometheus name
  • Fix prometheus config
  • Fix zkop install to support sha1
  • gha: Move kafka dump to folder
  • gha: Merge alerts workflow

Issue: ZENKO-4876

@francoisferrand
Add artesca-root-ca-issuer cluster issuer
9678f8c 
Issue: ZENKO-4876
@francoisferrand
Test that federated metrics are retrieved
7476936 
Issue: ZENKO-4876
@francoisferrand
Set federated prometheus name
8970422 
This is needed to avoid conflict with internal prometheus service,
since we are running in the same cluster.

Issue: ZENKO-4876
@francoisferrand
Fix prometheus config
9826e4c 
ServiceMonitor were not scrapped.

Issue: ZENKO-4876
@francoisferrand
Fix zkop install to support sha1
f9d647f 
When an SHA1 is used which is not the tip of the branch, it is not
available after a `git clone` (which fetches only commits reachable
from current branches).

This causes issues if a build is started while the component branch with
the commit has been rewritten (rebase...)

To overcome this, the safe way is to explicitely fetch the commit: which
works for any commit (branch, tag, sha1).

Issue: ZENKO-4876
@francoisferrand
Move kafka dump to folder
33171e8 
Issue: ZENKO-4876
@francoisferrand
Merge alerts workflow
a4cb9ae 
No reason to keep separate, and it helps avoid a github bug/limitation
when creating a check: and the

Issue: ZENKO-4876
@bert-e
Copy link
Contributor

bert-e commented Nov 15, 2024

Hello francoisferrand,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Nov 15, 2024
@bert-e
Copy link
Contributor

bert-e commented Nov 15, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

KillianG
KillianG reviewed Nov 18, 2024
View reviewed changes
tests/ctst/steps/pra.ts
baseURL: '/api/v1',
});

for (;;) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Timing out, does not give proper logs actually, it would be great to have a timeout in the code and to properly log that prom does not respond or that metrics are still empty after 70k ms

Copy link
Contributor Author

@francoisferrand francoisferrand Nov 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

i don't think we should litter the code with "manual" timeout: if the logs are not correct, it should be improved in the framework instead (so that we benefit from it everywhere)

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the point was more: the test already manually set a 70s timeout, yet we are never calling this.world.logger.debug to log what we got when calling prometheus, so in case of timeout, we have 0 clue to understand the problem

Copy link
Contributor Author

@francoisferrand francoisferrand Nov 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

if we receive anything, we will bail out... so if we timeout, it means we did not receive anything : and the information to troubleshoot will be deep inside prometheus, not in the api call we make here, unfortunately...

so not sure what could be logged...

Copy link
Contributor

Choose a reason for hiding this comment

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

It might be a personal opinion, but I don't think an infinite loop is any better than a "manual" timeout

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is not an infinite loop : we are expected to exit eventually, as prometheus should return a metric!

Copy link
Contributor

Choose a reason for hiding this comment

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

so not sure what could be logged...

If we can get some connectivity info then logging will be useful - if we expect nothing, the current approach is good enough...

williamlardier
williamlardier approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@williamlardier williamlardier left a comment

Choose a reason for hiding this comment

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

lgtm beyond Killian's comment

@francoisferrand francoisferrand mentioned this pull request Nov 18, 2024
Merged
@bert-e bert-e closed this pull request by merging all changes into development/2.6 in 6cd4998 Nov 19, 2024
@bert-e bert-e deleted the improvement/ZENKO-4876 branch November 19, 2024 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamlardier williamlardier williamlardier approved these changes

@KillianG KillianG KillianG approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@francoisferrand @bert-e @KillianG @williamlardier