Remove deprecated config options from spec and updated conf.yaml

Author: albertvaka

disk/assets/configuration/spec.yaml

@@ -34,9 +34,6 @@ files:
                 type: array
                 items:
                   type: string
-          - name: file_system_whitelist
-            description: |
-              Deprecated, use file_system_include instead.
           - name: file_system_exclude
             description: |
               Instruct the check to not collect from matching file systems.
@@ -57,9 +54,6 @@ files:
               type: array
               items:
                 type: string
-          - name: file_system_blacklist
-            description: |
-              Deprecated, use file_system_exclude instead.
           - name: device_include
             description: |
                 Instruct the check to only collect from matching devices.
@@ -74,9 +68,6 @@ files:
               type: array
               items:
                 type: string
-          - name: device_whitelist
-            description: |
-              Deprecated, use device_include instead.
           - name: device_exclude
             description: |
               Instruct the check to not collect from matching devices.
@@ -93,9 +84,6 @@ files:
               type: array
               items:
                 type: string
-          - name: device_blacklist
-            description: |
-              Deprecated, use device_exclude instead.
           - name: mount_point_include
             description: |
                Instruct the check to only collect from matching mount points.
@@ -110,9 +98,6 @@ files:
               type: array
               items:
                 type: string
-          - name: mount_point_whitelist
-            description: |
-              Deprecated, use mount_point_include instead.
           - name: mount_point_exclude
             description: |
               Instruct the check to not collect from matching mount points.
@@ -128,9 +113,6 @@ files:
               type: array
               items:
                 type: string
-          - name: mount_point_blacklist
-            description: |
-              Deprecated, use mount_point_exclude instead.
           - name: include_all_devices
             description: |
               Instruct the check to collect from all devices, including non-physical devices.

disk/datadog_checks/disk/data/conf.yaml.default

@@ -26,18 +26,18 @@ instances:
     #   - <KEY_1>:<VALUE_1>
     #   - <KEY_2>:<VALUE_2>
 
-    ## @param file_system_whitelist - list of strings - optional
+    ## @param file_system_include - list of strings - optional
     ## Instruct the check to only collect from matching file systems.
     ##
     ## Character casing is ignored. For convenience, the regular expressions
     ## start matching from the beginning and therefore to match anywhere you
     ## must prepend `.*`. For exact matches append `$`.
     #
-    # file_system_whitelist:
+    # file_system_include:
     #   - ext[34]$
     #   - ntfs$
 
-    ## @param file_system_blacklist - list of strings - optional
+    ## @param file_system_exclude - list of strings - optional
     ## Instruct the check to not collect from matching file systems.
     ##
     ## Character casing is ignored. For convenience, the regular expressions
@@ -47,56 +47,56 @@ instances:
     ## Devices from pseudo or memory-based file systems can be excluded by disabling the
     ## `include_all_devices` option.
     ##
-    ## When conflicts arise, this will override `file_system_whitelist`.
+    ## When conflicts arise, this will override `file_system_include`.
     #
-    # file_system_blacklist:
+    # file_system_exclude:
     #   - tmpfs$
     #   - rootfs$
     #   - autofs$
 
-    ## @param device_whitelist - list of strings - optional
+    ## @param device_include - list of strings - optional
     ## Instruct the check to only collect from matching devices.
     ##
     ## Character casing is ignored on Windows. For convenience, the regular
     ## expressions start matching from the beginning and therefore to match
     ## anywhere you must prepend `.*`. For exact matches append `$`.
     #
-    # device_whitelist:
+    # device_include:
     #   - /dev/sda[1-3]
     #   - 'C:'
 
-    ## @param device_blacklist - list of strings - optional
+    ## @param device_exclude - list of strings - optional
     ## Instruct the check to not collect from matching devices.
     ##
     ## Character casing is ignored on Windows. For convenience, the regular
     ## expressions start matching from the beginning and therefore to match
     ## anywhere you must prepend `.*`. For exact matches append `$`.
     ##
-    ## When conflicts arise, this will override `device_whitelist`.
+    ## When conflicts arise, this will override `device_include`.
     #
-    # device_blacklist:
+    # device_exclude:
     #   - /dev/sde
     #   - '[FJ]:'
 
-    ## @param mount_point_whitelist - list of strings - optional
+    ## @param mount_point_include - list of strings - optional
     ## Instruct the check to only collect from matching mount points.
     ##
     ## Character casing is ignored on Windows. For convenience, the regular
     ## expressions start matching from the beginning and therefore to match
     ## anywhere you must prepend `.*`. For exact matches append `$`.
     #
-    # mount_point_whitelist:
+    # mount_point_include:
     #   - /dev/sda[1-3]
     #   - 'C:'
 
-    ## @param mount_point_blacklist - list of strings - optional
+    ## @param mount_point_exclude - list of strings - optional
     ## Instruct the check to not collect from matching mount points.
     ##
     ## Character casing is ignored on Windows. For convenience, the regular
     ## expressions start matching from the beginning and therefore to match
     ## anywhere you must prepend `.*`. For exact matches append `$`.
     #
-    # mount_point_blacklist:
+    # mount_point_exclude:
     #   - /proc/sys/fs/binfmt_misc
     #   - /dev/sde
     #   - '[FJ]:'