Merge pull request #25 from JoeBmc/master

Changing PollInterval and Resolution from 60000 to 10000 milliseconds
boundary · Feb 15, 2016 · 4570bcf · 4570bcf
2 parents e4346de + b7a4c3b
commit 4570bcf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/init.lua b/init.lua
@@ -33,6 +33,9 @@ local options = {}
 options.host = notEmpty(params.host, '127.0.0.1')
 options.port = notEmpty(params.port, '2375')
 options.path = '/v1.19/containers/json'
+-- Adding options to make the socket wait for the entire response.
+options.wait_for_end = true
+-- Done.
 
 local function getName(fullName)
   return string.sub(fullName, 2, -1)

diff --git a/metrics.json b/metrics.json
@@ -1,95 +1,95 @@
 {
   "DOCKER_MEMORY_USAGE_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker Total memory usage",
     "displayName": "Docker Total memory usage",
     "displayNameShort": "DK MEM BYTES",
     "unit": "bytecount"
   },
   "DOCKER_MEMORY_LIMIT_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker Total memory limit",
     "displayName": "Docker Total memory limit",
     "displayNameShort": "DK MEM LIMIT BYTES",
     "unit": "bytecount"
   },
   "DOCKER_MEMORY_USAGE_PERCENT": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker memory usage %",
     "displayName": "Docker  memory usage %",
     "displayNameShort": "DK MEM %",
     "unit": "percent"
   },
   "DOCKER_TOTAL_CPU_USAGE": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Total CPU usage",
     "displayName": "Docker total cpu usage",
     "displayNameShort": "DK TOTAL CPU",
     "unit": "percent"
   },
   "DOCKER_NETWORK_RX_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network i/o RX",
     "displayName": "Docker network i/o RX",
     "displayNameShort": "DK TOTAL NT RX BYTES",
     "unit": "bytecount"
   },
   "DOCKER_NETWORK_TX_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network i/o TX",
     "displayName": "Docker network i/o TX",
     "displayNameShort": "DK TOTAL NT TX BYTES",
     "unit": "bytecount"
   },
   "DOCKER_NETWORK_RX_PACKETS": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network RX packets",
     "displayName": "Docker network RX packets",
     "displayNameShort": "DK NET PCKTS RX",
     "unit": "number"
   },
   "DOCKER_NETWORK_TX_PACKETS": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network TX packets",
     "displayName": "Docker network TX packets",
     "displayNameShort": "DK NET PCKTS TX",
     "unit": "number"
   },
   "DOCKER_NETWORK_RX_ERRORS": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network RX errors",
     "displayName": "Docker network RX errors",
     "displayNameShort": "DK NET RX ERRORS",
     "unit": "number"
   },
   "DOCKER_NETWORK_TX_ERRORS": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker network TX errors",
     "displayName": "Docker network TX errors",
     "displayNameShort": "DK NET TX ERRORS",
     "unit": "number"
   },
   "DOCKER_BLOCK_IO_READ_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker block io read bytes",
     "displayName": "Docker block io read bytes",
     "displayNameShort": "DK BLK IO READ",
     "unit": "bytecount"
   },
   "DOCKER_BLOCK_IO_WRITE_BYTES": {
     "defaultAggregate": "avg",
-    "defaultResolutionMS": 60000,
+    "defaultResolutionMS": 10000,
     "description": "Docker block io write bytes",
     "displayName": "Docker block io write bytes",
     "displayNameShort": "DK BLK IO WRITE",

diff --git a/param.json b/param.json
@@ -1,5 +1,5 @@
 {
-	"pollInterval": 60000,
+	"pollInterval": 10000,
 	"host": "127.0.0.1",
 	"port": 2375,
 	"containers" : [

diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
   "name" : "Boundary Docker Plugin",
-  "version" : "0.9.3",
+  "version" : "0.9.4",
   "meterVersionRequired" : "4.2.0-611",
   "unsupportedPlatforms" : [ ],
   "tags" : "docker",
@@ -64,7 +64,7 @@
       "name": "pollInterval",
       "description": "The Poll Interval (in milliseconds) to poll for metrics.",
       "type": "integer",
-      "default": 60000,
+      "default": 10000,
       "required": false
     },
     {