Merge remote-tracking branch 'origin/master'

test_agent/config/container/java_proxy/jmx/26021802

@@ -0,0 +1,43 @@
+{
+  "id" : "26021802",
+  "target" : {
+    "connection" : {
+      "ip" : "192.168.1.215",
+      "port" : "27017",
+      "ssl" : false,
+      "portType" : "tcp"
+    },
+    "auth" : {
+
+    }
+  },
+  "schedule" : {
+    "interval" : "10"
+  },
+  "crawler" : {
+    "name":"MONGODB",
+    "container":"java_proxy"
+  },
+  "items" : [
+    {
+      "keys" : [
+        {"metric":"memory.usage.bits", "key":"bits"},
+        {"metric":"memory.usage.rss", "key":"resident"},
+        {"metric":"memory.usage.vmem", "key":"virtual"},
+        {"metric":"memory.usage.supported", "key":"supported"},
+        {"metric":"memory.usage.mapped", "key":"mapped"},
+        {"metric":"memory.usage.mappedWithJournal", "key":"mappedWithJournal"}
+      ],
+      "queryInfo" : {
+        "query": "mem",
+        "extend" : {
+          "dataBaseName":"admin",
+          "statusCommand": "serverStatus"
+        }
+      },
+      "mappingInfo" : {
+        "parseDirection" : "col"
+      }
+    }
+  ]
+}

test_agent/config/container/java_proxy/snmp/68686868

@@ -0,0 +1,42 @@
+{
+  "id" : "68686868",
+  "target" : {
+    "connection" : {
+      "ip" : "192.168.1.215",
+      "port" : "161",
+      "ssl" : false,
+      "portType" : "udp"
+    },
+    "auth" : {
+      "version" : "v3",
+      "user" : "loafle",
+      "authType" : "MD5",
+      "authPass" : "qwer5795",
+      "privType" : "DES",
+      "privPass" : "qweqwe123"
+    }
+  },
+  "schedule" : {
+    "interval" : "10"
+  },
+  "crawler" : {
+    "name":"SNMP",
+    "container":"java_proxy"
+  },
+  "items" : [
+    {
+      "keys" : [
+        {"metric":"system.uptime", "key":"1.3.6.1.2.1.1.3.0"}
+      ],
+      "queryInfo" : {
+        "query": "mem",
+        "extend" : {
+          "method": "get"
+        }
+      },
+      "mappingInfo" : {
+        "parseDirection" : "col"
+      }
+    }
+  ]
+}

test_agent/config/container/java_proxy/snmp/86868686

@@ -0,0 +1,38 @@
+{
+  "id" : "86868686",
+  "target" : {
+    "connection" : {
+      "ip" : "192.168.1.254",
+      "port" : "161",
+      "ssl" : false,
+      "portType" : "udp"
+    },
+    "auth" : {
+      "version":"v2c",
+      "community" : "loafle"
+    }
+  },
+  "schedule" : {
+    "interval" : "10"
+  },
+  "crawler" : {
+    "name":"SNMP",
+    "container":"java_proxy"
+  },
+  "items" : [
+    {
+      "keys" : [
+        {"metric":"system.uptime", "key":"1.3.6.1.2.1.1.3.0"}
+      ],
+      "queryInfo" : {
+        "query": "mem",
+        "extend" : {
+          "method": "get"
+        }
+      },
+      "mappingInfo" : {
+        "parseDirection" : "col"
+      }
+    }
+  ]
+}

test_agent/config/container/network_proxy/health_snmpv3/59797987

@@ -2,7 +2,7 @@
   "id" : "59797987",
   "target" : {
     "connection" : {
-      "ip" : "192.168.1.215",
+      "ip" : "192.168.1.107",
       "port" : "161",
       "ssl" : false,
       "portType" : "udp"