Skip to content

Conversation

@avanthakkar
Copy link
Contributor

@avanthakkar avanthakkar commented Feb 22, 2024

Fixes: https://tracker.ceph.com/issues/64536

Result:
Screenshot from 2024-02-24 00-31-36

Prometheus Target:
Screenshot from 2024-02-24 00-34-31

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 x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

@avanthakkar avanthakkar force-pushed the nvmeof-prometheus-endpoint branch from 6fd8cb6 to 8f25eb3 Compare February 23, 2024 19:02
@avanthakkar avanthakkar requested a review from pcuzner February 23, 2024 19:04
@avanthakkar avanthakkar marked this pull request as ready for review February 23, 2024 19:05
@avanthakkar avanthakkar requested a review from a team as a code owner February 23, 2024 19:05
Fixes: https://tracker.ceph.com/issues/64536
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
@avanthakkar avanthakkar force-pushed the nvmeof-prometheus-endpoint branch from 8f25eb3 to 93ec628 Compare February 24, 2024 16:56
@avanthakkar avanthakkar requested a review from adk3798 February 25, 2024 15:11
Copy link
Contributor

@adk3798 adk3798 left a 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
Copy link
Contributor

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.

Copy link
Contributor Author

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?

@adk3798
Copy link
Contributor

adk3798 commented Feb 28, 2024

https://pulpito.ceph.com/adking-2024-02-27_05:08:20-orch:cephadm-wip-adk-testing-2024-02-26-1600-distro-default-smithi/

not going to go over the failures in the regular detail as we're still cleaning up the in cluster log stuff, but it was mostly just things we still need to add to ignorelists and the mds_upgrade_sequence test having issues. Only test that failed due to PRs in the run was https://pulpito.ceph.com/adking-2024-02-27_05:08:20-orch:cephadm-wip-adk-testing-2024-02-26-1600-distro-default-smithi/7574464 so we can't merge the PRs making changes to mgr/nfs but everything else seems to be okay.

Copy link
Contributor

@pcuzner pcuzner left a comment

Choose a reason for hiding this comment

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

LGTM - Thanks!

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.

3 participants