Merge pull request #19 from realmgic/master

fix bad microsecond histogram fix

Author: realmgic

make.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-set -x
-set -e
+set +x
+set +e
 
 cd $GOPATH/src/github.com/aerospike-community/amc
 
@@ -10,7 +10,8 @@ environ=${2:-dev}
 platform=${3:-linux}
 sysname=$(uname | tr '[:upper:]' '[:lower:]')
 
-maintainer="Khosrow Afroozeh ([email protected])"
+#maintainer="Khosrow Afroozeh ([email protected])"
+maintainer="Zohar Elkayam ([email protected])"
 description="Aerospike Management Console"
 
 echo "platform is ${platform}"

models/node.go

@@ -1120,8 +1120,9 @@ func (n *Node) parseLatenciesInfo(s string) (map[string]common.Stats, map[string
 		if err != nil {
 			break
 		}
+		histUnit = "msec"
 
-		// log.Debugf("histUnit: %s", histUnit)
+		//log.Debugf("histUnit: %s", histUnit)
 
 		opsCount, err := ip.ReadFloat(',')
 		if err != nil {
@@ -1165,9 +1166,9 @@ func (n *Node) parseLatenciesInfo(s string) (map[string]common.Stats, map[string
 		timestamp += "-GMT"
 
 		stats := common.Stats{
-			"tps":       opsCount,
-			"timestamp": timestamp,
-			//"histUnit":   histUnit,
+			"tps":        opsCount,
+			"timestamp":  timestamp,
+			"histUnit":   histUnit,
 			"buckets":    buckets,
 			"valBuckets": valBucketsFloat,
 		}