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

Fix .kibana regex #958

Merged
merged 1 commit into from Feb 20, 2018

Conversation

josefkarasek
Copy link

I was trying to fix ' --exclude .searchguard* --exclude .kibana*' and did not realize that the kibana index is named just .kibana and the regex .kibana* worked only by accident.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 15, 2018
@josefkarasek
Copy link
Author

/cherrypick release-3.7

@openshift-cherrypick-robot

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

In response to this:

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

@josefkarasek
Copy link
Author

/cherrypick release-3.8

@openshift-cherrypick-robot

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

In response to this:

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

@@ -95,7 +95,7 @@ def default_index(self):
+ ' --older-than ' + str(count) \
+ ' --time-unit ' + unit \
+ ' --exclude ' + shellquote('^' + re.escape('.searchguard.') + '.*$') \
+ ' --exclude ' + shellquote('^' + re.escape('.kibana.') + '.*$')
+ ' --exclude ' + shellquote('^' + re.escape('.kibana') + '$')
Copy link
Contributor

Choose a reason for hiding this comment

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

actually... there can be any number of kibana indexes depending on the mode so it should really be '.kibana.*'

@josefkarasek
Copy link
Author

@richm @jcantrill what do you think now?

Copy link
Contributor

@richm richm left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2018
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-cherrypick-robot

@josefkarasek: new pull request created: #963

In response to this:

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

@openshift-cherrypick-robot

@josefkarasek: #958 failed to apply on top of branch "release-3.8":
```Applying: Fix .kibana regex
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A curator/src/curator_cmd.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): curator/src/curator_cmd.py deleted in HEAD and modified in Fix `.kibana` regex. Version Fix `.kibana` regex of curator/src/curator_cmd.py left in tree.
Patch failed at 0001 Fix `.kibana` regex


<details>

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/958#issuecomment-365897518):

>/cherrypick release-3.8


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/devel/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.
</details>

openshift-merge-robot added a commit that referenced this pull request Feb 21, 2018
…58-to-release-3.7

Automatic merge from submit-queue.

[release-3.7] Fix `.kibana` regex

This is an automated cherry-pick of #958

/assign josefkarasek
@richm
Copy link
Contributor

richm commented Mar 1, 2018

/cherrypick release-3.6

@openshift-cherrypick-robot

@richm: #958 failed to apply on top of branch "release-3.6":
```Applying: Fix .kibana regex
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A curator/src/curator_cmd.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): curator/src/curator_cmd.py deleted in HEAD and modified in Fix `.kibana` regex. Version Fix `.kibana` regex of curator/src/curator_cmd.py left in tree.
Patch failed at 0001 Fix `.kibana` regex


<details>

In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/958#issuecomment-369721901):

>/cherrypick release-3.6


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/devel/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.
</details>

richm added a commit to richm/origin-aggregated-logging that referenced this pull request Mar 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants