getting os details with /api/os
This commit is contained in:
parent
a07225a0eb
commit
8253e5fc51
80
agent.py
80
agent.py
|
@ -241,16 +241,77 @@ class ServerData:
|
|||
logging.error("Failed to get public IP: {}".format(e))
|
||||
return '127.0.0.1'
|
||||
|
||||
def get_os(self):
|
||||
os_id = 27
|
||||
logging.info("OS ID: {}".format(os_id))
|
||||
return os_id
|
||||
def get_os_release_info(self):
|
||||
os_release_info = {}
|
||||
|
||||
# reading from /etc/os-release
|
||||
try:
|
||||
with open('/etc/os-release') as f:
|
||||
lines = f.read().splitlines()
|
||||
os_release_info = {line.split('=')[0]: line.split('=')[1].strip('"') for line in lines if '=' in line}
|
||||
except FileNotFoundError:
|
||||
logging.warning("/etc/os-release not found, trying /etc/VERSION")
|
||||
except Exception as e:
|
||||
logging.error("Failed to read /etc/os-release: {}".format(e))
|
||||
return {}
|
||||
|
||||
def create_post_data(self):
|
||||
# If /etc/os-release is not found or empty, fallback to /etc/VERSION
|
||||
if not os_release_info:
|
||||
try:
|
||||
with open('/etc/VERSION') as f:
|
||||
lines = f.read().splitlines()
|
||||
for line in lines:
|
||||
if '=' in line:
|
||||
key, value = line.split('=', 1)
|
||||
os_release_info[key.strip()] = value.strip()
|
||||
except Exception as e:
|
||||
logging.error("Failed to read /etc/VERSION: {}".format(e))
|
||||
return {}
|
||||
|
||||
return os_release_info
|
||||
|
||||
|
||||
def get_os_id(self, os_list):
|
||||
os_info = self.get_os_release_info()
|
||||
|
||||
if not os_info:
|
||||
logging.error("No OS release info found.")
|
||||
for os_entry in os_list:
|
||||
if os_entry['name'].lower() in ["other", "custom"]:
|
||||
return os_entry['id']
|
||||
return 1
|
||||
|
||||
if 'ID' in os_info and 'VERSION_ID' in os_info:
|
||||
current_os = (os_info.get('ID', 'Unknown') + " " + os_info.get('VERSION_ID', '').strip()).strip()
|
||||
else:
|
||||
current_os = (os_info.get('os_name', 'Unknown') +" "+ os_info.get('productversion', '').strip()).strip().lower()
|
||||
|
||||
for os_entry in os_list:
|
||||
if current_os in os_entry['name'].lower():
|
||||
return os_entry['id']
|
||||
|
||||
# Fallback checks for common OS names if full name doesn't match
|
||||
for os_entry in os_list:
|
||||
if 'ubuntu' in current_os and 'ubuntu' in os_entry['name'].lower():
|
||||
return os_entry['id']
|
||||
elif 'centos' in current_os and 'centos' in os_entry['name'].lower():
|
||||
return os_entry['id']
|
||||
elif 'fedora' in current_os and 'fedora' in os_entry['name'].lower():
|
||||
return os_entry['id']
|
||||
|
||||
# Default to 'other' or 'custom' if no match found
|
||||
for os_entry in os_list:
|
||||
if os_entry['name'].lower() in ["other", "custom"]:
|
||||
return os_entry['id']
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
def create_post_data(self, os_list):
|
||||
ram, disk = self.get_ram_and_disk()
|
||||
post_data = {
|
||||
"server_type": 1,
|
||||
"os_id": self.get_os(),
|
||||
"os_id": self.get_os_id(os_list),
|
||||
"provider_id": 10,
|
||||
"location_id": 15,
|
||||
"ssh_port": 22,
|
||||
|
@ -418,6 +479,11 @@ class ServerManager:
|
|||
return self.update_note(note_data, server_id)
|
||||
else:
|
||||
return self.create_note(note_data)
|
||||
|
||||
def get_os_list(self):
|
||||
os_list = self.send_request('GET', '/api/os')
|
||||
logging.info("OS list fetched successfully") if os_list else logging.error("Failed to fetch OS list")
|
||||
return os_list or []
|
||||
|
||||
def validate_env_vars():
|
||||
api_key = os.getenv('AGENT_API')
|
||||
|
@ -441,6 +507,8 @@ def main():
|
|||
server_id = server_manager.upsert_server(post_data)
|
||||
logging.info('Server id: {}'.format(server_id))
|
||||
|
||||
os_list = server_manager.get_os_list()
|
||||
|
||||
note_data = server_data.create_note_data()
|
||||
server_manager.upsert_note(note_data, server_id)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user