Merge pull request #12 from runabove/parser

Parser

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beamium"
-version = "1.0.2"
+version = "1.0.3"
 authors = [ "d33d33 <kevin.georges@corp.ovh.com>" ]
 
 build = "build.rs"

src/sink.rs

@@ -93,8 +93,12 @@ fn send(sink: &config::Sink, parameters: &config::Parameters) -> Result<(), Box<
 
         debug!("post metrics");
         let request = client.post(&sink.url).headers(headers).body(&metrics);
-        let res = try!(request.send());
+        let mut res = try!(request.send());
         if !res.status.is_success() {
+            let mut body = String::new();
+            try!(res.read_to_string(&mut body));
+            debug!("data {}", &body);
+
             return Err(From::from("non 200 received"));
         }
 

src/source.rs

@@ -118,16 +118,22 @@ fn fetch(source: &config::Source,
     Ok(())
 }
 
-/// Format Wqrp10 metrics from Prometheus one.
+/// Format Warp10 metrics from Prometheus one.
 fn format(line: &str, labels: &String, now: i64) -> Result<String, Box<Error>> {
     // Skip comments
     if line.starts_with("#") {
         return Ok(String::new());
     }
 
     // Extract Prometheus metric
-    let mut tokens = line.split_whitespace();
-    let class = try!(tokens.next().ok_or("no class"));
+    let index = if line.contains("{") {
+        try!(line.rfind('}').ok_or("bad class"))
+    } else {
+        try!(line.find(' ').ok_or("bad class"))
+    };
+    let (class, v) = line.split_at(index + 1);
+    let mut tokens = v.split_whitespace();
+
     let value = try!(tokens.next().ok_or("no value"));
     let timestamp = tokens.next()
         .map(|v| {