Fix conflicts

Author: hkaj

checks.d/docker_daemon.py

@@ -218,6 +218,11 @@ def init(self):
             # Other options
             self.collect_image_stats = _is_affirmative(instance.get('collect_images_stats', False))
             self.collect_container_size = _is_affirmative(instance.get('collect_container_size', False))
+            self.collect_container_count = _is_affirmative(instance.get('collect_container_count', False))
+            self.collect_dead_container_count = _is_affirmative(instance.get('collect_dead_container_count', False))
+            self.collect_exited_container_count = _is_affirmative(instance.get('collect_exited_container_count', False))
+            self.collect_volume_count = _is_affirmative(instance.get('collect_volume_count', False))
+            self.collect_dangling_volume_count = _is_affirmative(instance.get('collect_dangling_volume_count', False))
             self.collect_events = _is_affirmative(instance.get('collect_events', True))
             self.collect_image_size = _is_affirmative(instance.get('collect_image_size', False))
             self.collect_disk_stats = _is_affirmative(instance.get('collect_disk_stats', False))
@@ -273,6 +278,21 @@ def check(self, instance):
         if self.collect_container_size:
             self._report_container_size(containers_by_id)
 
+        if self.collect_container_count:
+            self._report_container_count_by_state(containers_by_id)
+
+        if self.collect_dead_container_count:
+            self._report_container_count_by_state(containers_by_id, state="Dead")
+
+        if self.collect_exited_container_count:
+            self._report_container_count_by_state(containers_by_id, state="Exited")
+
+        if self.collect_volume_count:
+            self._report_volume_count()
+
+        if self.collect_dangling_volume_count:
+            self._report_volume_count(filters={'dangling': True})
+
         # Collect disk stats from Docker info command
         if self.collect_disk_stats:
             self._report_disk_stats()
@@ -505,7 +525,6 @@ def _report_container_size(self, containers_by_id):
             tags = self._get_tags(container, PERFORMANCE)
             m_func = FUNC_MAP[GAUGE][self.use_histogram]
             if "SizeRw" in container:
-
                 m_func(self, 'docker.container.size_rw', container['SizeRw'],
                        tags=tags)
             if "SizeRootFs" in container:
@@ -542,6 +561,26 @@ def _submit_healthcheck_sc(self, container):
         tags = self._get_tags(container, CONTAINER)
         self.service_check(HEALTHCHECK_SERVICE_CHECK_NAME, status, tags=tags)
 
+    def _report_container_count_by_state(self, containers_by_id, state="Any"):
+        tags = {}
+        filterlambda = lambda x: not self._is_container_excluded(x) and state is "Any" or container["State"] is state
+        filtered = list(filter(filterlambda, containers_by_id))
+        tags = self._get_tags(filtered[0], PERFORMANCE)
+
+        m_func = FUNC_MAP[GAUGE][self.use_histogram]
+        # Report docker.container.count if state is "Any", otherwise
+        # report docker.container.state_STATE.count
+        suffix = ".state_{}".format(state.lower()) if state is not "Any" else ""
+        m_func(self, 'docker.container{}.count'.format(suffix), len(filtered), tags=tags)
+
+    def _report_volume_count(self, filters={}):
+        volumes = self.docker_client.volumes(filters=filters)
+        count = len(volumes['Volumes'])
+
+        m_func = FUNC_MAP[GAUGE][self.use_histogram]
+        suffix = '.' + '-'.join(sorted(filters.keys())) if len(filters) is not 0 else ''
+        m_func(self, 'docker.volumes{}.count'.format(suffix), count)
+
     def _report_image_size(self, images):
         for image in images:
             tags = self._get_tags(image, IMAGE)

conf.d/docker_daemon.yaml.example

@@ -63,6 +63,31 @@ instances:
     # health_service_checks: false
     # health_service_check_whitelist: []
 
+    # Collect the total container count with the docker.containers.count metric.
+    # Defaults to false.
+    #
+    # collect_container_count: false
+
+    # Collect the count of all containers in Dead state with the docker.container.state_dead.count metric.
+    # Defaults to false.
+    #
+    # collect_dead_container_count: false
+
+    # Collect the count of all containers in Exited state with the docker.container.state_exited.count metric.
+    # Defaults to false.
+    #
+    # collect_exited_container_count: false
+
+    # Collect the total volume count with the docker.volumes.count metric.
+    # Defaults to false.
+    #
+    # collect_volume_count: false
+
+    # Collect the count of all dangling volumes with the docker.volumes.dangling.count metric.
+    # Defaults to false.
+    #
+    # collect_dangling_volume_count: false
+
     # Collect images stats
     # Number of available active images and intermediate images as gauges.
     # Defaults to false.

tests/checks/integration/test_docker_daemon.py

@@ -466,6 +466,11 @@ def test_labels_collection(self):
                 "collect_labels_as_tags": ["label1"],
                 "collect_image_size": True,
                 "collect_images_stats": True,
+                "collect_container_count": True,
+                "collect_dead_container_count": True,
+                "collect_exited_container_count": True,
+                "collect_volume_count": True,
+                "collect_dangling_volume_count": True,
             },
             ],
         }