osd: add common smartctl output to JSON output

Enables consumers like the dashboard to provide the regular smartctl output to users. Signed-off-by: Patrick Seidensal <[email protected]>
paulreece42 · Sep 18, 2019 · 44068fc · 44068fc
1 parent 14e7347
commit 44068fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
@@ -681,7 +681,7 @@ static int block_device_run_smartctl(const string& devname, int timeout,
     "smartctl",
     "-a",
     //"-x",
-    "--json",
+    "--json=o",
     device.c_str(),
     NULL);
 

diff --git a/sudoers.d/ceph-osd-smartctl b/sudoers.d/ceph-osd-smartctl
@@ -1,4 +1,4 @@
 ## allow ceph-osd (which runs as user ceph) to collect device health metrics
 
-ceph ALL=NOPASSWD: /usr/sbin/smartctl -a --json /dev/*
+ceph ALL=NOPASSWD: /usr/sbin/smartctl -a --json=o /dev/*
 ceph ALL=NOPASSWD: /usr/sbin/nvme * smart-log-add --json /dev/*