support username as alternative to user

DataDog · May 12, 2021 · 37caab5 · 37caab5
1 parent dea6910
commit 37caab5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/clickhouse/datadog_checks/clickhouse/clickhouse.py b/clickhouse/datadog_checks/clickhouse/clickhouse.py
@@ -21,7 +21,7 @@ def __init__(self, name, init_config, instances):
         self._server = self.instance.get('server', '')
         self._port = self.instance.get('port')
         self._db = self.instance.get('db', 'default')
-        self._user = self.instance.get('user', 'default')
+        self._user = self.instance.get('user', self.instance.get('username', 'default'))
         self._password = self.instance.get('password', '')
         self._connect_timeout = float(self.instance.get('connect_timeout', 10))
         self._read_timeout = float(self.instance.get('read_timeout', 10))

diff --git a/oracle/datadog_checks/oracle/oracle.py b/oracle/datadog_checks/oracle/oracle.py
@@ -38,7 +38,7 @@ class Oracle(AgentCheck):
     def __init__(self, name, init_config, instances):
         super(Oracle, self).__init__(name, init_config, instances)
         self._server = self.instance.get('server')
-        self._user = self.instance.get('user')
+        self._user = self.instance.get('user') or self.instance.get('username')
         self._password = self.instance.get('password')
         self._service = self.instance.get('service_name')
         self._jdbc_driver = self.instance.get('jdbc_driver_path')

diff --git a/snowflake/datadog_checks/snowflake/config.py b/snowflake/datadog_checks/snowflake/config.py
@@ -26,7 +26,7 @@ def __init__(self, instance=None):
             instance = {}
 
         account = instance.get('account')
-        user = instance.get('user')
+        user = instance.get('user') or instance.get('username')
         password = instance.get('password')
         role = instance.get('role')
         database = instance.get('database', 'SNOWFLAKE')

diff --git a/supervisord/datadog_checks/supervisord/supervisord.py b/supervisord/datadog_checks/supervisord/supervisord.py
@@ -163,7 +163,7 @@ def check(self, instance):
     @staticmethod
     def _connect(instance):
         sock = instance.get('socket')
-        user = instance.get('user')
+        user = instance.get('user') or instance.get('username')
         password = instance.get('pass') or instance.get('password')
         if sock is not None:
             host = instance.get('host', DEFAULT_SOCKET_IP)