Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

View File

@ -5,7 +5,6 @@ import json
import http.client
import subprocess
import re
import shutil
NON_UPDATABLE_KEYS = [
'server_type',
@ -29,7 +28,6 @@ class ServerData:
self.hostname = os.uname().nodename
self.public_ip = self.get_public_ip()
self.dmidecode_data = self.parse_dmidecode_output()
self.hdparm_data = self.parse_hdparm_output()
logging.basicConfig(level=logging.INFO)
def parse_dmidecode_output(self):
@ -93,69 +91,14 @@ class ServerData:
pass
return []
def parse_hdparm_output(self):
devices = {}
# Check if hdparm exists
if shutil.which('hdparm') is None:
logging.error("hdparm not found")
return devices
# Get the list of devices
try:
device_list = subprocess.check_output(['lsblk', '-d', '-o', 'NAME'], stderr=subprocess.STDOUT, universal_newlines=True).split()[1:]
except subprocess.CalledProcessError as e:
logging.error("Failed to get device list: {}".format(e))
return devices
for device in device_list:
# Only get details of devices that start with 'sd': sda, sdb, etc.
if not device.startswith('sd'):
continue
device = '/dev/' + device
try:
# Get the output
output = subprocess.check_output(['hdparm', '-I', device], stderr=subprocess.STDOUT, universal_newlines=True)
except subprocess.CalledProcessError as e:
logging.error("Failed to get hdparm output for {}: {}".format(device, e))
continue
# Parse the output
details = {}
details['model_number'] = re.search(r'Model Number:\s*(.*)', output).group(1)
details['serial_number'] = re.search(r'Serial Number:\s*(.*)', output).group(1)
details['firmware_revision'] = re.search(r'Firmware Revision:\s*(.*)', output).group(1)
details['transport'] = re.search(r'Transport:\s*(.*)', output).group(1)
details['checksum'] = re.search(r'Checksum:\s*(.*)', output).group(1)
details['buffer_size'] = re.search(r'cache/buffer size\s*=\s*(.*)', output).group(1)
details['form_factor'] = re.search(r'Form Factor:\s*(.*)', output).group(1)
devices[device] = details
return devices
def get_ram_and_disk(self):
# RAM information
with open('/proc/meminfo', 'r') as f:
meminfo = f.read()
ram = int([x for x in meminfo.split('\n') if 'MemTotal' in x][0].split()[1]) // 1024
# Disk space information
disk = 0
for device in os.listdir('/sys/block'):
device_path = '/sys/block/{}/device'.format(device)
size_path = '/sys/block/{}/size'.format(device)
if not os.path.islink(device_path):
continue
try:
with open(size_path, 'r') as f:
size = int(f.read().strip())
disk += size
except Exception:
pass
disk = disk * 512 // (1024**3) # convert to GB
logging.info("RAM: {}MB, Disk: {}GB".format(ram, disk))
with open('/proc/diskstats', 'r') as f:
diskstats = f.read()
disk = sum(int(x.split()[9]) for x in diskstats.split('\n') if x) * 512 // 10**9
logging.info(f"RAM: {ram}MB, Disk: {disk}GB")
return ram, disk
def get_cpu_count(self):
@ -169,12 +112,12 @@ class ServerData:
with open('/proc/cpuinfo', 'r') as f:
cpuinfo = f.read()
cpu_count = cpuinfo.count('processor')
logging.info("CPU Count: {}".format(cpu_count))
logging.info(f"CPU Count: {cpu_count}")
return cpu_count
def get_bandwidth(self):
bandwidth = 2000
logging.info("Bandwidth: {}".format(bandwidth))
logging.info(f"Bandwidth: {bandwidth}")
return bandwidth
def get_public_ip(self):
@ -182,12 +125,12 @@ class ServerData:
response = urllib.request.urlopen('https://api.ipify.org')
return response.read().decode()
except Exception as e:
logging.error("Failed to get public IP: {}".format(e))
logging.error(f"Failed to get public IP: {e}")
return '127.0.0.1'
def get_os(self):
os_id = 27
logging.info("OS ID: {}".format(os_id))
logging.info(f"OS ID: {os_id}")
return os_id
def create_post_data(self):
@ -248,15 +191,9 @@ class ServerData:
serial_number = ram.get('Serial Number', 'Unknown')
ram_type = ram.get('Type', 'Unknown')
ram_details.append("Size: {}, Speed: {} @ {}, ECC: {}, Serial Number: {}, Type: {}".format(size, speed, configured_speed, ecc, serial_number, ram_type))
# SATA Storage media
sata_details = []
for device, details in self.hdparm_data.items():
sata_details.append("Device: {}, Model: {}, Serial: {}, Checksum: {}, Buffer Size: {}, Form Factor: {}".format(
device, details['model_number'], details['serial_number'], details['checksum'], details['buffer_size'], details['form_factor']))
note = "Chassis Model: {} | Serial Number: {} ||| Processor Model: {} | Count: {} ||| RAM Details: {} ||| SATA Details {}".format(
chassis_model, chassis_serial, processor_model, processor_count, ' | '.join(ram_details), ' | '.join(sata_details))
note = "Chassis Model: {} | Serial Number: {} ||| Processor Model: {} | Count: {} ||| RAM Details: {}".format(
chassis_model, chassis_serial, processor_model, processor_count, ' | '.join(ram_details))
note_data = {
'note': note,
@ -286,7 +223,7 @@ class ServerManager:
else:
return response.read().decode()
except urllib.error.HTTPError as e:
logging.error("Request failed with {}".format(e))
logging.error(f"Request failed with {e}")
raise
def get_existing_servers(self):
@ -300,7 +237,7 @@ class ServerManager:
return self.send_request('POST', '/api/notes', post_data)
def update_note(self, post_data, service_id):
logging.info("Updating note with id {}...".format(service_id))
logging.info(f"Updating note with id {service_id}...")
return self.send_request('PUT', '/api/notes/' + str(service_id), post_data)
def create_server(self, post_data):
@ -311,7 +248,7 @@ class ServerManager:
# remove following keys from post_data
for key in NON_UPDATABLE_KEYS:
post_data.pop(key, None)
logging.info("Updating server with id {}...".format(server_id))
logging.info(f"Updating server with id {server_id}...")
return self.send_request('PUT', '/api/servers/' + str(server_id), post_data)
def existing_server_id(self, post_data):