From 0b4353056131485826d24923ef02b3447ba1fe87 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 14 Apr 2020 21:38:34 +0200
Subject: [PATCH] freifunk_node: change influxdb schema

---
 freifunk_node/scrape.rb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/freifunk_node/scrape.rb b/freifunk_node/scrape.rb
index 1b55345..ab9e378 100644
--- a/freifunk_node/scrape.rb
+++ b/freifunk_node/scrape.rb
@@ -42,18 +42,32 @@ def recurse(data, values, prefix='')
         end
       else
         if data[0] =~ /^\d+$/
-          values[prefix] = data[0].to_i
+          values[prefix] = data[0].to_f
         end
       end
     end
   elsif data.kind_of? Integer or data.kind_of? Float
-    values[prefix] = data
+    values[prefix] = data.to_f
   end
 end
 
 
 node_id = data['data']['common']['node']
+node_name = data['data']['contact']['name']
 recurse data['data'], values
 
+points = values.map do |k, v|
+  { series: 'node',
+    tags: {
+      node_id: node_id,
+      node_name: node_name,
+    },
+    values: {
+      key: k,
+      value: v,
+    },
+  }
+end
+
 db = InfluxDB::Client.new(url: "http://grafana.hq.c3d2.de:8086/freifunk")
-db.write_point 'node', { values: values, tags: { node_id: node_id } }
+db.write_points points