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

bug 1537857. Additional logging proxy metrics fixes #7294

Merged
merged 2 commits into from Feb 27, 2018

Conversation

jcantrill
Copy link
Contributor

@jcantrill jcantrill commented Feb 26, 2018

This PR provides additional fixes to:

  • set the password correctly by properly decoding
  • modifying the default prometheus namespace if one isnt provided

ref: https://bugzilla.redhat.com/show_bug.cgi?id=1537857

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2018
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 26, 2018
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2018
@ewolinetz
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 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-merge-robot openshift-merge-robot merged commit f123167 into openshift:master Feb 27, 2018
@openshift-ci-robot
Copy link

@jcantrill: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/system-containers 387f63b link /test system-containers
ci/openshift-jenkins/logging 387f63b link /test logging
ci/openshift-jenkins/extended_conformance_install_crio 387f63b link /test crio

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@jcantrill jcantrill deleted the 1537857_part2 branch February 27, 2018 14:13
@jcantrill
Copy link
Contributor Author

/cherrypick release-3.7

@openshift-cherrypick-robot

@jcantrill: #7294 failed to apply on top of branch "release-3.7":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/openshift_logging_elasticsearch/tasks/main.yaml
A	roles/openshift_logging_elasticsearch/templates/2.x/es.j2
A	roles/openshift_logging_elasticsearch/templates/5.x/es.j2
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_logging_elasticsearch/templates/es.j2
CONFLICT (content): Merge conflict in roles/openshift_logging_elasticsearch/templates/es.j2
CONFLICT (modify/delete): roles/openshift_logging_elasticsearch/templates/5.x/es.j2 deleted in HEAD and modified in bug 1537857. Additional logging proxy metrics fixes. Version bug 1537857. Additional logging proxy metrics fixes of roles/openshift_logging_elasticsearch/templates/5.x/es.j2 left in tree.
Auto-merging roles/openshift_logging_elasticsearch/tasks/main.yaml
Patch failed at 0001 bug 1537857. Additional logging proxy metrics fixes

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects_3.7 lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants