getting os details with /api/os
This commit is contained in:
parent
75744e0010
commit
04671ba669
41
agent.py
41
agent.py
|
@ -234,7 +234,8 @@ class ServerData:
|
||||||
return '127.0.0.1'
|
return '127.0.0.1'
|
||||||
|
|
||||||
def get_os(self):
|
def get_os(self):
|
||||||
os_id = 27
|
server_manager = ServerManager(host, api_key)
|
||||||
|
os_id = server_manager.get_os_id()
|
||||||
logging.info("OS ID: {}".format(os_id))
|
logging.info("OS ID: {}".format(os_id))
|
||||||
return os_id
|
return os_id
|
||||||
|
|
||||||
|
@ -242,7 +243,7 @@ class ServerData:
|
||||||
ram, disk = self.get_ram_and_disk()
|
ram, disk = self.get_ram_and_disk()
|
||||||
post_data = {
|
post_data = {
|
||||||
"server_type": 1,
|
"server_type": 1,
|
||||||
"os_id": self.get_os(),
|
"os_id": self.get_os(host, api_key),
|
||||||
"provider_id": 10,
|
"provider_id": 10,
|
||||||
"location_id": 15,
|
"location_id": 15,
|
||||||
"ssh_port": 22,
|
"ssh_port": 22,
|
||||||
|
@ -404,6 +405,42 @@ class ServerManager:
|
||||||
return self.update_note(note_data, server_id)
|
return self.update_note(note_data, server_id)
|
||||||
else:
|
else:
|
||||||
return self.create_note(note_data)
|
return self.create_note(note_data)
|
||||||
|
|
||||||
|
def get_os_release_info(self):
|
||||||
|
try:
|
||||||
|
with open('/etc/os-release') as f:
|
||||||
|
lines = f.read().splitlines()
|
||||||
|
return {line.split('=')[0]: line.split('=')[1].strip('"') for line in lines if '=' in line}
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("Failed to read /etc/os-release: {}".format(e))
|
||||||
|
return {}
|
||||||
|
|
||||||
|
def get_os_id(self):
|
||||||
|
try:
|
||||||
|
os_list = self.send_request('GET', '/api/os')
|
||||||
|
os_info = self.get_os_release_info()
|
||||||
|
|
||||||
|
if not os_info:
|
||||||
|
logging.error("No OS release info found.")
|
||||||
|
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
|
||||||
|
|
||||||
|
current_os = f"{os_info.get('NAME', 'Unknown')} {os_info.get('VERSION', '').strip()}".strip().lower()
|
||||||
|
|
||||||
|
for os_entry in os_list:
|
||||||
|
if current_os in os_entry['name'].lower():
|
||||||
|
return os_entry['id']
|
||||||
|
|
||||||
|
if 'ubuntu' in current_os:
|
||||||
|
return next(os['id'] for os in os_list if 'ubuntu' in os['name'].lower())
|
||||||
|
elif 'centos' in current_os:
|
||||||
|
return next(os['id'] for os in os_list if 'centos' in os['name'].lower())
|
||||||
|
elif 'fedora' in current_os:
|
||||||
|
return next(os['id'] for os in os_list if 'fedora' in os['name'].lower())
|
||||||
|
|
||||||
|
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("Failed to fetch OS IDs: {}".format(e))
|
||||||
|
return 27 # Default to 'Other' if unable to fetch
|
||||||
|
|
||||||
def validate_env_vars():
|
def validate_env_vars():
|
||||||
api_key = os.getenv('AGENT_API')
|
api_key = os.getenv('AGENT_API')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user