diff --git a/app.py b/app.py index 14edeba..4cb76c2 100644 --- a/app.py +++ b/app.py @@ -47,7 +47,7 @@ def send_webhook(device, status, diagnostics): class UnifiAPI: def __init__(self, config): self.base_url = config['unifi']['controller'] - self.site_id = "1647955405" # Fixed site ID + self.site_id = "1647955405" self.session = requests.Session() self.session.verify = False self.headers = { @@ -56,25 +56,31 @@ class UnifiAPI: } def get_all_devices(self): - url = f"{self.base_url}/integration/v1/sites/{self.site_id}/devices" + url = f"{self.base_url}/proxy/network/api/s/{self.site_id}/stat/device" response = self.session.get(url, headers=self.headers) response.raise_for_status() - devices = response.json()['data'] - # Map IP addresses to device IDs - self.device_map = {device['ipAddress']: device['id'] for device in devices} - return devices + logger.debug(f"Raw device list response: {response.text}") + return response.json()['data'] - def get_device_details(self, ip_address): - device_id = self.device_map.get(ip_address) - if not device_id: - self.get_all_devices() # Refresh device map - device_id = self.device_map.get(ip_address) - - url = f"{self.base_url}/integration/v1/sites/{self.site_id}/devices/{device_id}" + def get_device_details(self, device_id): + url = f"{self.base_url}/proxy/network/api/s/{self.site_id}/stat/device/{device_id}" response = self.session.get(url, headers=self.headers) response.raise_for_status() - return response.json() - + logger.debug(f"Raw device details response: {response.text}") + data = response.json()['data'][0] + return { + 'state': data['state'], + 'firmware': { + 'version': data['version'], + 'updatable': data.get('upgradable', False) + }, + 'network': { + 'ip': data['ip'], + 'mac': data['mac'] + }, + 'interfaces': self._parse_interfaces(data.get('port_table', {})) + } + def get_device_diagnostics(self, device): details = self.get_device_details(device['ip']) if not details: @@ -116,8 +122,7 @@ class UnifiAPI: 'width': f"{radio['channelWidthMHz']}MHz" } - return result -# Monitoring functions + return result# Monitoring functions def run_diagnostics(device): try: config = load_config()