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.

Sign up for GitHub

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

Jump to bottom

bug 1537857. Fix retrieving prometheus metrics #920

Merged
merged 1 commit into from Feb 6, 2018
Merged

bug 1537857. Fix retrieving prometheus metrics #920

merged 1 commit into from Feb 6, 2018

Conversation

jcantrill
Copy link
Contributor

@jcantrill jcantrill commented Jan 26, 2018 •
edited

@jcantrill jcantrill added component/elasticsearch do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. backport/3.7 release/3.9 labels Jan 26, 2018
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 26, 2018
@jcantrill jcantrill added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jan 26, 2018
ewolinetz
ewolinetz reviewed Jan 26, 2018
View reviewed changes
elasticsearch/Dockerfile.centos7 Outdated
@@ -26,7 +26,7 @@ ENV ES_CLOUD_K8S_VER=2.4.4_01 \
ARG ES_CLOUD_K8S_VER=2.4.4_01
ARG OSE_ES_VER=2.4.4.20
ARG ES_CLOUD_K8S_URL
ARG OSE_ES_URL
ARG OSE_ES_URL=https://github.com/jcantrill/openshift-elasticsearch-plugin/releases/download/2.4.4.21-snapshot/openshift-elasticsearch-plugin-2.4.4.21-SNAPSHOT.zip
Copy link
Contributor

Choose a reason for hiding this comment

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

this will change once the plugin is released, correct?

Copy link
Contributor Author

@jcantrill jcantrill Jan 26, 2018 •
edited

Choose a reason for hiding this comment

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

yes. Thus the reason i made it do not merge. Need approval and publishing of the actual zip

@jcantrill jcantrill added backport/3.8 kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 1, 2018
@richm
Copy link
Contributor

richm commented Feb 1, 2018

I suggest added a test for the prometheus authentication to the access_control.sh test - make sure that the prometheus user has correct access, and make sure no other user has access to prometheus.

@ewolinetz
Copy link
Contributor

ewolinetz commented Feb 5, 2018 •
edited

approving based on discussion with @jcantrill on irc:

ewolinetz, the changes resolve the issue... but im working on a bdd based test.. not bash                                           
but i dont think it will be in by wed                                                                                              
locally my bdd test confirms the fix

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 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 6c5c6a5 into openshift:master Feb 6, 2018
@jcantrill jcantrill deleted the 1537857_fix_prometheus branch February 6, 2018 13:51
@jcantrill
Copy link
Contributor Author

/cherrypick release-3.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 6, 2018
Closed
@openshift-cherrypick-robot
Copy link

@jcantrill: new pull request created: #927

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.

@jcantrill
Copy link
Contributor Author

/cherrypick release-3.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 6, 2018
Merged
@openshift-cherrypick-robot
Copy link

@jcantrill: new pull request created: #928

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-merge-robot added a commit that referenced this pull request Feb 8, 2018
@openshift-merge-robot
Merge pull request #928 from openshift-cherrypick-robot/cherry-pick-9…
eedea03 
…20-to-release-3.7

Automatic merge from submit-queue.

[release-3.7] bug 1537857. Fix retrieving prometheus metrics

This is an automated cherry-pick of #920

/assign jcantrill
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewolinetz ewolinetz ewolinetz left review comments

@richm richm Awaiting requested review from richm

Assignees

@ewolinetz ewolinetz

Labels
backport/completed backport/3.7 backport/3.8 component/elasticsearch kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release/3.9 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jcantrill @richm @ewolinetz @openshift-merge-robot @openshift-cherrypick-robot @openshift-ci-robot