Finish dashboard

diff --git a/elastic/dashboard/template.mustache b/elastic/dashboard/template.mustache
index 4d66954..0b31c82 100644 (file)
--- a/elastic/dashboard/template.mustache
+++ b/elastic/dashboard/template.mustache
@@ -2,7 +2,7 @@
   "title": "Soledad-Benchmarks",
   "hits": 0,
   "description": "All Soledad benchmak tests run on Weasel",
-  "panelsJSON": "[{{#tests}} {\"col\":1,\"id\":\"{{name}}\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"}, {{/tests}}{\"col\":1,\"id\":\"test_decrypt_doc_1M\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"} ]",
+  "panelsJSON": "{{{panels_json}}}",
   "optionsJSON": "{\"darkTheme\":true}",
   "uiStateJSON": "{}",
   "version": 1,

diff --git a/elastic/generate-config.py b/elastic/generate-config.py
index 49a6209..31c8e3a 100755 (executable)
--- a/elastic/generate-config.py
+++ b/elastic/generate-config.py
@@ -59,7 +59,18 @@ def generate_dashboards():
     out_file = dir + 'soledad-benchmarks.json'
     print('Generating ' + out_file)
 
-    rendered = pystache.render(template, tests)
+    panels = '['
+    count = 0
+    for test in tests['tests']:
+        test_name = test['name']
+        count += 1
+        panels += '{\\"id\\":\\"' + test_name + '\\",\\"panelIndex\\":' + str(count) + ',\\"col\\":1,\\"row\\":' + str(count) + ',\\"size_x\\":6,\\"size_y\\":3,\\"type\\":\\"visualization\\"}, '
+    panels = panels[:-2]
+    panels += ']'
+
+    print(panels)
+    panels_json = { 'panels_json': panels }
+    rendered = pystache.render(template, panels_json)
     #print(rendered)
 
     out = open(out_file, 'w')

diff --git a/elastic/load.sh b/elastic/load.sh
index a50083a..f46466a 100755 (executable)
--- a/elastic/load.sh
+++ b/elastic/load.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 # from https://raw.githubusercontent.com/elastic/beats-dashboards/master/load.sh