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

Add support for prometheus exporter for NGINX #346

Merged
merged 3 commits into from
Aug 28, 2018

Conversation

Dean-Coakley
Copy link
Contributor

@Dean-Coakley Dean-Coakley commented Aug 22, 2018

Proposed changes

  • Added oss prometheus deployment manifest
  • Added oss prometheus daemonset manifest
  • Updated Helm chart to support OSS prometheus exporter
  • Updated comparison document
  • Updated install document

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@Dean-Coakley Dean-Coakley added enhancement Pull requests for new features/feature enhancements documentation Pull requests/issues for documentation labels Aug 22, 2018
@Dean-Coakley Dean-Coakley self-assigned this Aug 22, 2018
@Dean-Coakley Dean-Coakley force-pushed the oss-prometheus-exporter branch 3 times, most recently from b0a6c68 to 5b9b8c8 Compare August 27, 2018 08:39
Copy link
Contributor

@isaachawley isaachawley left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Please see my suggestions.

Additionally:

  • Change Deploys a Prometheus exporter container within the Ingress controller pod. Requires NGINX Plus. controller.nginxplus must be set to true. to Deploys a Prometheus exporter container within the Ingress controller pod.
  • Rebase against the master

{{ else }}
- http://127.0.0.1:8080/stub_status
{{- end }}
- -nginx.scrape-uri
Copy link
Contributor

Choose a reason for hiding this comment

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

please don't change the order of the arguments

Copy link
Contributor

Choose a reason for hiding this comment

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

example of a problem:

        args:
          - -web.listen-address
          - :9113
          - http://127.0.0.1:8080/stub_status
          - -nginx.scrape-uri

- -nginx.scrape-uri
{{- if .Values.controller.nginxplus }}
Copy link
Contributor

Choose a reason for hiding this comment

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

don't change the other of the arguments. an example of the problem is below:

        args:
          - -web.listen-address
          - :9113
          - -nginx.scrape-uri
          - -nginx.plus
          - http://127.0.0.1:8080/api

* Added oss prometheus deployment manifest
* Added oss prometheus daemonset manifest
* Updated comparison document
* Updated install document
- http://127.0.0.1:8080/api
{{ else }}
- http://127.0.0.1:8080/stub_status
{{- end }}
- -nginx.scrape-uri

This comment was marked as resolved.

* Changed prometheus.create note to reflect that nginxplus is no longer
required
* Reverted helm chart argument order change
@Dean-Coakley Dean-Coakley merged commit d2c4f38 into master Aug 28, 2018
@Dean-Coakley Dean-Coakley deleted the oss-prometheus-exporter branch August 28, 2018 17:10
isserrano pushed a commit that referenced this pull request Sep 5, 2018
* Added OSS Prometheus deployment manifest
* Added OSS Prometheus daemonset manifest
* Updated comparison document
* Updated install document
* Helm: Add OSS Prometheus exporter support
* Changed prometheus.create note to reflect that nginxplus is no longer
required
@pleshakov pleshakov changed the title Add support for oss prometheus exporter Add support for prometheus exporter for NGINX Nov 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Pull requests/issues for documentation enhancement Pull requests for new features/feature enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants