[release-4.18] OCPBUGS-61706: chore: compute highestTimestamp at queryManager level

[machine424]

parial cherry-pick of prometheus#17065 to make it easier to backport to older versions.

the new metric is "prometheus_remote_storage_queue_highest_timestamp_seconds"

[openshift-ci-robot]

@machine424: This pull request references Jira Issue OCPBUGS-61706, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.18.z) matches configured target version for branch (4.18.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-61486 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-61486 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
• bug has dependents

Requesting review from QA contact:
/cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

parial cherry-pick of prometheus#17065 to make it easier to backport to older versions.

the new metric is "prometheus_remote_storage_queue_highest_timestamp_seconds"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[machine424]

/jira backport release-4.17 release-4.16

[openshift-ci-robot]

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17 release-4.16

Details

In response to this:

/jira backport release-4.17 release-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

Details

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17 release-4.16

In response to this:

/jira backport release-4.17 release-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[machine424]

/label backport-risk-assessed
/verified by ci/prow/common-test

[openshift-ci-robot]

@machine424: This PR has been marked as verified by ci/prow/common-test.

Details

In response to this:

/label backport-risk-assessed
/verified by ci/prow/common-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

@machine424: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-e2e-aws-ovn	eff2ebb	link	false	/test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[juzhao]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: juzhao, machine424

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:

• OWNERS [machine424]

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

[openshift-ci-robot]

@machine424: Jira Issue OCPBUGS-61706: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

• openshift/cluster-monitoring-operator#2669 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-61706 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

parial cherry-pick of prometheus#17065 to make it easier to backport to older versions.

the new metric is "prometheus_remote_storage_queue_highest_timestamp_seconds"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@openshift-ci-robot: #267 failed to apply on top of branch "release-4.17":

Applying: chore: compute highestTimestamp at queryManager level
Using index info to reconstruct a base tree...
M	cmd/prometheus/main_test.go
M	storage/remote/queue_manager.go
M	storage/remote/queue_manager_test.go
M	storage/remote/write.go
Falling back to patching base and 3-way merge...
Auto-merging storage/remote/write.go
Auto-merging storage/remote/queue_manager_test.go
CONFLICT (content): Merge conflict in storage/remote/queue_manager_test.go
Auto-merging storage/remote/queue_manager.go
CONFLICT (content): Merge conflict in storage/remote/queue_manager.go
Auto-merging cmd/prometheus/main_test.go
CONFLICT (content): Merge conflict in cmd/prometheus/main_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore: compute highestTimestamp at queryManager level

Details

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17 release-4.16

In response to this:

/jira backport release-4.17 release-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: golang-github-prometheus-prometheus
This PR has been included in build golang-github-prometheus-prometheus-container-v4.18.0-202509160906.p0.ga85013a.assembly.stream.el9.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.18.0-0.nightly-2025-09-17-044824