-
Notifications
You must be signed in to change notification settings - Fork 6.3k
cephadm/nvmeof: scrape nvmeof prometheus endpoint #55710
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
Conversation
6fd8cb6 to
8f25eb3
Compare
Fixes: https://tracker.ceph.com/issues/64536 Signed-off-by: Avan Thakkar <athakkar@redhat.com>
8f25eb3 to
93ec628
Compare
adk3798
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code itself seems good to me beyond one nitpick I left a comment on. If this is working in your testing (which it seems to be from the screenshots) this is okay with me as long as it causes no regressions in a teuthology run.
| enable_spdk_discovery_controller = {{ spec.enable_spdk_discovery_controller }} | ||
| enable_prometheus_exporter = True | ||
| prometheus_exporter_ssl = False | ||
| prometheus_port = 10008 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
while currently we don't allow this to be changed, for future proofing reasons, we might want to have this be a variable passed to the context for generating this file rather than just a hardcoded value. Something like (in prepare_create for the NvmeofService class)
context = {
'spec': spec,
'name': name,
'addr': host_ip,
'port': spec.port,
'log_level': 'WARN',
'rpc_socket': '/var/tmp/spdk.sock',
'transport_tcp_options': transport_tcp_options,
'rados_id': rados_id,
'prometheus_port' : self.PROMETHEUS_PORT <--- THIS LINE
}
and then we can populate the conf with that value here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good to me, probably we can create a tracker for configuring this & also I think adding ssl support?
|
not going to go over the failures in the regular detail as we're still cleaning up the |
pcuzner
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM - Thanks!
Fixes: https://tracker.ceph.com/issues/64536
Result:

Prometheus Target:

Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e