common: Add metadata with only Ceph version number and release

This prevents consumers from this data to have to fully parse and split the 'ceph_version' string which is prone to errors. ceph_version_short only contains the version number (maj, min, patch) and ceph_release the codename, eg, luminous. Signed-off-by: Wido den Hollander <[email protected]>
Kioob · Mar 28, 2018 · 2a745f5 · 2a745f5
1 parent dd03c5e
commit 2a745f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/common/util.cc b/src/common/util.cc
@@ -196,6 +196,8 @@ void collect_sys_info(map<string, string> *m, CephContext *cct)
 {
   // version
   (*m)["ceph_version"] = pretty_version_to_str();
+  (*m)["ceph_version_short"] = ceph_version_to_str();
+  (*m)["ceph_release"] = ceph_release_to_str();
 
   // kernel info
   struct utsname u;

diff --git a/src/common/version.cc b/src/common/version.cc
@@ -28,6 +28,11 @@ const char *ceph_version_to_str(void)
   return CEPH_GIT_NICE_VER;
 }
 
+const char *ceph_release_to_str(void)
+{
+  return ceph_release_name(CEPH_RELEASE);
+}
+
 const char *git_version_to_str(void)
 {
   return STRINGIFY(CEPH_GIT_VER);

diff --git a/src/common/version.h b/src/common/version.h
@@ -20,6 +20,9 @@
 // Return a string describing the Ceph version
 const char *ceph_version_to_str(void);
 
+// Return a string with the Ceph release
+const char *ceph_release_to_str(void);
+
 // Return a string describing the git version
 const char *git_version_to_str(void);