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

Fix version metadata collection #7972

Merged
merged 4 commits into from
Nov 13, 2020
Merged

Fix version metadata collection #7972

merged 4 commits into from
Nov 13, 2020

Conversation

coignetp
Copy link
Contributor

@coignetp coignetp commented Nov 9, 2020

What does this PR do?

Fix how we submit the nginx version metadata.

Send it only when the configuration enables it
Send the correct nginx version:

We explicitly get the version from the correct endpoint, so it's not override in the metric loop.

Motivation

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

@coignetp coignetp requested a review from a team as a code owner November 9, 2020 15:12
@ghost ghost added the integration/nginx label Nov 9, 2020
@codecov
Copy link

codecov bot commented Nov 9, 2020

@@ -141,10 +152,6 @@ def check(self, instance):
func = funcs[metric_type]
func(name, value, tags)

# for vts and plus versions
Copy link
Contributor

Choose a reason for hiding this comment

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

What's vts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

A nginx module for virtual traffic (https://github.com/vozlt/nginx-module-vts)

@hithwen
Copy link
Contributor

hithwen commented Nov 10, 2020

Send it only when the configuration enables it
Which change is doing this?

Co-authored-by: Julia <611228+hithwen@users.noreply.github.com>
Copy link
Contributor

@ofek ofek left a comment

Choose a reason for hiding this comment

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

💯

@ofek ofek changed the title Fix submit nginx metadata version Fix version metadata collection Nov 13, 2020
@coignetp coignetp merged commit c2add22 into master Nov 13, 2020
@coignetp coignetp deleted the paul/nginx-version branch November 13, 2020 16:15
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.

None yet

4 participants