Merge remote-tracking branch 'origin/master'

config/config.go

@@ -1,37 +0,0 @@
-package config
-
-
-type Auth struct {
-}
-
-type Connection struct {
-	Ip       string `json:"ip"`
-	Port     string `json:"port"`
-	PortType string `json:"portType"`
-	SSL      bool `json:"ssl"`
-}
-
-type Target struct {
-	Auth       Auth
-	Connection Connection
-}
-
-type Schedule struct {
-	Interval string `json:"interval"`
-}
-
-type Item struct {
-}
-
-type Crawler struct {
-	Name      string `json:"name"`
-	Container string `json:"container"`
-}
-
-type Config struct {
-	Id       string   `json:"id"`
-	Target   Target   `json:"target"`
-	Schedule Schedule `json:"schedule"`
-	Crawler  Crawler  `json:"crawler"`
-	Items    []Item   `json:"items"`
-}

config/example.json

@@ -1,23 +0,0 @@
-{
-  "id" : "SOEJWEOJWOEJOSDJFOASDJFOSDFO2903870928734",
-  "target" : {
-    "connection" : {
-      "ip" : "192.168.1.104",
-      "port" : "6379",
-      "ssl" : false,
-      "portType" : "tcp"
-    },
-    "auth" : {
-
-    }
-  },
-  "schedule" : {
-    "interval" : "10"
-  },
-  "crawler" : {
-    "name":"redis_protocol_crawler",
-    "container":"network_crawler"
-  },
-  "items" : [
-  ]
-}

test/example.json

@@ -15,9 +15,14 @@
     "interval" : "10"
   },
   "crawler" : {
-    "name":"redis_protocol_crawler",
+    "name":"redis_crawler",
-    "container":"network_crawler"
+    "container":"java_proxy"
   },
   "items" : [
+    {
+      "type":"cpu",
+      "":[],
+      "":[],
+    }
   ]
 }