Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding option to exclude dockercloud containers #3666

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions utils/dockerutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)


Expand Down Expand Up @@ -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()

Expand Down