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

[kong] target proxy with ServiceMonitor selector #112

Merged
merged 1 commit into from
Apr 27, 2020

Conversation

artburkart
Copy link
Contributor

This commit limits the ServiceMonitor, so it only targets the proxy
Service resource instead of both the proxy and the admin Service.

What this PR does / why we need it:

When we set serviceMonitor.enabled to true, a ServiceMonitor resource is created, which targets both the admin Service and the proxy Service. The metrics are identical, which means they're doubled in in Prometheus. This change makes it so the ServiceMonitor only targets the proxy Service.

Special notes for your reviewer:

I didn't know which label we'd think would be appropriate, and since naming is hard, I opted to throw a strawman label into this PR, so we could discuss what we want here.

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • PR is based off the current tip of the next branch and targets next, not master
  • New or modified sections of values.yaml are documented in the README.md
  • Title of the PR and commit headers start with chart name (e.g. [kong])

Copy link
Contributor

@rainest rainest left a comment

Choose a reason for hiding this comment

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

Same merge conflict mentioned in #110 (comment)

Could you also use a descriptive lablel? e.g.

enable-metrics: true

versus

foobar-label: enables-metrics

@artburkart artburkart closed this Apr 11, 2020
@artburkart
Copy link
Contributor Author

Reopening per comment here: #113 (comment)

@artburkart artburkart reopened this Apr 27, 2020
This commit limits the ServiceMonitor, so it only targets the proxy
Service resource instead of both the proxy and the admin Service.
@artburkart artburkart force-pushed the servicemonitor-targets-kong-proxy branch from c66a121 to 54231d0 Compare April 27, 2020 11:52
@rainest rainest merged commit cac2d95 into Kong:next Apr 27, 2020
@artburkart artburkart deleted the servicemonitor-targets-kong-proxy branch May 27, 2020 07:51
rainest pushed a commit that referenced this pull request May 27, 2020
This commit limits the ServiceMonitor, so it only targets the proxy
Service resource instead of both the proxy and the admin Service.
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

3 participants