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 Feature: Stats contain /nginx status info #12

Merged
merged 1 commit into from
Dec 12, 2018

Conversation

jthurman42
Copy link
Contributor

Proposed changes

Include Nginx status information (/api/<version>/nginx endpoint) when calling GetStats. This metadata contains valuable metadata about the running instance.

This also modified test.conf to allow API writes as required by the test framework. The existing limit_except config did not work testing on an AWS instance of nginx/1.15.2 (nginx-plus-r16-p1)

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

@pleshakov pleshakov added the enhancement Pull requests for new features/feature enhancements label Nov 30, 2018
@pleshakov
Copy link
Contributor

@jthurman42 thx for the PR. we'll review it shortly

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.

Apologies for the delayed review. Please see my suggestions.

This also modified test.conf to allow API writes as required by the test framework. The existing limit_except config did not work testing on an AWS instance of nginx/1.15.2 (nginx-plus-r16-p1)

Are you running NGINX Plus on a VM, not in a container, right?

client/nginx.go Outdated Show resolved Hide resolved
client/nginx.go Outdated Show resolved Hide resolved
client/nginx.go Outdated Show resolved Hide resolved
client/nginx.go Outdated Show resolved Hide resolved
docker/test.conf Show resolved Hide resolved
docker/test.conf Outdated Show resolved Hide resolved
tests/client_test.go Outdated Show resolved Hide resolved
client/nginx.go Outdated Show resolved Hide resolved
client/nginx.go Outdated Show resolved Hide resolved
@jthurman42
Copy link
Contributor Author

Yes, I've been testing with the Nginx Plus AWS AMI.

Updated from Status to NginxInfo and committed the other requested 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.

Thanks!

@pleshakov
Copy link
Contributor

@jthurman42 thanks! please squash your commits into a single one and we'll merge it.

@jthurman42
Copy link
Contributor Author

Commits squashed. Thank you!

@pleshakov pleshakov merged commit 0eecde4 into nginxinc:master Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Pull requests for new features/feature enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants