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

//services/nginz/third_party/nginx-module-vts: update #2476

Merged
merged 5 commits into from
Jun 14, 2022
Merged

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 13, 2022

This provides a prometheus endpoint out of the box, so we can access it
at /vts/status/format/prometheus.

It also moves the nginz{-tcp,-http} service into a merged nginz service in the nginz helm chart, and adds servicemonitor support to it, so metrics can be scraped.

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • If this PR changes development workflow or dependencies, they have been A) automated and B) documented under docs/developer/. All efforts have been taken to minimize development setup breakage or slowdown for co-workers.
  • If HTTP endpoint paths have been added or renamed, or feature configs have changed, the endpoint / config-flag checklist (see Wire-employee only backend wiki page) has been followed.
  • If a cassandra schema migration has been added, I ran make git-add-cassandra-schema to update the cassandra schema documentation.
  • changelog.d contains the following bits of information (details):
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.
    • If new config options introduced: added usage description under docs/reference/config-options.md
    • If new config options introduced: recommended measures to be taken by on-premise instance operators.
    • If a cassandra schema migration is backwards incompatible (see also these docs), measures to be taken by on-premise instance operators are explained.
    • If a data migration (not schema migration) introduced: measures to be taken by on-premise instance operators.
    • If public end-points have been changed or added: does nginz need un upgrade?
    • If internal end-points have been added or changed: which services have to be deployed in a specific order?

This provides a prometheus endpoint out of the box, so we can access it
at /vts/status/format/prometheus.
@flokli flokli temporarily deployed to cachix June 13, 2022 17:28 Inactive
@flokli flokli marked this pull request as ready for review June 13, 2022 17:28
Make this actually only one service, exposing two ports.

This will allow selecting nginz for metrics scraping on the right port,
without the need for additional labels to distinguish `nginz-tcp` from
`nginz-http`.
@flokli flokli temporarily deployed to cachix June 13, 2022 17:56 Inactive
With the move to a single Service for nginz, exposing two ports, we can
actually properly target the http port of nginz for metrics collection.

As with the other services, the service monitor creation is opt-in.
Let nginx-ingress-services simply target the nginz service created by
the nginz chart.
@flokli flokli temporarily deployed to cachix June 14, 2022 09:40 Inactive
@flokli flokli temporarily deployed to cachix June 14, 2022 10:01 Inactive
@flokli flokli merged commit 4c22cca into develop Jun 14, 2022
@flokli flokli deleted the bump-nginz-vts branch June 14, 2022 10:02
flokli added a commit that referenced this pull request Jun 14, 2022
Use the same set of labels for the nginz service that we add to other
services.

The ServiceMonitor resource wants app=nginz, which right now is missing
- so the ServiceMonitor doesn't select anything currently.

Follow-up of #2476.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants