From 1279bcfdcbcaf2c5b159670d6e9434ca7573d5d5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 Feb 2016 12:34:28 +0530 Subject: [PATCH 1/3] Added options.wait_for_end = true to make sure the entire response is read. Committer: JoeBmc modified: init.lua --- init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.lua b/init.lua index a40e4d7..e15b5ca 100644 --- 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) From f51f570e41655811242f4d2cde8f563b5e0a1bf6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 15 Feb 2016 13:03:31 +0530 Subject: [PATCH 2/3] Changing PollInterval and Resolution from 60000 to 10000 milliseconds Committer: JoeBmc --- metrics.json | 24 ++++++++++++------------ param.json | 2 +- plugin.json | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/metrics.json b/metrics.json index fbf39c4..79a2000 100644 --- a/metrics.json +++ b/metrics.json @@ -1,7 +1,7 @@ { "DOCKER_MEMORY_USAGE_BYTES": { "defaultAggregate": "avg", - "defaultResolutionMS": 60000, + "defaultResolutionMS": 10000, "description": "Docker Total memory usage", "displayName": "Docker Total memory usage", "displayNameShort": "DK MEM BYTES", @@ -9,7 +9,7 @@ }, "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", @@ -17,7 +17,7 @@ }, "DOCKER_MEMORY_USAGE_PERCENT": { "defaultAggregate": "avg", - "defaultResolutionMS": 60000, + "defaultResolutionMS": 10000, "description": "Docker memory usage %", "displayName": "Docker memory usage %", "displayNameShort": "DK MEM %", @@ -25,7 +25,7 @@ }, "DOCKER_TOTAL_CPU_USAGE": { "defaultAggregate": "avg", - "defaultResolutionMS": 60000, + "defaultResolutionMS": 10000, "description": "Total CPU usage", "displayName": "Docker total cpu usage", "displayNameShort": "DK TOTAL CPU", @@ -33,7 +33,7 @@ }, "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", @@ -41,7 +41,7 @@ }, "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", @@ -49,7 +49,7 @@ }, "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", @@ -57,7 +57,7 @@ }, "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", @@ -65,7 +65,7 @@ }, "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", @@ -73,7 +73,7 @@ }, "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", @@ -81,7 +81,7 @@ }, "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", @@ -89,7 +89,7 @@ }, "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 index 0339605..6791d43 100644 --- 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 index c48bb9c..f6a7582 100644 --- a/plugin.json +++ b/plugin.json @@ -64,7 +64,7 @@ "name": "pollInterval", "description": "The Poll Interval (in milliseconds) to poll for metrics.", "type": "integer", - "default": 60000, + "default": 10000, "required": false }, { From b7a4c3bd5ce7f3aca25ea1180580f3c44a8f69c5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 15 Feb 2016 13:09:39 +0530 Subject: [PATCH 3/3] Changing PollInterval and Resolution from 60000 to 10000 milliseconds --- plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.json b/plugin.json index f6a7582..cd7ab37 100644 --- 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",