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

Run Prometheus exporter inside IC Binary #504

Merged
merged 1 commit into from
Mar 12, 2019
Merged

Run Prometheus exporter inside IC Binary #504

merged 1 commit into from
Mar 12, 2019

Conversation

Rulox
Copy link
Contributor

@Rulox Rulox commented Mar 8, 2019

Proposed changes

Instead of using the NGINX Prometheus exporter in a container inside IC pod, use it as a library and expose NGINX and NGINX Plus metrics in a Prometheus format from the same binary as the IC is running.

This PR Also updates protobuf library needed to work well with the Prometheus client for Golang

Checklist

  • 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

@Rulox Rulox self-assigned this Mar 8, 2019
pleshakov
pleshakov suggested changes Mar 8, 2019
View reviewed changes
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.

thanks for the PR! please see my suggestions

cmd/nginx-ingress/main.go Outdated Show resolved Hide resolved
deployments/daemon-set/nginx-ingress.yaml Outdated Show resolved Hide resolved
deployments/daemon-set/nginx-plus-ingress.yaml Outdated Show resolved Hide resolved
deployments/helm-chart/values.yaml Outdated Show resolved Hide resolved
deployments/daemon-set/nginx-ingress-with-prometheus.yaml Show resolved Hide resolved
@Rulox Rulox requested a review from pleshakov March 11, 2019 14:32
Dean-Coakley
Dean-Coakley approved these changes Mar 11, 2019
View reviewed changes
Copy link
Contributor

@Dean-Coakley Dean-Coakley left a comment

Choose a reason for hiding this comment

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

Added one optional suggestion. Looks great! 👍

deployments/daemon-set/nginx-plus-ingress.yaml Show resolved Hide resolved
pleshakov
pleshakov suggested changes Mar 12, 2019
View reviewed changes
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.

A few small but necessary suggestions

cmd/nginx-ingress/main_test.go Outdated Show resolved Hide resolved
docs/cli-arguments.md Show resolved Hide resolved
deployments/helm-chart/templates/controller-daemonset.yaml Show resolved Hide resolved
deployments/helm-chart/templates/controller-deployment.yaml Show resolved Hide resolved
docs/installation.md Show resolved Hide resolved
docs/installation.md Outdated Show resolved Hide resolved
@Rulox Rulox requested a review from pleshakov March 12, 2019 15:45
pleshakov
pleshakov approved these changes Mar 12, 2019
View reviewed changes
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.

👍

@Rulox Rulox merged commit 4d5b9c3 into master Mar 12, 2019
@Rulox Rulox deleted the prometheus branch March 12, 2019 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pleshakov pleshakov pleshakov approved these changes

@Dean-Coakley Dean-Coakley Dean-Coakley approved these changes

Assignees

@Rulox Rulox

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Rulox @pleshakov @Dean-Coakley