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

Disable Prometheus scraping for components without /metrics #339

Merged
merged 4 commits into from Jan 4, 2019

Conversation

Projects
None yet
2 participants
@stefanprodan
Copy link
Member

stefanprodan commented Dec 23, 2018

Description

  • disable Prometheus scraping for NATS, worker and faas-idler
  • fix faas-idler node selector and toleration indentation
  • set worker env vars for basic auth and NATS address

Fix #325

Motivation and Context

  • I have raised an issue to propose this change (required)

How Has This Been Tested?

Tested on GKE with Weave Cloud

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have signed-off my commits with git commit -s
  • I have added tests to cover my changes.
  • All new and existing tests passed.

stefanprodan added some commits Dec 23, 2018

Disable Prometheus scraping for components without /metrics
- tested on GKE with Weave Cloud

Signed-off-by: stefanprodan <stefan.prodan@gmail.com>
Fix faas-idler node selector and toleration indentation
Signed-off-by: stefanprodan <stefan.prodan@gmail.com>
Fix worker basic auth env var
- the basic auth was hardcoded

Signed-off-by: stefanprodan <stefan.prodan@gmail.com>
Add NATS address env var to worker
- prep for external NATS cluster support

Signed-off-by: stefanprodan <stefan.prodan@gmail.com>
@alexellis
Copy link
Member

alexellis left a comment

LGTM

@alexellis alexellis merged commit a8bc188 into openfaas:master Jan 4, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment