Added network metrics for docker containers

4 files changed, 155 insertions, 125 deletions

diff --git a/node-admin/src/test/resources/docker.stats.json b/node-admin/src/test/resources/docker.stats.json
index c17a29ae038..d266b01f12d 100644
--- a/node-admin/src/test/resources/docker.stats.json
+++ b/node-admin/src/test/resources/docker.stats.json
@@ -355,12 +355,12 @@
     "eth0":{
       "rx_bytes":19499270,
       "rx_packets":58913,
-      "rx_errors":0,
-      "rx_dropped":0,
+      "rx_errors":55,
+      "rx_dropped":4,
       "tx_bytes":20303455,
       "tx_packets":62319,
-      "tx_errors":0,
-      "tx_dropped":0
+      "tx_errors":3,
+      "tx_dropped":13
     },
     "eth1":{
       "rx_bytes":3245766,
diff --git a/node-admin/src/test/resources/docker.stats.metrics.active.expected.json b/node-admin/src/test/resources/docker.stats.metrics.active.expected.json
new file mode 100644
index 00000000000..2ed42cdb7c4
--- /dev/null
+++ b/node-admin/src/test/resources/docker.stats.metrics.active.expected.json
@@ -0,0 +1,130 @@
+[
+    {
+        "application": "host_life",
+        "dimensions": {
+            "flavor": "docker",
+            "instanceName": "testinstance",
+            "applicationId": "tester.testapp.testinstance",
+            "applicationName": "testapp",
+            "app": "testapp.testinstance",
+            "clustertype": "clustType",
+            "role": "tenants",
+            "tenantName": "tester",
+            "zone": "dev.us-east-1",
+            "host": "host1.test.yahoo.com",
+            "vespaVersion": "1.2.3",
+            "state": "active",
+            "clusterid": "clustId",
+            "parentHostname": "parent.host.name.yahoo.com"
+        },
+        "metrics": {
+            "alive": 1.0,
+            "uptime": 1234.0
+        },
+        "routing": {
+            "yamas": {
+                "namespaces": [
+                    "Vespa"
+                ]
+            }
+        }
+    },
+    {
+        "application": "docker",
+        "dimensions": {
+            "flavor": "docker",
+            "applicationName": "testapp",
+            "instanceName": "testinstance",
+            "applicationId": "tester.testapp.testinstance",
+            "app": "testapp.testinstance",
+            "clustertype": "clustType",
+            "role": "tenants",
+            "tenantName": "tester",
+            "host": "host1.test.yahoo.com",
+            "vespaVersion": "1.2.3",
+            "state": "active",
+            "clusterid": "clustId",
+            "parentHostname": "parent.host.name.yahoo.com",
+            "zone": "dev.us-east-1",
+            "interface": "eth1"
+        },
+        "metrics": {
+            "node.net.out.bytes": 5.4246745E7,
+            "node.net.out.errors": 0.0,
+            "node.net.out.dropped": 0.0,
+            "node.net.in.bytes": 3245766.0,
+            "node.net.in.errors": 0.0,
+            "node.net.in.dropped": 0.0
+        },
+        "routing": {
+            "yamas": {
+                "namespaces": ["Vespa"]
+            }
+        }
+    },
+    {
+        "application": "docker",
+        "dimensions": {
+            "flavor": "docker",
+            "applicationName": "testapp",
+            "instanceName": "testinstance",
+            "applicationId": "tester.testapp.testinstance",
+            "app": "testapp.testinstance",
+            "clustertype": "clustType",
+            "role": "tenants",
+            "tenantName": "tester",
+            "host": "host1.test.yahoo.com",
+            "vespaVersion": "1.2.3",
+            "state": "active",
+            "clusterid": "clustId",
+            "parentHostname": "parent.host.name.yahoo.com",
+            "zone": "dev.us-east-1"
+        },
+        "metrics": {
+            "node.alive": 1.0,
+            "node.cpu.busy.pct": 6.75,
+            "node.cpu.throttled_time": 4523.0,
+            "node.memory.usage": 1.326026752E9,
+            "node.memory.limit": 4.294967296E9,
+            "node.disk.limit": 2.68435456E11
+        },
+        "routing": {
+            "yamas": {
+                "namespaces": ["Vespa"]
+            }
+        }
+    },
+    {
+        "application": "docker",
+        "dimensions": {
+            "flavor": "docker",
+            "applicationName": "testapp",
+            "instanceName": "testinstance",
+            "applicationId": "tester.testapp.testinstance",
+            "app": "testapp.testinstance",
+            "clustertype": "clustType",
+            "role": "tenants",
+            "tenantName": "tester",
+            "host": "host1.test.yahoo.com",
+            "vespaVersion": "1.2.3",
+            "state": "active",
+            "clusterid": "clustId",
+            "parentHostname": "parent.host.name.yahoo.com",
+            "zone": "dev.us-east-1",
+            "interface": "eth0"
+        },
+        "metrics": {
+            "node.net.out.bytes": 2.0303455E7,
+            "node.net.out.errors": 3.0,
+            "node.net.out.dropped": 13.0,
+            "node.net.in.bytes": 1.949927E7,
+            "node.net.in.errors": 55.0,
+            "node.net.in.dropped": 4.0
+        },
+        "routing": {
+            "yamas": {
+                "namespaces": ["Vespa"]
+            }
+        }
+    }
+]
diff --git a/node-admin/src/test/resources/docker.stats.metrics.expected.json b/node-admin/src/test/resources/docker.stats.metrics.expected.json
deleted file mode 100644
index f4de239fdce..00000000000
--- a/node-admin/src/test/resources/docker.stats.metrics.expected.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-  {
-    "application": "host_life",
-    "dimensions": {
-      "flavor": "docker",
-      "instanceName": "testinstance",
-      "applicationId": "tester.testapp.testinstance",
-      "applicationName": "testapp",
-      "app": "testapp.testinstance",
-      "clustertype": "clustType",
-      "role": "tenants",
-      "tenantName": "tester",
-      "zone": "dev.us-east-1",
-      "host": "host1.test.yahoo.com",
-      "vespaVersion": "1.2.3",
-      "state": "active",
-      "clusterid": "clustId",
-      "parentHostname": "parent.host.name.yahoo.com"
-    },
-    "metrics": {
-      "alive": 1.0,
-      "uptime": 1234.0
-    },
-    "routing": {
-      "yamas": {
-        "namespaces": [
-          "Vespa"
-        ]
-      }
-    }
-  },
-  {
-    "application":"docker",
-    "dimensions":{
-      "flavor":"docker",
-      "applicationName": "testapp",
-      "instanceName": "testinstance",
-      "applicationId": "tester.testapp.testinstance",
-      "app":"testapp.testinstance",
-      "clustertype":"clustType",
-      "role":"tenants",
-      "tenantName":"tester",
-      "host":"host1.test.yahoo.com",
-      "vespaVersion":"1.2.3",
-      "state":"active",
-      "clusterid":"clustId",
-      "parentHostname":"parent.host.name.yahoo.com",
-      "zone":"dev.us-east-1",
-      "interface":"eth1"
-    },
-    "metrics":{
-      "node.network.bytes_sent":5.4246745E7,
-      "node.network.bytes_rcvd":3245766.0
-    },
-    "routing":{
-      "yamas":{
-        "namespaces": ["Vespa"]
-      }
-    }
-  },
-  {
-    "application":"docker",
-    "dimensions":{
-      "flavor":"docker",
-      "applicationName": "testapp",
-      "instanceName": "testinstance",
-      "applicationId": "tester.testapp.testinstance",
-      "app":"testapp.testinstance",
-      "clustertype":"clustType",
-      "role":"tenants",
-      "tenantName":"tester",
-      "host":"host1.test.yahoo.com",
-      "vespaVersion":"1.2.3",
-      "state":"active",
-      "clusterid":"clustId",
-      "parentHostname":"parent.host.name.yahoo.com",
-      "zone":"dev.us-east-1"
-    },
-    "metrics":{
-      "node.cpu.busy.pct": 6.75,
-      "node.cpu.throttled_time": 4523.0,
-      "node.memory.usage":1.326026752E9,
-      "node.memory.limit":4.294967296E9,
-      "node.disk.limit":2.68435456E11
-    },
-    "routing":{
-      "yamas":{
-        "namespaces": ["Vespa"]
-      }
-    }
-  },
-  {
-    "application":"docker",
-    "dimensions":{
-      "flavor":"docker",
-      "applicationName": "testapp",
-      "instanceName": "testinstance",
-      "applicationId": "tester.testapp.testinstance",
-      "app":"testapp.testinstance",
-      "clustertype":"clustType",
-      "role":"tenants",
-      "tenantName":"tester",
-      "host":"host1.test.yahoo.com",
-      "vespaVersion":"1.2.3",
-      "state":"active",
-      "clusterid":"clustId",
-      "parentHostname":"parent.host.name.yahoo.com",
-      "zone":"dev.us-east-1",
-      "interface":"eth0"
-    },
-    "metrics":{
-      "node.network.bytes_sent":2.0303455E7,
-      "node.network.bytes_rcvd":1.949927E7
-    },
-    "routing":{
-      "yamas":{
-        "namespaces": ["Vespa"]
-      }
-    }
-  }
-]
diff --git a/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json b/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json
new file mode 100644
index 00000000000..de3e26c8e13
--- /dev/null
+++ b/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json
@@ -0,0 +1,21 @@
+[
+    {
+        "application": "docker",
+        "dimensions": {
+            "flavor": "docker",
+            "role": "tenants",
+            "host": "host1.test.yahoo.com",
+            "state": "ready",
+            "parentHostname": "parent.host.name.yahoo.com",
+            "zone": "dev.us-east-1"
+        },
+        "metrics": {
+            "node.alive": 1.0
+        },
+        "routing": {
+            "yamas": {
+                "namespaces": ["Vespa"]
+            }
+        }
+    }
+]