Updated json data

Author: Chris Jones

examples/ceph.rs

@@ -96,6 +96,9 @@ fn main() {
         let s: &str = str::from_utf8(slice).unwrap();
         println!("rados_cluster_fsid len: {} - {}", len, s);
 
+        let ping_monitor = ceph_helpers::ping_monitor(cluster, "ceph-mon.ceph-vm1"); // Change to support your mon name
+        println!("Ping monitor: {:?}", ping_monitor);
+
         // Rust specific example...
         let cluster_stat = ceph_helpers::rados_stat_cluster(cluster);
         println!("Cluster stat: {:?}", cluster_stat);

src/ceph.rs

@@ -1579,6 +1579,15 @@ pub fn rados_fsid(cluster: rados_t) -> Result<Uuid, RadosError> {
 /// May be used as a simply way to assess liveness, or to obtain
 /// information about the monitor in a simple way even in the
 /// absence of quorum.
+/// NB: There must be a section in ceph.conf like `[mon.whatever_name]` for this to work.
+/// Example of how Chef-bcs builds a Ceph cluster for testing with VirtualBox:
+/// `[mon]`
+/// `  mon host = ceph-vm1, ceph-vm2, ceph-vm3`
+/// `  mon addr = 10.0.100.21:6789, 10.0.100.22:6789, 10.0.100.23:6789`
+///
+/// `[mon.ceph-vm1]`
+/// `  mon host = ceph-vm1`
+/// `  mon addr = 10.0.100.21:6789`
 pub fn ping_monitor(cluster: rados_t, mon_id: &str) -> Result<String, RadosError> {
     if cluster.is_null() {
         return Err(RadosError::new("Rados not connected.  Please initialize cluster".to_string()));

src/json.rs

@@ -17,7 +17,7 @@ use std::str;
 use rustc_serialize::json::*;
 
 use JsonData;
-use JsonValue;
+// use JsonValue;
 
 /// First json call that takes a JSON formatted string and converts it to JsonData object that can
 /// then be traversed using `json_find` via the key path.

src/status.rs

@@ -83,7 +83,8 @@ pub struct CephStatusHealthMons {
 
 #[derive(RustcDecodable, RustcEncodable)]
 pub struct CephStatusHealthSummary {
-    dummy: String,
+    severity: String,
+    summary: String,
 }
 
 #[derive(RustcDecodable, RustcEncodable)]