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-4095: fix loki labelKeys that contain slash #2023

Merged
merged 1 commit into from May 31, 2023

Conversation

jcantrill
Copy link
Contributor

Description

This PR:

  • fixes CLF loki label keys to replace slash with underscore

Links

https://issues.redhat.com/browse/LOG-4095

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 25, 2023

@jcantrill: This pull request references LOG-4095 which is a valid jira issue.

In response to this:

Description

This PR:

  • fixes CLF loki label keys to replace slash with underscore

Links

https://issues.redhat.com/browse/LOG-4095

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/test-infra 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 May 25, 2023
@jcantrill jcantrill added release/5.7 and removed jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels May 25, 2023
@jcantrill
Copy link
Contributor Author

/cherrypick master

@openshift-cherrypick-robot

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

In response to this:

/cherrypick master

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/test-infra repository.

@openshift-ci openshift-ci bot requested review from cahartma and vimalk78 May 25, 2023 19:22
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 25, 2023
Copy link
Contributor

@alanconway alanconway left a comment

Choose a reason for hiding this comment

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

/lgtm
your secret is safe with me ;)

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanconway, jcantrill

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:
  • OWNERS [alanconway,jcantrill]

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
Copy link

/retest-required

Remaining retests: 0 against base HEAD 244690b and 2 for PR HEAD db4b652 in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 26, 2023
@jcantrill
Copy link
Contributor Author

/retest

@syedriko
Copy link
Contributor

/test lint

@alanconway
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD db4d5e7 and 2 for PR HEAD d767496 in total

@jcantrill
Copy link
Contributor Author

/override ci/prow/lint

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 30, 2023

@jcantrill: Overrode contexts on behalf of jcantrill: ci/prow/lint

In response to this:

/override ci/prow/lint

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/test-infra repository.

@jcantrill
Copy link
Contributor Author

/test functional

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD bb8bef4 and 1 for PR HEAD d767496 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 91403ff and 0 for PR HEAD d767496 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 31, 2023

@jcantrill: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 0c7f79d into openshift:release-5.7 May 31, 2023
10 checks passed
@openshift-cherrypick-robot

@jcantrill: #2023 failed to apply on top of branch "master":

Applying: LOG-4095: fix loki labelKeys that contain slash
error: patch failed: docs/reference/operator/api.adoc:1036
error: docs/reference/operator/api.adoc: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
M	apis/logging/v1/output_types.go
M	bundle/manifests/logging.openshift.io_clusterlogforwarders.yaml
M	config/crd/bases/logging.openshift.io_clusterlogforwarders.yaml
M	internal/generator/vector/output/loki/loki.go
Patch failed at 0001 LOG-4095: fix loki labelKeys that contain slash
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:

/cherrypick master

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/test-infra 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. lgtm Indicates that a PR is ready to be merged. release/5.7
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants