common: move ceph_version up into collect_sys_info

...so that we get this piece of metadata from every
service uniformly.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/common/util.cc b/src/common/util.cc
index 124b9b9c39e073a8c97ab510c3bdfa7b356a645d..f330e42fa7faf773adb680b08eee03c2c18946c1 100644 (file)
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -20,6 +20,7 @@
 #include "common/debug.h"
 #include "common/errno.h"
 #include "common/strtol.h"
+#include "common/version.h"
 
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
@@ -213,6 +214,9 @@ static void distro_detect(map<string, string> *m, CephContext *cct)
 
 void collect_sys_info(map<string, string> *m, CephContext *cct)
 {
+  // version
+  (*m)["ceph_version"] = pretty_version_to_str();
+
   // kernel info
   struct utsname u;
   int r = uname(&u);

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bc18041bf69e1addd346b8c31d6375b1fba47b59..9e00c34ca57226db54a96e04cb02195a61e19817 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4976,8 +4976,6 @@ void OSD::_send_boot()
 
 void OSD::_collect_metadata(map<string,string> *pm)
 {
-  (*pm)["ceph_version"] = pretty_version_to_str();
-
   // config info
   (*pm)["osd_data"] = dev_path;
   (*pm)["osd_journal"] = journal_path;