Skip to content

fix: increase federate scrape timeout - #347

Merged
johannes94 merged 2 commits into
masterfrom
jmalsma/increase-federate-scrape-timeout
Jul 23, 2026
Merged

fix: increase federate scrape timeout#347
johannes94 merged 2 commits into
masterfrom
jmalsma/increase-federate-scrape-timeout

Conversation

@johannes94

Copy link
Copy Markdown
Contributor

Increasing the timeout and scrape interval for federation due to: https://redhat.pagerduty.com/incidents/Q1SDD3SR0UAG71

@johannes94
johannes94 requested a review from a team as a code owner July 23, 2026 03:19
@johannes94
johannes94 requested review from ebensh and removed request for a team July 23, 2026 03:19
@coderabbitai

coderabbitai Bot commented Jul 23, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: be89a834-7272-4c03-8e3b-049e15a1066d

📥 Commits

Reviewing files that changed from the base of the PR and between 1497afb and 5d01866.

📒 Files selected for processing (2)
  • resources/prometheus/federation-config-base.yaml
  • resources/prometheus/federation-config.yaml

📝 Walkthrough

Summary by CodeRabbit

  • Improvements
    • Increased the Prometheus federation scrape timeout for the openshift-monitoring-federation job from 60s to 90s, helping ensure longer-running metric collection completes successfully.

Walkthrough

Prometheus federation configurations now use a 90-second scrape timeout instead of 60 seconds.

Changes

Prometheus federation timing

Layer / File(s) Summary
Update federation scrape timeout
resources/prometheus/federation-config-base.yaml, resources/prometheus/federation-config.yaml
Both federation configurations increase scrape_timeout from 60s to 90s.

Estimated code review effort: 1 (Trivial) | ~2 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately summarizes the main change: increasing the federation scrape timeout.
Description check ✅ Passed The description is related to the change and explains the timeout adjustment in the federation config.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch jmalsma/increase-federate-scrape-timeout

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 Checkov (3.3.8)
resources/prometheus/federation-config-base.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'

resources/prometheus/federation-config.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

- openshift-monitoring
scrape_interval: 120s
scrape_timeout: 60s
scrape_interval: 170s

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.

Is there a reason to use the "magic" number 170s over a "round" number like 3 minutes? Seeing something like "170s" always makes me think there's some reason for that specific value, but then I'd expect a comment explaining why that value was chosen. (Similar though not exactly the point: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#res-magic)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I was not sure about the behavior if the interval is smaller / equal to the timeout. I wanted 150 for the timeout because my local curl against that endpoint took 2m15s during that incident so that 150s/2.5m should be covered. Then I just added a little bit for the interval.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

As discussed in slack I changed it to be 120s for the interval and 90s for the timeout.

@ebensh ebensh left a comment

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 had no problem with making it longer, I just wanted it to be 180s instead of 170s :) Up to you.

@johannes94
johannes94 merged commit b281035 into master Jul 23, 2026
2 checks passed
@johannes94
johannes94 deleted the jmalsma/increase-federate-scrape-timeout branch July 23, 2026 09:53
@johannes94
johannes94 restored the jmalsma/increase-federate-scrape-timeout branch July 23, 2026 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants