Skip to content

Conversation

@jgbernalp
Copy link
Contributor

Screenshot 2026-01-30 at 12 12 35 Screenshot 2026-01-30 at 12 12 46

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 30, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 30, 2026

@jgbernalp: This pull request references OU-1211 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Screenshot 2026-01-30 at 12 12 35 Screenshot 2026-01-30 at 12 12 46

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2026
@jgbernalp
Copy link
Contributor Author

/cherry-pick release-6.0

@openshift-cherrypick-robot

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

Details

In response to this:

/cherry-pick release-6.0

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.

@jgbernalp
Copy link
Contributor Author

/cherry-pick release-6.1

@openshift-cherrypick-robot

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

Details

In response to this:

/cherry-pick release-6.1

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.

@anpingli
Copy link
Contributor

anpingli commented Feb 2, 2026

@jgbernalp

  • The timezone selector is always present, regardless of whether showTimezoneSelector is set in the configmap/logging

  • The start-time and endtime are alway same in different timezone. epoch time as “timezone-neutral absolute time”, it should be created base on timezone. and we need to remove tz=XXX from URL.

For example:
image

URL: tz=Asia%2FHong_Kong&start=1769967000000&end=1769968800000&tenant=application
loki-query-frontend: level=info ts=2026-02-02T11:21:27.514420579Z caller=roundtrip.go:378 org_id=application msg="executing query" type=range query="{ openshift_log_type="application" }" start=2026-02-02T05:30:00Z end=2026-02-02T06:00:00Z start_delta=5h51m27.514416273s end_delta=5h21m27.51441646s length=30m0s step=7000 query_hash=1414632682

it should be &start=1769967000000&end=1769968800000&tenant=application


image

URL: tz=UTC&start=1769967000000&end=1769968800000&tenant=application

loki-query-frontend: level=info ts=2026-02-02T11:21:51.10223494Z caller=roundtrip.go:378 org_id=application msg="executing query" type=range query="{ openshift_log_type="application" }" start=2026-02-02T05:30:00Z end=2026-02-02T06:00:00Z start_delta=5h51m51.102232343s end_delta=5h21m51.102232499s length=30m0s step=7000 query_hash=1414632682

it should be &start=1769995800000&end=1769997600000&tenant=application

@jgbernalp
Copy link
Contributor Author

@anpingli just fixed the "timezone selector is always present" issue. Please try again

Regarding the start and end times, they should be the same regardless the timezone. The timezone parameter is only used for converting the UTC values returned from loki to the selected user timezone.

@jgbernalp jgbernalp force-pushed the add-timezone-dropdown-and-config branch from d07647b to 0f4e8f3 Compare February 2, 2026 12:19
@anpingli
Copy link
Contributor

anpingli commented Feb 2, 2026

@anpingli just fixed the "timezone selector is always present" issue. Please try again

Regarding the start and end times, they should be the same regardless the timezone. The timezone parameter is only used for converting the UTC values returned from loki to the selected user timezone.

The start and end times should consider the timezone.
For example:
case 1)  an incident is reported in 13:50 - 14:00 in India,  the SRE want to search the logs from 13:50 - 14:00.
           Here 13:50 - 14:00 should be Indian Standard Time (IST) UTC+5:30
case 2)  an incident is reported in 13:50 - 14:00  in London, the SRE want to search the logs from 13:50 - 14:00.
           Here 13:50 - 14:00 should London time, UTC
in case 1 & 2, 13:50, 14:00 should be different time.  The SRE selects the correct time zone, and the UI converts the time for that time zone into epoch time to search the logs. 

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
@jgbernalp jgbernalp force-pushed the add-timezone-dropdown-and-config branch from 0f4e8f3 to 1f7a6d4 Compare February 2, 2026 22:31
@jgbernalp
Copy link
Contributor Author

@anpingli the custom time range selection is now timezone aware. Please check again

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 2, 2026

@jgbernalp: all tests passed!

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.

@anpingli
Copy link
Contributor

anpingli commented Feb 3, 2026

/lgtm

@anpingli
Copy link
Contributor

anpingli commented Feb 3, 2026

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Feb 3, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2026

@jgbernalp: This pull request references OU-1211 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Screenshot 2026-01-30 at 12 12 35 Screenshot 2026-01-30 at 12 12 46

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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 3, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anpingli, jgbernalp

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-merge-bot openshift-merge-bot bot merged commit a30b184 into openshift:main Feb 3, 2026
6 checks passed
@openshift-cherrypick-robot

@jgbernalp: new pull request created: #342

Details

In response to this:

/cherry-pick release-6.1

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-cherrypick-robot

@jgbernalp: #341 failed to apply on top of branch "release-6.0":

Applying: add timezone selector in ui and config
Using index info to reconstruct a base tree...
M	README.md
M	pkg/server/server.go
M	web/locales/en/plugin__logging-view-plugin.json
M	web/src/components/filters/search-select.tsx
M	web/src/components/logs-histogram.tsx
M	web/src/components/logs-metrics.tsx
M	web/src/components/logs-table.tsx
M	web/src/components/time-range-dropdown.tsx
M	web/src/components/time-range-select-modal.tsx
M	web/src/hooks/useURLState.ts
M	web/src/logs.types.ts
M	web/src/pages/logs-detail-page.tsx
M	web/src/pages/logs-dev-page.tsx
M	web/src/pages/logs-page.tsx
M	web/src/test-ids.ts
Falling back to patching base and 3-way merge...
Auto-merging web/src/test-ids.ts
Auto-merging web/src/pages/logs-page.tsx
CONFLICT (content): Merge conflict in web/src/pages/logs-page.tsx
Auto-merging web/src/pages/logs-dev-page.tsx
CONFLICT (content): Merge conflict in web/src/pages/logs-dev-page.tsx
Auto-merging web/src/pages/logs-detail-page.tsx
CONFLICT (content): Merge conflict in web/src/pages/logs-detail-page.tsx
Auto-merging web/src/logs.types.ts
CONFLICT (content): Merge conflict in web/src/logs.types.ts
Auto-merging web/src/hooks/useURLState.ts
CONFLICT (content): Merge conflict in web/src/hooks/useURLState.ts
Auto-merging web/src/components/time-range-select-modal.tsx
Auto-merging web/src/components/time-range-dropdown.tsx
Auto-merging web/src/components/logs-table.tsx
CONFLICT (content): Merge conflict in web/src/components/logs-table.tsx
Auto-merging web/src/components/logs-metrics.tsx
CONFLICT (content): Merge conflict in web/src/components/logs-metrics.tsx
Auto-merging web/src/components/logs-histogram.tsx
CONFLICT (content): Merge conflict in web/src/components/logs-histogram.tsx
Auto-merging web/src/components/filters/search-select.tsx
CONFLICT (content): Merge conflict in web/src/components/filters/search-select.tsx
Auto-merging web/locales/en/plugin__logging-view-plugin.json
Auto-merging pkg/server/server.go
CONFLICT (content): Merge conflict in pkg/server/server.go
Auto-merging README.md
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 set advice.mergeConflict false"
Patch failed at 0001 add timezone selector in ui and config

Details

In response to this:

/cherry-pick release-6.0

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants