MohawkTSDB · yaacov · Jan 1, 2018 · Dec 31, 2017
diff --git a/mohawk.spec b/mohawk.spec
@@ -8,7 +8,7 @@
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           %{repo}
-Version:        0.28.5
+Version:        0.30.4
 Release:        1%{?dist}
 Summary:        Time series metric data storage
 License:        Apache
@@ -47,7 +47,7 @@ install -p -m 0755 ./mohawk %{buildroot}%{_bindir}/mohawk
 %{_bindir}/mohawk
 
 %changelog
-* Wed Dec 31 2017 Yaacov Zamir <kobi.zamir@gmail.com> 0.28.5-1
+* Wed Dec 31 2017 Yaacov Zamir <kobi.zamir@gmail.com> 0.30.4-1
 - Add options response
 - Fix query by tags
 

diff --git a/src/cli/README.md b/src/cli/README.md
@@ -13,7 +13,7 @@ When installed, run using the command line ``mohawk``
 ```bash
 mohawk --version
 
-Mohawk version: 0.28.5
+Mohawk version: 0.30.4
 ```
 
 The `-h` flag will print out a help text, that list the command line arguments.
@@ -26,7 +26,7 @@ Mohawk is a metric data storage engine that uses a plugin architecture for data
 storage and a simple REST API as the primary interface.
 
 Version:
-  0.28.5
+  0.30.4
 
 Author:
   Yaacov Zamir <kobi.zamir@gmail.com>

diff --git a/src/server/examples/push_metrics_example.sh b/src/server/examples/push_metrics_example.sh
@@ -12,7 +12,7 @@ while true; do
   VAL=$(($RANDOM % 100))
   curl http://${MOHAWK_URL}/hawkular/metrics/gauges/raw \
        -H "Content-Type: application/json" \
-       -d "[{\"id\":\"free_memory\",\"data\":[{\"timestamp\":\"$(date +%s%N | cut -b1-13)\",\"value\":\"${VAL}\"}]}]"
+       -d "[{\"id\":\"free_memory\",\"data\":[{\"timestamp\":$(date +%s)000,\"value\":${VAL}}]}]"
 
   # Wait 30 sec
   sleep ${SLEEP}

diff --git a/src/server/handlers/api.go b/src/server/handlers/api.go
@@ -33,10 +33,10 @@ import (
 const defaultLimit = 2000
 
 // const defaultOrder default REST API call query order
-const defaultOrder = "DESC"
+const defaultOrder = "ASC"
 
 // const secondaryOrder secondary REST API call query order
-const secondaryOrder = "ASC"
+const secondaryOrder = "DESC"
 
 // APIHhandler common variables to be used by all APIHhandler functions
 // 	version the version of the Hawkular server we are mocking

diff --git a/src/server/server.go b/src/server/server.go
@@ -39,7 +39,7 @@ import (
 )
 
 // VER the server version
-const VER = "0.28.5"
+const VER = "0.30.4"
 
 // defaults
 const defaultAPI = "0.21.0"

diff --git a/src/storage/memory/memory.go b/src/storage/memory/memory.go
@@ -230,7 +230,7 @@ func (r Storage) GetStatData(tenant string, id string, end int64, start int64, l
 
 	// fill data out array
 	count := int64(0)
-	for b := pEnd; count < limit && b > pStart && startTimestamp >= stepMillisec; b -= pStep {
+	for b := pEnd; count < limit && b >= pStart && startTimestamp >= stepMillisec; b -= pStep {
 		samples := int64(0)
 		sum := float64(0)
 		first := float64(0)

diff --git a/test/mohawk.bats b/test/mohawk.bats
@@ -35,10 +35,10 @@ wait_for_alert() {
   [ "$status" -eq 0 ]
 }
 
-@test "Mohawk is installed in version 0.28.5" {
+@test "Mohawk is installed in version 0.30.4" {
   run mohawk --version
 
-  [[ "$output" =~ "0.28.5"  ]]
+  [[ "$output" =~ "0.30.4"  ]]
 }
 
 @test "Server should be available" {