Merge branch 'master' of github.com:pstadler/metrics.sh

pstadler · Nov 16, 2015 · b21a7c1 · b21a7c1
2 parents 129ece3 + 817a19d
commit b21a7c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/lib/utils/os.sh b/lib/utils/os.sh
@@ -15,7 +15,7 @@ esac)
 
 is_solaris () { [ $OS_TYPE = 'solaris' ]; }
 is_osx ()     { [ $OS_TYPE = 'osx' ]; }
-is_linux ()   { [ $OS_TYPE = 'solaris' ]; }
+is_linux ()   { [ $OS_TYPE = 'linux' ]; }
 is_bsd ()     { [ $OS_TYPE = 'bsd']; }
 is_unknown () { [ $OS_TYPE = 'unknown' ]; }
 
@@ -28,4 +28,4 @@ else
   make_temp_dir () {
     mktemp -d
   }
-fi
+fi
diff --git a/reporters/influxdb.sh b/reporters/influxdb.sh
@@ -13,28 +13,20 @@ start () {
   fi
 
   if [ "$INFLUXDB_SEND_HOSTNAME" = true ]; then
-    __influxdb_columns="[\"value\",\"host\"]"
-    __influxdb_hostname=$(hostname)
-  else
-    __influxdb_columns="[\"value\"]"
+    __influxdb_hostname="host=$(hostname)"
   fi
 }
 
 report () {
   local metric=$1
   local value=$2
   local points
-  if [ "$INFLUXDB_SEND_HOSTNAME" = true ]; then
-    points="[$value,\"$__influxdb_hostname\"]"
-  else
-    points="[$value]"
-  fi
-  local data="[{\"name\":\"$metric\",\"columns\":$__influxdb_columns,\"points\":[$points]}]"
-  curl -s -X POST $INFLUXDB_API_ENDPOINT -d $data
+  local data="$metric,$__influxdb_hostname value=$value"
+  curl  -s -X POST $INFLUXDB_API_ENDPOINT --data-binary "$data"
 }
 
 docs () {
   echo "Send data to InfluxDB."
   echo "INFLUXDB_API_ENDPOINT=$INFLUXDB_API_ENDPOINT"
   echo "INFLUXDB_SEND_HOSTNAME=$INFLUXDB_SEND_HOSTNAME"
-}
+}