KSM add node tag for pods + override hostname

.travis.yml

@@ -82,6 +82,7 @@ env:
     - TRAVIS_FLAVOR=kong FLAVOR_VERSION=0.9.0
     - TRAVIS_FLAVOR=kube_dns FLAVOR_VERSION=0.1.0
     - TRAVIS_FLAVOR=kubernetes
+    - TRAVIS_FLAVOR=kubernetes_state
     - TRAVIS_FLAVOR=kyototycoon FLAVOR_VERSION=0.9.56
     - TRAVIS_FLAVOR=lighttpd
     - TRAVIS_FLAVOR=mcache FLAVOR_VERSION=1.4.22

circle.yml

@@ -80,6 +80,7 @@ test:
         - rake ci:run[kafka]
         - rake ci:run[docker_daemon]
         - rake ci:run[kubernetes]
+        - rake ci:run[kubernetes_state]
         - rake ci:run[cassandra_nodetool]
         - rake ci:run[squid]
         - bundle exec rake requirements

kubernetes_state/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG - kubernetes_state
 
+2.1.0 / Unreleased
+==================
+### Changes
+
+* [IMPROVEMENT] Add the node label wherever the pod label is present [#1000][]
+* [IMPROVEMENT] Override hostname with the node label if present [#1000][]
+
 2.0.0 / 2018-01-10
 ==================
 ### Changes

kubernetes_state/datadog_checks/kubernetes_state/__init__.py

@@ -2,6 +2,6 @@
 
 KubernetesState = kubernetes_state.KubernetesState
 
-__version__ = "2.0.0"
+__version__ = "2.1.0"
 
 __all__ = ['kubernetes_state']

kubernetes_state/datadog_checks/kubernetes_state/kubernetes_state.py

@@ -154,6 +154,15 @@ def __init__(self, name, init_config, agentConfig, instances=None):
             'kube_job_status_start_time',
         ]
 
+        self.label_joins = {
+            'kube_pod_info': {
+                'label_to_match': 'pod',
+                'labels_to_get': ['node']
+            }
+        }
+
+        self.label_to_hostname = 'node'
+
     def check(self, instance):
         endpoint = instance.get('kube_state_url')
         if endpoint is None:

kubernetes_state/manifest.json

@@ -11,7 +11,7 @@
     "linux",
     "mac_os"
   ],
-  "version": "2.0.0",
+  "version": "2.1.0",
   "use_omnibus_reqs": true,
   "public_title": "Datadog-Kubernetes State Integration",
   "categories":["orchestration", "containers"],

kubernetes_state/test/test_kubernetes_state.py

@@ -6,12 +6,14 @@
 import mock
 import os
 
+# 3p
+from nose.plugins.attrib import attr
+
 # project
 from tests.checks.common import AgentCheckTest
 
 NAMESPACE = 'kubernetes_state'
 
-
 class MockResponse:
     """
     MockResponse is used to simulate the object requests.Response commonly returned by requests.get
@@ -29,6 +31,7 @@ def close(self):
         pass
 
 
+@attr(requires='kubernetes_state')
 class TestKubernetesState(AgentCheckTest):
     CHECK_NAME = 'kubernetes_state'
 
@@ -90,6 +93,16 @@ class TestKubernetesState(AgentCheckTest):
         NAMESPACE + '.statefulset.replicas_updated',
     ]
 
+    TAGS = {
+        NAMESPACE + '.pod.ready': ['node:minikube'],
+        NAMESPACE + '.pod.scheduled': ['node:minikube']
+    }
+
+    HOSTNAMES = {
+        NAMESPACE + '.pod.ready': 'minikube',
+        NAMESPACE + '.pod.scheduled': 'minikube'
+    }
+
     ZERO_METRICS = [
         NAMESPACE + '.deployment.replicas_unavailable',
         NAMESPACE + '.deployment.paused',
@@ -118,7 +131,8 @@ def test__update_kube_state_metrics(self, mock_poll):
             }]
         }
 
-        self.run_check(config)
+        # run check twice to have pod/node mapping
+        self.run_check_twice(config)
 
         self.assertServiceCheck(NAMESPACE + '.node.ready', self.check.OK)
         self.assertServiceCheck(NAMESPACE + '.node.out_of_disk', self.check.OK)
@@ -137,7 +151,14 @@ def test__update_kube_state_metrics(self, mock_poll):
                                 tags=['namespace:default', 'pod:hello-1509998460-tzh8k'])  # Unknown
 
         for metric in self.METRICS:
-            self.assertMetric(metric)
+            self.assertMetric(
+                metric,
+                hostname=self.HOSTNAMES.get(metric, None)
+            )
+            tags = self.TAGS.get(metric, None)
+            if tags:
+                for tag in tags:
+                    self.assertMetricTag(metric, tag)
             if metric not in self.ZERO_METRICS:
                 self.assertMetricNotAllZeros(metric)
 
@@ -156,7 +177,8 @@ def test__update_kube_state_metrics_v040(self, mock_poll):
             }]
         }
 
-        self.run_check(config)
+        # run check twice to have pod/node mapping
+        self.run_check_twice(config)
 
         self.assertServiceCheck(NAMESPACE + '.node.ready', self.check.OK)
         self.assertServiceCheck(NAMESPACE + '.node.out_of_disk', self.check.OK)