openshift / origin-aggregated-logging

139 stars 230 forks source link

Bug 1933978: Update OD security dependency to resolve kibana index migration issue #2106

Closed jcantrill closed 3 years ago

jcantrill commented 3 years ago

Description

This PR

/cc @ewolinetz @periklis @vimalk78

/cherrypick release-5.0 /cherrypick release-5.1

Links

openshift-ci-robot commented 3 years ago

@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.

1 validation(s) were run on this bug * bug target release (4.6.z) matches configured target release for branch (4.6.z)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2106): >Bug 1933978: Update OD security dependency to resolve kibana index migration issue Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
jcantrill commented 3 years ago

LGTM. Can you point to the build on PNC to verify that the build numbers 00007 and 00006 match?

ES: http://orch.psi.redhat.com/pnc-web/#/projects/698/build-configs/5267/builds/91431 security: http://orch.psi.redhat.com/pnc-web/#/projects/964/build-configs/5356/builds/91444

vimalk78 commented 3 years ago

/lgtm

openshift-ci-robot commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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](https://github.com/openshift/origin-aggregated-logging/blob/release-4.6/OWNERS)~~ [jcantrill] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jcantrill commented 3 years ago

/bugzilla refresh

openshift-ci-robot commented 3 years ago

@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.

1 validation(s) were run on this bug * bug target release (4.6.z) matches configured target release for branch (4.6.z)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2106#issuecomment-824349790): >/bugzilla refresh Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
jcantrill commented 3 years ago

/cherrypick release-5.0 /cherrypick release-5.1 /cherrypick master

openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2106 failed to apply on top of branch "release-5.0":

Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M   elasticsearch/Dockerfile.rhel8
M   elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
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](https://github.com/openshift/origin-aggregated-logging/pull/2106#issuecomment-877252453): >/cherrypick release-5.0 >/cherrypick release-5.1 >/cherrypick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 3 years ago

@vimalk78: #2106 failed to apply on top of branch "release-5.0":

Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M   elasticsearch/Dockerfile.rhel8
M   elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
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](https://github.com/openshift/origin-aggregated-logging/pull/2106#issuecomment-877253119): >/cherry-pick release-5.0 >/cherry-pick release-5.1 >/cherry-pick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.