Upd with username and password

infrasonar · Mar 20, 2024 · 4976cbf · 4976cbf
1 parent ec48731
commit 4976cbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/bin/infrasonar b/bin/infrasonar
@@ -14,7 +14,7 @@ from dataclasses import dataclass
 from setproctitle import setproctitle
 from typing import Any, Optional, Dict, List, Tuple
 
-__version__ = '0.1.15'  # Update version in setup as well
+__version__ = '0.1.16'  # Update version in setup as well
 
 
 _labels_example = """
@@ -1354,12 +1354,14 @@ def _unifi_devices(container_id: int, api: str, verify_ssl: bool, token: str,
         port = config.get('port', 443) or 443
         site = config.get('site', 'default') or 'default'
         vssl = config.get('ssl', False)
+        username = config.get('username', '')
+        password = config.get('password', '')
 
         data = asyncio.run(async_get_check_data(api, verify_ssl, asset['id'],
                                                 token, ucontroller,
                                                 'device'))
         for device in data['data']['device']:
-            device['_parent'] = (address, port, site, vssl)
+            device['_parent'] = (address, port, site, vssl, username, password)
             device_map[device['name'].upper()] = device  # name=guid
 
         asyncio.run(asyncio.sleep(0.5))
@@ -1430,7 +1432,7 @@ def _unifi_devices(container_id: int, api: str, verify_ssl: bool, token: str,
             asset['id'], name = not_installed[name.lower()]
 
         asset['name'] = name
-        asset['collectors'] = [{
+        cnf = {
             'key': udevice,
             'config': {
                 'controller': device['_parent'][0],
@@ -1439,7 +1441,11 @@ def _unifi_devices(container_id: int, api: str, verify_ssl: bool, token: str,
                 'mac': device['name'].upper(),
                 'ssl': device['_parent'][3],
             },
-        }]
+        }
+        if ucontroller == 'unificontrollersvc':
+            cnf['config']['username'] = device['_parent'][4]
+            cnf['config']['password'] = device['_parent'][5]
+        asset['collectors'] = [cnf]
         assets.append(asset)
     return assets, total
 

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name='infrasonar',
-    version='0.1.15',  # Update version in infrasonar as well
+    version='0.1.16',  # Update version in infrasonar as well
     description='InfraSonar Toolkit',
     url='https://github.com/infrasonar/toolkit',
     long_description=long_description,