diff --git a/utils/dockerutil.py b/utils/dockerutil.py index 68055f93f8..54d279bf08 100644 --- a/utils/dockerutil.py +++ b/utils/dockerutil.py @@ -48,6 +48,9 @@ class CGroupException(Exception): # only used if no exclude rule was defined DEFAULT_CONTAINER_EXCLUDE = ["docker_image:gcr.io/google_containers/pause.*", "image_name:openshift/origin-pod"] +# only used for docer cloud users not willing to monitor the underlying containers of the docker cloud agent. +DOCKERCLOUD_EXCLUDE = ["docker_image:dockercloud/.*"] + log = logging.getLogger(__name__) @@ -108,6 +111,10 @@ def __init__(self, **kwargs): else: self.filtering_enabled = True + if instance.get('ignore_docker_cloud_containers'): + self._exclude = DOCKERCLOUD_EXCLUDE + self.filtering_enabled = False + if self.filtering_enabled: self.build_filters()