update stats to tsdb

v3io · Feb 24, 2019 · 388dea4 · 388dea4
1 parent ec01948
commit 388dea4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/httpblaster/data_generator/memoryGenerator.go b/httpblaster/data_generator/memoryGenerator.go
@@ -20,7 +20,7 @@ type MemoryGenerator struct{
 	Active     uint64
 }
 
-func  (self *MemoryGenerator) GenerateRandomData(cpuNumber int) []string{
+func  (self *MemoryGenerator) GenerateRandomData(cpuNumber string) []string{
 	//stats, _ := cpu.Info()
 	//fmt.Println(stats)
 	v, _ := mem.VirtualMemory()
@@ -29,7 +29,7 @@ func  (self *MemoryGenerator) GenerateRandomData(cpuNumber int) []string{
 	return payloads
 }
 
-func  (self *MemoryGenerator) GenerateJsonByVal(timestamp string,colName string,val float64 , cpuNumber int) string{
+func  (self *MemoryGenerator) GenerateJsonByVal(timestamp string,colName string,val float64 , cpuNumber string) string{
 	//item :=igz_data.IgzTSDBItem{}
 	item :=igz_data.IgzTSDBItemV2{}
 	item.InsertMetric("memory")
@@ -42,11 +42,13 @@ func  (self *MemoryGenerator) GenerateJsonByVal(timestamp string,colName string,
 }
 
 
-func (self *MemoryGenerator) GenerateJsonArray(v *mem.VirtualMemoryStat,cpuNumber int) []string{
+func (self *MemoryGenerator) GenerateJsonArray(v *mem.VirtualMemoryStat,cpuNumber string) []string{
 	  timestamp :=  NowAsUnixMilli()
 	  arr :=  []string{}
 	  val := make(map[string]interface{})
-	  json.Unmarshal([]byte(v.String()), &val)
+	if err := json.Unmarshal([]byte(v.String()), &val) ; err!=nil {
+		panic(err)
+	}
 	  for s,vl := range val{
 	  	  f ,_ := getFloat(vl)
 		  arr = append(arr, self.GenerateJsonByVal(timestamp,s,f,cpuNumber))

diff --git a/httpblaster/request_generators/stats2tsdb.go b/httpblaster/request_generators/stats2tsdb.go
@@ -4,6 +4,7 @@ import (
 	"github.com/v3io/http_blaster/httpblaster/config"
 	"github.com/v3io/http_blaster/httpblaster/data_generator"
 	"runtime"
+	"strconv"
 	"sync"
 )
 
@@ -25,7 +26,7 @@ func (self *Stats2TSDB) generate_request(ch_records chan []string, ch_req chan *
 		for i:=0;i<wl.Count ; i++ {
 
 			var contentType string = "text/html"
-			json_payload := gen.GenerateRandomData(cpuNumber)
+			json_payload := gen.GenerateRandomData(strconv.FormatInt(int64(i), 10))
 			for _, payload := range json_payload {
 				req := AcquireRequest()
 				self.PrepareRequest(contentType, self.workload.Header, "PUT",