Adhere to code style (#3500)

Author: ofek

disk/datadog_checks/disk/__init__.py

@@ -4,7 +4,4 @@
 from .__about__ import __version__
 from .disk import Disk
 
-__all__ = [
-    '__version__',
-    'Disk'
-]
+__all__ = ['__version__', 'Disk']

disk/datadog_checks/disk/disk.py

@@ -9,27 +9,30 @@
 
 from six import iteritems, string_types
 
+from datadog_checks.base import AgentCheck, ConfigurationError, is_affirmative
+from datadog_checks.base.utils.platform import Platform
+from datadog_checks.base.utils.subprocess_output import get_subprocess_output
+from datadog_checks.base.utils.timeout import TimeoutException, timeout
+
 try:
     import psutil
 except ImportError:
     psutil = None
 
 try:
     import datadog_agent  # noqa: F401
+
     is_agent_6 = True
 except ImportError:
     is_agent_6 = False
 
-from datadog_checks.base import AgentCheck, ConfigurationError, is_affirmative
-from datadog_checks.base.utils.platform import Platform
-from datadog_checks.base.utils.subprocess_output import get_subprocess_output
-from datadog_checks.base.utils.timeout import timeout, TimeoutException
 
 IGNORE_CASE = re.I if platform.system() == 'Windows' else 0
 
 
 class Disk(AgentCheck):
     """ Collects metrics about the machine's disks. """
+
     # -T for filesystem info
     DF_COMMAND = ['df', '-T']
     METRIC_DISK = 'system.disk.{}'
@@ -106,8 +109,7 @@ def collect_metrics_psutil(self):
                 disk_usage = timeout(5)(psutil.disk_usage)(part.mountpoint)
             except TimeoutException:
                 self.log.warning(
-                    u'Timeout while retrieving the disk usage of `%s` mountpoint. Skipping...',
-                    part.mountpoint
+                    u'Timeout while retrieving the disk usage of `%s` mountpoint. Skipping...', part.mountpoint
                 )
                 continue
             except Exception as e:
@@ -145,15 +147,10 @@ def collect_metrics_psutil(self):
                 rwro = {'rw', 'ro'} & set(part.opts.split(','))
                 if len(rwro) == 1:
                     self.service_check(
-                        'disk.read_write',
-                        AgentCheck.OK if rwro.pop() == 'rw' else AgentCheck.CRITICAL,
-                        tags=tags
+                        'disk.read_write', AgentCheck.OK if rwro.pop() == 'rw' else AgentCheck.CRITICAL, tags=tags
                     )
                 else:
-                    self.service_check(
-                        'disk.read_write', AgentCheck.UNKNOWN,
-                        tags=tags
-                    )
+                    self.service_check('disk.read_write', AgentCheck.UNKNOWN, tags=tags)
 
         self.collect_latency_metrics()
 
@@ -184,9 +181,8 @@ def _exclude_disk(self, device, file_system, mount_point):
         # account a space might be in the mount point.
         mount_point = mount_point.rsplit(' ', 1)[0]
 
-        return (
-            self._partition_blacklisted(device, file_system, mount_point)
-            or not self._partition_whitelisted(device, file_system, mount_point)
+        return self._partition_blacklisted(device, file_system, mount_point) or not self._partition_whitelisted(
+            device, file_system, mount_point
         )
 
     def _partition_whitelisted(self, device, file_system, mount_point):
@@ -260,10 +256,7 @@ def _collect_inodes_metrics(self, mountpoint):
         try:
             inodes = timeout(5)(os.statvfs)(mountpoint)
         except TimeoutException:
-            self.log.warning(
-                u'Timeout while retrieving the disk usage of `%s` mountpoint. Skipping...',
-                mountpoint
-            )
+            self.log.warning(u'Timeout while retrieving the disk usage of `%s` mountpoint. Skipping...', mountpoint)
             return metrics
         except Exception as e:
             self.log.warning('Unable to get disk metrics for %s: %s', mountpoint, e)
@@ -291,10 +284,8 @@ def collect_latency_metrics(self):
                 write_time_pct = disk.write_time * 100 / 1000
                 metric_tags = [] if self._custom_tags is None else self._custom_tags[:]
                 metric_tags.append('device:{}'.format(disk_name))
-                self.rate(self.METRIC_DISK.format('read_time_pct'),
-                          read_time_pct, tags=metric_tags)
-                self.rate(self.METRIC_DISK.format('write_time_pct'),
-                          write_time_pct, tags=metric_tags)
+                self.rate(self.METRIC_DISK.format('read_time_pct'), read_time_pct, tags=metric_tags)
+                self.rate(self.METRIC_DISK.format('write_time_pct'), write_time_pct, tags=metric_tags)
             except AttributeError as e:
                 # Some OS don't return read_time/write_time fields
                 # http://psutil.readthedocs.io/en/latest/#psutil.disk_io_counters
@@ -348,7 +339,8 @@ def _keep_device(self, device):
         #    map -hosts    tmpfs            0        0         0   100%    /net
         # and finally filter out fake devices
         return (
-            device and len(device) > 1
+            device
+            and len(device) > 1
             and device[2].isdigit()
             and not self._exclude_disk(device[0], device[1], device[6])
         )
@@ -399,9 +391,7 @@ def _compile_pattern_filters(self, instance):
             self.warning(deprecation_message.format(old='excluded_filesystems', new='file_system_blacklist'))
 
         if 'excluded_disks' in instance:
-            device_blacklist_extras.extend(
-                '{}$'.format(pattern) for pattern in instance['excluded_disks'] if pattern
-            )
+            device_blacklist_extras.extend('{}$'.format(pattern) for pattern in instance['excluded_disks'] if pattern)
             self.warning(deprecation_message.format(old='excluded_disks', new='device_blacklist'))
 
         if 'excluded_disk_re' in instance:
@@ -415,19 +405,15 @@ def _compile_pattern_filters(self, instance):
         # Any without valid patterns will become None
         self._file_system_whitelist = self._compile_valid_patterns(self._file_system_whitelist, casing=re.I)
         self._file_system_blacklist = self._compile_valid_patterns(
-            self._file_system_blacklist,
-            casing=re.I,
-            extra_patterns=file_system_blacklist_extras
+            self._file_system_blacklist, casing=re.I, extra_patterns=file_system_blacklist_extras
         )
         self._device_whitelist = self._compile_valid_patterns(self._device_whitelist)
         self._device_blacklist = self._compile_valid_patterns(
-            self._device_blacklist,
-            extra_patterns=device_blacklist_extras
+            self._device_blacklist, extra_patterns=device_blacklist_extras
         )
         self._mount_point_whitelist = self._compile_valid_patterns(self._mount_point_whitelist)
         self._mount_point_blacklist = self._compile_valid_patterns(
-            self._mount_point_blacklist,
-            extra_patterns=mount_point_blacklist_extras
+            self._mount_point_blacklist, extra_patterns=mount_point_blacklist_extras
         )
 
     def _compile_valid_patterns(self, patterns, casing=IGNORE_CASE, extra_patterns=None):
@@ -465,10 +451,7 @@ def _compile_tag_re(self):
         device_tag_list = []
         for regex_str, tags in iteritems(self._device_tag_re):
             try:
-                device_tag_list.append([
-                    re.compile(regex_str, IGNORE_CASE),
-                    [t.strip() for t in tags.split(',')]
-                ])
+                device_tag_list.append([re.compile(regex_str, IGNORE_CASE), [t.strip() for t in tags.split(',')]])
             except TypeError:
                 self.log.warning('{} is not a valid regular expression and will be ignored'.format(regex_str))
         self._device_tag_re = device_tag_list

disk/setup.py

@@ -1,10 +1,11 @@
 # (C) Datadog, Inc. 2018
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from setuptools import setup
 from codecs import open  # To use a consistent encoding
 from os import path
 
+from setuptools import setup
+
 HERE = path.abspath(path.dirname(__file__))
 
 # Get version info
@@ -33,17 +34,13 @@ def get_requirements(fpath):
     long_description=long_description,
     long_description_content_type='text/markdown',
     keywords='datadog agent disk check',
-
     # The project's main homepage.
     url='https://github.com/DataDog/integrations-core',
-
     # Author details
     author='Datadog',
     author_email='packages@datadoghq.com',
-
     # License
     license='MIT',
-
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -54,13 +51,10 @@ def get_requirements(fpath):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
     ],
-
     # The package we're going to ship
     packages=['datadog_checks.disk'],
-
     # Run-time dependencies
     install_requires=[CHECKS_BASE_REQ],
-
     # Extra files to ship with the wheel package
     include_package_data=True,
 )

disk/tests/conftest.py

@@ -5,6 +5,7 @@
 import pytest
 
 from datadog_checks.dev.utils import ON_WINDOWS, mock_context_manager
+
 from .metrics import CORE_GAUGES, CORE_RATES, UNIX_GAUGES
 from .mocks import MockDiskIOMetrics, MockDiskMetrics, MockInodesMetrics, MockPart
 
@@ -16,11 +17,9 @@ def psutil_mocks():
     else:
         mock_statvfs = mock.patch('os.statvfs', return_value=MockInodesMetrics(), __name__='statvfs')
 
-    with \
-            mock.patch('psutil.disk_partitions', return_value=[MockPart()], __name__='disk_partitions'), \
-            mock.patch('psutil.disk_usage', return_value=MockDiskMetrics(), __name__='disk_usage'), \
-            mock.patch('psutil.disk_io_counters', return_value=MockDiskIOMetrics()), \
-            mock_statvfs:
+    with mock.patch('psutil.disk_partitions', return_value=[MockPart()], __name__='disk_partitions'), mock.patch(
+        'psutil.disk_usage', return_value=MockDiskMetrics(), __name__='disk_usage'
+    ), mock.patch('psutil.disk_io_counters', return_value=MockDiskIOMetrics()), mock_statvfs:
         yield
 
 
@@ -31,16 +30,12 @@ def dd_environment(instance_basic_volume):
 
 @pytest.fixture(scope='session')
 def instance_basic_volume():
-    return {
-        'use_mount': 'false',
-    }
+    return {'use_mount': 'false'}
 
 
 @pytest.fixture(scope='session')
 def instance_basic_mount():
-    return {
-        'use_mount': 'true',
-    }
+    return {'use_mount': 'true'}
 
 
 @pytest.fixture(scope='session')

disk/tests/metrics.py

@@ -1,20 +1,12 @@
 # (C) Datadog, Inc. 2018
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-CORE_GAUGES = {
-    'system.disk.total': 5,
-    'system.disk.used': 4,
-    'system.disk.free': 1,
-    'system.disk.in_use': .80,
-}
-CORE_RATES = {
-    'system.disk.write_time_pct': 9.0,
-    'system.disk.read_time_pct': 5.0,
-}
+CORE_GAUGES = {'system.disk.total': 5, 'system.disk.used': 4, 'system.disk.free': 1, 'system.disk.in_use': 0.80}
+CORE_RATES = {'system.disk.write_time_pct': 9.0, 'system.disk.read_time_pct': 5.0}
 UNIX_GAUGES = {
     'system.fs.inodes.total': 10,
     'system.fs.inodes.used': 1,
     'system.fs.inodes.free': 9,
-    'system.fs.inodes.in_use': .10
+    'system.fs.inodes.in_use': 0.10,
 }
 UNIX_GAUGES.update(CORE_GAUGES)

disk/tests/mocks.py

@@ -17,11 +17,7 @@ def mock_df_output(fname):
 
 class MockPart(object):
     def __init__(
-        self,
-        device=DEFAULT_DEVICE_NAME,
-        fstype=DEFAULT_FILE_SYSTEM,
-        mountpoint=DEFAULT_MOUNT_POINT,
-        opts='ro'
+        self, device=DEFAULT_DEVICE_NAME, fstype=DEFAULT_FILE_SYSTEM, mountpoint=DEFAULT_MOUNT_POINT, opts='ro'
     ):
         self.device = device
         self.fstype = fstype