Fix error handling when Agent has no sudo access (DataDog#8470)

kkourtchikov · Jan 27, 2021 · effeb0f · effeb0f
1 parent 0123c38
commit effeb0f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/glusterfs/datadog_checks/glusterfs/check.py b/glusterfs/datadog_checks/glusterfs/check.py
@@ -53,9 +53,11 @@ def __init__(self, name, init_config, instances):
 
     def check(self, _):
         if self.use_sudo:
-            test_sudo, err, rcode = get_subprocess_output(['sudo', '-ln', self.gstatus_cmd], self.log)
-            if rcode != 0:
-                raise Exception('The dd-agent user does not have sudo access: %s', err or test_sudo)
+            test_sudo, err, rcode = get_subprocess_output(
+                ['sudo', '-ln', self.gstatus_cmd], self.log, raise_on_empty_output=False
+            )
+            if rcode != 0 or not test_sudo:
+                raise Exception('The dd-agent user does not have sudo access: {!r}'.format(err or test_sudo))
             gluster_args = 'sudo {}'.format(self.gstatus_cmd)
         else:
             gluster_args = self.gstatus_cmd