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.

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

LOG-5761: Add support LogQL pattern line filters #200

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

periklis
Copy link
Contributor

Adds support for Loki 3.x pattern line filters |> and !> such us:

{ log_type="application" }  |> "I <_>"| json

and

{ log_type="application" }  !> "I <_>"| json

Follow up on testing of:

Depends on:

@periklis periklis requested a review from jgbernalp July 10, 2024 11:51
@periklis periklis self-assigned this Jul 10, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 10, 2024

@periklis: This pull request references LOG-5761 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.17.0" version, but no target version was set.

In response to this:

Adds support for Loki 3.x pattern line filters |> and !> such us:

{ log_type="application" }  |> "I <_>"| json

and

{ log_type="application" }  !> "I <_>"| json

Follow up on testing of:

Depends on:

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 10, 2024
@periklis
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 10, 2024
@openshift-ci openshift-ci bot requested review from kyoto and PeterYurkovich July 10, 2024 11:52
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2024
@periklis periklis force-pushed the upgrade-logql-support branch from 9f4e6a3 to ae24916 Compare July 11, 2024 14:16
@periklis periklis force-pushed the upgrade-logql-support branch from ae24916 to 8409458 Compare July 11, 2024 14:54
@periklis
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 11, 2024
@jgbernalp
Copy link
Contributor

/lgtm

@jgbernalp
Copy link
Contributor

/cherry-pick release-6.0

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2024
@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.

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.

Copy link
Contributor

openshift-ci bot commented Jul 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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

Copy link
Contributor

openshift-ci bot commented Jul 11, 2024

@periklis: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 6ee7248 into main Jul 11, 2024
5 checks passed
@openshift-cherrypick-robot

@jgbernalp: new pull request created: #201

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

/cherry-pick release-5.9

@openshift-cherrypick-robot

@jgbernalp: new pull request created: #202

In response to this:

/cherry-pick release-5.9

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

/cherry-pick release-5.8

@openshift-cherrypick-robot

@jgbernalp: new pull request created: #203

In response to this:

/cherry-pick release-5.8

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

/cherry-pick release-5.7

@openshift-cherrypick-robot

@jgbernalp: #200 failed to apply on top of branch "release-5.7":

Applying: LOG-5761: Add support LogQL pattern line filters
Using index info to reconstruct a base tree...
M	web/package-lock.json
M	web/package.json
M	web/src/__tests__/logql-query.spec.ts
M	web/src/logql-query.ts
Falling back to patching base and 3-way merge...
Auto-merging web/src/logql-query.ts
CONFLICT (content): Merge conflict in web/src/logql-query.ts
Auto-merging web/src/__tests__/logql-query.spec.ts
CONFLICT (content): Merge conflict in web/src/__tests__/logql-query.spec.ts
Auto-merging web/package.json
Auto-merging web/package-lock.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-5761: Add support LogQL pattern line filters
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-5.7

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants