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

Force to specify not empty secret for metrics endpoint #13884

Conversation

legionus
Copy link
Contributor

@mfojtik looks good ?

@@ -125,6 +125,9 @@ func Execute(configFile io.Reader) {

// Registry extensions endpoint provides prometheus metrics.
if extraConfig.Metrics.Enabled {
if len(extraConfig.Metrics.Secret) == 0 {
context.GetLogger(app).Fatalf("secret token for metrics endpoint cannot be empty")
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe specify the path like: the openshift.metrics.secret field cannot be empty when metrics are enabled

@legionus legionus force-pushed the dockerregistry-metrics-not-empty-secret branch from 53b6cf9 to 1aae28d Compare April 25, 2017 14:09
@legionus
Copy link
Contributor Author

@mfojtik done

@mfojtik
Copy link
Contributor

mfojtik commented Apr 25, 2017

LGTM [merge]

@smarterclayton FYI

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@mfojtik
Copy link
Contributor

mfojtik commented Apr 28, 2017

@legionus can you please rebase and then tag this again for merge? (1.6 rebase landed...)

Signed-off-by: Gladkov Alexey <agladkov@redhat.com>
@legionus legionus force-pushed the dockerregistry-metrics-not-empty-secret branch from 1aae28d to 5914c45 Compare April 28, 2017 09:59
@legionus
Copy link
Contributor Author

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 5914c45

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1022/) (Base Commit: 87d6cb8)

@legionus
Copy link
Contributor Author

[merge]

1 similar comment
@mfojtik
Copy link
Contributor

mfojtik commented May 10, 2017

[merge]

@legionus
Copy link
Contributor Author

[merge] #14122

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 5914c45

@openshift-bot
Copy link
Contributor

openshift-bot commented May 10, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/597/) (Base Commit: 31caa0d) (Image: devenv-rhel7_6220)

@openshift-bot openshift-bot merged commit 9c1b123 into openshift:master May 10, 2017
@smarterclayton
Copy link
Contributor

smarterclayton commented May 12, 2017

Can you change oadm registry to set prometheus.io/username=METRICS_USER and prometheus.io/password=METRICS_PASSWORD and prometheus.io/scrape=true on the service at creation time? I will be doing that for the router so that ootb the annotations will get set and the router can be scraped.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants