Skip to content

feat: Fix Ceph version lookup for newer releases of Ceph #21279

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Fix Ceph version lookup for newer releases of Ceph #21279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b5372
feat: Fix Ceph version lookup for newer releases
dancmeyers Sep 5, 2025
0a8adbe
chore: Update changelog
dancmeyers Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ceph/changelog.d/21279.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: Fix Ceph version lookup for newer releases of Ceph
58 changes: 28 additions & 30 deletions ceph/datadog_checks/ceph/ceph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class Ceph(AgentCheck):

def __init__(self, name, init_config, instances):
super(Ceph, self).__init__(name, init_config, instances)
self._octopus = False

def _collect_raw(self, ceph_cmd, ceph_cluster, instance):
use_sudo = _is_affirmative(instance.get('use_sudo', False))
Expand All @@ -58,6 +57,7 @@ def _collect_raw(self, ceph_cmd, ceph_cluster, instance):
ceph_args = '{} --cluster {}'.format(ceph_args, ceph_cluster)

raw = {}
# `mon_status` is only a valid command in versions of Ceph prior to `octopus` (released 2020-03-23)
for cmd in ('mon_status', 'status', 'df detail', 'osd pool stats', 'osd perf', 'health detail', 'osd metadata'):
try:
args = '{} {} -fjson'.format(ceph_args, cmd)
Expand All @@ -73,24 +73,22 @@ def _collect_raw(self, ceph_cmd, ceph_cluster, instance):
mon_map = raw.get('status', {}).get('monmap')
if mon_map is None:
raise RuntimeError("Could not detect Ceph release series")
if 'min_mon_release_name' in mon_map and mon_map['min_mon_release_name'] == 'octopus':
self.log.debug("Detected octopus version of ceph...")
self._octopus = True
else:
self._octopus = False

return raw

def _extract_tags(self, raw, instance):
tags = instance.get('tags', [])
fsid = None
if self._octopus:
try:
fsid = raw['status']['fsid']
elif 'mon_status' in raw:
fsid = raw['mon_status']['monmap']['fsid']
except KeyError:
if 'mon_status' in raw:
fsid = raw['mon_status']['monmap']['fsid']
else:
self.log.debug("Could not find fsid")

if 'mon_status' in raw:
tags.append(self.NAMESPACE + '_mon_state:%s' % raw['mon_status']['state'])
else:
self.log.debug("Could not find fsid")

if fsid is not None:
tags.append(self.NAMESPACE + '_fsid:%s' % fsid)
Expand Down Expand Up @@ -276,29 +274,29 @@ def _extract_metrics(self, raw, tags):
except KeyError:
self.log.debug('Error retrieving pgstatus metrics')

if self._octopus:
try:
num_mons = int(raw['status']['monmap']['num_mons'])
self.gauge(self.NAMESPACE + '.num_mons', num_mons, tags)
except KeyError:
self.log.debug('Error retrieving num_mons metric')
else:
try:
num_mons = len(raw['mon_status']['monmap']['mons'])
self.gauge(self.NAMESPACE + '.num_mons', num_mons, tags)
except KeyError:
self.log.debug('Error retrieving mon_status metrics')
try:
num_mons = int(raw['status']['monmap']['num_mons'])
self.gauge(self.NAMESPACE + '.num_mons', num_mons, tags)
except KeyError:
if 'mon_status' in raw:
try:
num_mons = len(raw['mon_status']['monmap']['mons'])
self.gauge(self.NAMESPACE + '.num_mons', num_mons, tags)
except KeyError:
self.log.debug('Error retrieving mon_status metrics')

try:
num_mons_active = len(raw['mon_status']['quorum'])
self.gauge(self.NAMESPACE + '.num_mons.active', num_mons_active, tags)
except KeyError:
self.log.debug('Error retrieving mon_status quorum metrics')
try:
num_mons_active = len(raw['mon_status']['quorum'])
self.gauge(self.NAMESPACE + '.num_mons.active', num_mons_active, tags)
except KeyError:
self.log.debug('Error retrieving mon_status quorum metrics')
else:
self.log.debug('Error retrieving num_mons metric')

try:
stats = raw['df_detail']['stats']
if not self._octopus:
self._publish(stats, self.gauge, ['total_objects'], tags)
# This will only work on Ceph versions prior to `octopus`, but will catch+return on later versions
self._publish(stats, self.gauge, ['total_objects'], tags)
used = float(stats['total_used_bytes'])
total = float(stats['total_bytes'])
if total > 0:
Expand Down
Loading