Following changes are made

1. Increased the String length for distro, version and os_desc columns in osds_info table
2. Corrected version information extraction in client/ceph-brag
3. Removed the version_id json entry when version list returned for UUID
4. Updated the README to reflect point 3

Signed-off-by: Babu Shanmugam <anbu@enovance.com>

diff --git a/README.md b/README.md
index 16ba7a4d2729e0dbe0b2d73f770df11d9ac7e6ba..1cbc11b4a7d2d92e5cdc04c1346f0c0a76270035 100644 (file)
--- a/README.md
+++ b/README.md
@@ -139,8 +139,7 @@ Outputs - On success application/json of the following format is returned
     [
       {
         "version_number": 1, 
-        "version_date": "2014-02-10 10:17:56.283499", 
-        "version_id": 10
+        "version_date": "2014-02-10 10:17:56.283499"
       },
       ...
     ]

diff --git a/client/ceph-brag b/client/ceph-brag
index c6b8a9fddf4c18238fae454c99e13f5933e2283e..838189942c58ac417001f84cdea3310e409b07ee 100755 (executable)
--- a/client/ceph-brag
+++ b/client/ceph-brag
@@ -149,7 +149,10 @@ def get_sysinfo(max_osds):
 
       jmeta = json.loads(o)
 
-      meta['ceph_version'] = jmeta['ceph_version']
+      version = jmeta['ceph_version'].split()
+      meta['ceph_version'] = version[2]
+      if (len(version) > 3):
+        meta['ceph_version'] += version[3]
 
       os_info['os'] = jmeta['os']
       os_info['version'] = jmeta['kernel_version']
@@ -294,6 +297,7 @@ def publish():
   req = requests.put(url, data=data)
   if req.status_code is not 201:
     print >> sys.stderr, "Failed to publish, server responded with code " + str(req.status_code)
+    print >> sys.stderr, req.text
     return 1
 
   return 0

diff --git a/server/ceph_brag/json.py b/server/ceph_brag/json.py
index 5981e3c3497bff794ba80334577eb79e23b3972b..856ea4eaf8946e42251798ef0b41ced5d6cfed79 100644 (file)
--- a/server/ceph_brag/json.py
+++ b/server/ceph_brag/json.py
@@ -4,7 +4,6 @@ from ceph_brag.model import db
 @jsonify.register(db.version_info)
 def jsonify_version(vi):
     return dict(
-            version_id=vi.index,
             version_number=vi.version_number,
             version_date=str(vi.version_date)
             )

diff --git a/server/ceph_brag/model/db.py b/server/ceph_brag/model/db.py
index 897a2bc2c5022226c825d89500a209f76f86d370..7f8adee5e3a621bb1642cf1d49f4e0de122a9210 100644 (file)
--- a/server/ceph_brag/model/db.py
+++ b/server/ceph_brag/model/db.py
@@ -67,9 +67,9 @@ class osds_info(Base):
   cpu = Column(String(16))
   os = Column(String(16))
   os_version = Column(String(16))
-  os_desc = Column(String(32))
-  distro = Column(String(16))
-  ceph_version = Column(String(32))
+  os_desc = Column(String(64))
+  distro = Column(String(64))
+  ceph_version = Column(String(64))
 
 class brag(object):
   def __init__(self, uuid, version_number):