re-organize the script

Signed-off-by: Gregory Meno <gmeno@redhat.com>

diff --git a/bz-mill/build/build b/bz-mill/build/build
index e4021bb6feede6f66d6df73618f48171ce95cffd..09da65c837334a391395a18d9dc0910f90ac633a 100755 (executable)
--- a/bz-mill/build/build
+++ b/bz-mill/build/build
@@ -1,19 +1,11 @@
-#!/bin/bash
+" > stuff
 
-set -e
-set -x
 
-find .
-cat map_namespace_to_query |\
+cat stuff |\
 while read url namespace;
 do
-    echo "$url ::: $namespace";
     bz_count=$(curl 2>/dev/null -XGET -L "$url" 3>/dev/null | sed 1d | tr "," " " | awk '{print $1}' | sort -n | wc -l);
-    echo "$namespace $bz_count $(date +%s)";
-    echo "$namespace $bz_count $(date +%s)" | nc grafana.ceph.com 2003
+    echo "$namespace $bz_count $(date +%s)" | nc grafana.ceph.com 2003;
 done
-#we'll eventually want to just iterate a list of BZ query URLs
-#url=http://red.ht/2paAywM
-#TODO auth against BZ so we get counts of hidden BZs
 
-#namespace="bz.gmeno.ceph.any.needinfo.24hrs"
+#TODO auth against BZ so we get counts of hidden BZs

diff --git a/bz-mill/build/head b/bz-mill/build/head
new file mode 100755 (executable)
index 0000000..22e1343
--- /dev/null
+++ b/bz-mill/build/head
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+set -x
+
+echo "\

diff --git a/bz-mill/build/map_namespace_to_query b/bz-mill/build/map_namespace_to_query
new file mode 100644 (file)
index 0000000..00ef849
--- /dev/null
+++ b/bz-mill/build/map_namespace_to_query
@@ -0,0 +1,3 @@
+# BZ CSV short URL    graphite metric name
+http://red.ht/2oiunCH bz.gmeno.ceph.new.customer.24hrs
+http://red.ht/2paAywM bz.gmeno.ceph.any.needinfo.24hrs

diff --git a/bz-mill/config/definitions/bz-mill.yml b/bz-mill/config/definitions/bz-mill.yml
index 111299f3086efb81b3d7cac16c705b2a793470c5..eb1f7d4cfedaeebd06978665cbad620e80a441ea 100644 (file)
--- a/bz-mill/config/definitions/bz-mill.yml
+++ b/bz-mill/config/definitions/bz-mill.yml
@@ -9,5 +9,6 @@
     builders:
       - shell:
           !include-raw:
-            - ../../build/generate_map_namespace_to_query.sh
+            - ../../build/head
+            - ../../build/map_namespace_to_query
             - ../../build/build