Merge branch 'master' into fernandorodriguezcdatadog-patch-1

Author: fernandorodriguezcdatadog

nfsstat/assets/configuration/spec.yaml

@@ -23,6 +23,14 @@ files:
     - template: init_config/default
   - template: instances
     options:
+    - name: disable_missing_mountpoints_warning
+      required: false
+      description: |
+        If false, no warning is logged if host has check enabled but no NFS mount point is found.
+      value:
+        type: boolean
+        default: false
+        example: false
     - template: instances/default
   - template: logs
     example:

nfsstat/changelog.d/19916.added

@@ -0,0 +1 @@
++ Add option to disable missing mountpoints warning

nfsstat/datadog_checks/nfsstat/config_models/defaults.py

@@ -16,6 +16,10 @@ def instance_disable_generic_tags():
     return False
 
 
+def instance_disable_missing_mountpoints_warning():
+    return False
+
+
 def instance_empty_default_hostname():
     return False
 

nfsstat/datadog_checks/nfsstat/config_models/instance.py

@@ -35,6 +35,7 @@ class InstanceConfig(BaseModel):
         frozen=True,
     )
     disable_generic_tags: Optional[bool] = None
+    disable_missing_mountpoints_warning: Optional[bool] = None
     empty_default_hostname: Optional[bool] = None
     metric_patterns: Optional[MetricPatterns] = None
     min_collection_interval: Optional[float] = None

nfsstat/datadog_checks/nfsstat/data/conf.yaml.example

@@ -27,6 +27,11 @@ init_config:
 instances:
 
   -
+    ## @param disable_missing_mountpoints_warning - boolean - optional - default: false
+    ## If false, no warning is logged if host has check enabled but no NFS mount point is found.
+    #
+    # disable_missing_mountpoints_warning: false
+
     ## @param tags - list of strings - optional
     ## A list of tags to attach to every metric and service check emitted by this instance.
     ##

nfsstat/datadog_checks/nfsstat/nfsstat.py

@@ -31,6 +31,9 @@ def __init__(self, name, init_config, instances):
                     '(through nfs-utils) or set the path to the installed version'
                 )
         self.autofs_enabled = is_affirmative(init_config.get('autofs_enabled', False))
+        self.disable_missing_mountpoints_warning = is_affirmative(
+            self.instance.get('disable_missing_mountpoints_warning', False)
+        )
 
     def check(self, instance):
         stat_out, err, _ = get_subprocess_output(self.nfs_cmd, self.log)
@@ -41,7 +44,8 @@ def check(self, instance):
 
         if 'No NFS mount point' in stats[0]:
             if not self.autofs_enabled:
-                self.warning("No NFS mount points were found.")
+                if not self.disable_missing_mountpoints_warning:
+                    self.warning("No NFS mount points were found.")
             else:
                 self.log.debug("AutoFS enabled: no mount points currently.")
             return