From f0c432e4386b9bef4fac92f6ef469c892b0864f5 Mon Sep 17 00:00:00 2001 From: Nicholas Devlin Date: Mon, 8 Jun 2020 12:42:20 -0400 Subject: [PATCH 1/3] Update directory.py I wanted to monitor more than 20 files and expected this setting to be configureable like in our [rabbitmq check](https://github.com/DataDog/integrations-core/blob/master/rabbitmq/datadog_checks/rabbitmq/rabbitmq.py#L183-L187) and the [jmx fetch based integrations](https://github.com/DataDog/jmxfetch/blob/master/src/main/java/org/datadog/jmxfetch/Instance.java#L64) --- directory/datadog_checks/directory/directory.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/directory/datadog_checks/directory/directory.py b/directory/datadog_checks/directory/directory.py index 782250c668b06..11e3f8fdbe447 100644 --- a/directory/datadog_checks/directory/directory.py +++ b/directory/datadog_checks/directory/directory.py @@ -42,6 +42,7 @@ def check(self, instance): abs_directory = abspath(directory) name = instance.get('name', directory) + pattern = instance.get('pattern') exclude_dirs = instance.get('exclude_dirs', []) exclude_dirs_pattern = re_compile('|'.join(exclude_dirs)) if exclude_dirs else None @@ -54,7 +55,8 @@ def check(self, instance): ignore_missing = is_affirmative(instance.get('ignore_missing', False)) follow_symlinks = is_affirmative(instance.get('follow_symlinks', True)) custom_tags = instance.get('tags', []) - + max_filegauge_count = instance.get('max_filegauge_count', MAX_FILEGAUGE_COUNT) + if not exists(abs_directory): msg = ( "Either directory '{}' doesn't exist or the Agent doesn't " @@ -79,6 +81,7 @@ def check(self, instance): follow_symlinks, countonly, custom_tags, + max_filegauge_count, ) def _get_stats( @@ -95,12 +98,13 @@ def _get_stats( follow_symlinks, countonly, tags, + max_filegauge_count, ): dirtags = ['{}:{}'.format(dirtagname, name)] dirtags.extend(tags) directory_bytes = 0 directory_files = 0 - max_filegauge_balance = self.MAX_FILEGAUGE_COUNT + max_filegauge_balance = max_filegauge_count # If we do not want to recursively search sub-directories only get the root. walker = walk(directory, follow_symlinks) if recursive else (next(walk(directory, follow_symlinks)),) From b97c8450448c6eb7701ce3774af887280aae36f1 Mon Sep 17 00:00:00 2001 From: Nicholas Devlin Date: Mon, 8 Jun 2020 14:10:14 -0400 Subject: [PATCH 2/3] Update directory/datadog_checks/directory/directory.py forgot self when referencing the max constant in the default value Co-authored-by: Christine Chen --- directory/datadog_checks/directory/directory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/directory/datadog_checks/directory/directory.py b/directory/datadog_checks/directory/directory.py index 11e3f8fdbe447..97fffcbd9d300 100644 --- a/directory/datadog_checks/directory/directory.py +++ b/directory/datadog_checks/directory/directory.py @@ -55,7 +55,7 @@ def check(self, instance): ignore_missing = is_affirmative(instance.get('ignore_missing', False)) follow_symlinks = is_affirmative(instance.get('follow_symlinks', True)) custom_tags = instance.get('tags', []) - max_filegauge_count = instance.get('max_filegauge_count', MAX_FILEGAUGE_COUNT) + max_filegauge_count = instance.get('max_filegauge_count', self.MAX_FILEGAUGE_COUNT) if not exists(abs_directory): msg = ( From 8ec828f43e0b478d03f874ab1551aa55200711c5 Mon Sep 17 00:00:00 2001 From: draav Date: Mon, 8 Jun 2020 18:31:33 -0400 Subject: [PATCH 3/3] remove extra space --- directory/datadog_checks/directory/directory.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/directory/datadog_checks/directory/directory.py b/directory/datadog_checks/directory/directory.py index 97fffcbd9d300..e23c931d955eb 100644 --- a/directory/datadog_checks/directory/directory.py +++ b/directory/datadog_checks/directory/directory.py @@ -42,7 +42,6 @@ def check(self, instance): abs_directory = abspath(directory) name = instance.get('name', directory) - pattern = instance.get('pattern') exclude_dirs = instance.get('exclude_dirs', []) exclude_dirs_pattern = re_compile('|'.join(exclude_dirs)) if exclude_dirs else None @@ -56,7 +55,7 @@ def check(self, instance): follow_symlinks = is_affirmative(instance.get('follow_symlinks', True)) custom_tags = instance.get('tags', []) max_filegauge_count = instance.get('max_filegauge_count', self.MAX_FILEGAUGE_COUNT) - + if not exists(abs_directory): msg = ( "Either directory '{}' doesn't exist or the Agent doesn't "