mirror of
https://github.com/Pardus-LiderAhenk/ahenk
synced 2024-11-22 13:12:17 +03:00
system features rollback to psutil 4 abilities
This commit is contained in:
Volkan Şahin
parent
e430cfadb7
commit
1be1ecf72b
4 changed files with 78 additions and 113 deletions
2
debian/control
vendored
2
debian/control
vendored
|
|
@ -8,5 +8,5 @@ Homepage: http://www.liderahenk.org.tr
|
|||
|
||||
Package: ahenk
|
||||
Architecture: any
|
||||
Depends:python3 (>= 3), cython, libidn11, libidn11-dev, slixmpp, python3-dev, python3-pip, libffi-dev, libssl-dev, python3-paramiko, python3-psutil
|
||||
Depends:python3 (>= 3), cython, libidn11, libidn11-dev, slixmpp, python3-dev, python3-pip, libffi-dev, libssl-dev, python3-paramiko, python3-psutil (>= 4)
|
||||
Description: Lider Ahenk is an open source project which provides solutions to manage, monitor and audit unlimited number of different systems and users on a network.
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@ class Registration():
|
|||
'os.distributionVersion': System.Os.distribution_version(),
|
||||
'os.architecture': System.Os.architecture(),
|
||||
'hardware.cpu.architecture': System.Hardware.Cpu.architecture(),
|
||||
# 'hardware.cpu.logicalCoreCount': System.Hardware.Cpu.logical_core_count(),
|
||||
# 'hardware.cpu.physicalCoreCount': System.Hardware.Cpu.physical_core_count(),
|
||||
'hardware.cpu.logicalCoreCount': System.Hardware.Cpu.logical_core_count(),
|
||||
'hardware.cpu.physicalCoreCount': System.Hardware.Cpu.physical_core_count(),
|
||||
'hardware.disk.total': System.Hardware.Disk.total(),
|
||||
'hardware.disk.used': System.Hardware.Disk.used(),
|
||||
'hardware.disk.free': System.Hardware.Disk.free(),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import platform
|
||||
import psutil
|
||||
# import cpuinfo
|
||||
import cpuinfo
|
||||
import re
|
||||
import os
|
||||
import configparser
|
||||
|
|
@ -12,10 +12,12 @@ import socket
|
|||
import fcntl
|
||||
import struct
|
||||
from uuid import getnode as get_mac
|
||||
|
||||
"""
|
||||
some functions closed because of dependency management
|
||||
"""
|
||||
|
||||
|
||||
class System:
|
||||
class Ahenk(object):
|
||||
|
||||
|
|
@ -86,31 +88,18 @@ class System:
|
|||
def process_by_pid(pid):
|
||||
return psutil.Process(pid)
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def pids():
|
||||
return psutil.pids()
|
||||
|
||||
|
||||
|
||||
@staticmethod
|
||||
def find_pid_by_name(p_name):
|
||||
for id in psutil.pids():
|
||||
if psutil.Process(id).name() == p_name:
|
||||
return id
|
||||
return None
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def find_pids_by_name(p_name):
|
||||
arr = []
|
||||
|
||||
for pid in psutil.get_pid_list():
|
||||
if psutil.Process(pid).name==p_name:
|
||||
for pid in psutil.pids():
|
||||
if psutil.Process(id).name() == p_name:
|
||||
arr.append(pid)
|
||||
return arr
|
||||
|
||||
|
||||
@staticmethod
|
||||
def is_running(pid):
|
||||
return psutil.pid_exists(pid)
|
||||
|
|
@ -132,11 +121,9 @@ class System:
|
|||
def path(pid):
|
||||
return psutil.Process(pid).exe()
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def working_directory(pid):
|
||||
return psutil.Process(pid).cwd()
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def command_line(pid):
|
||||
|
|
@ -154,9 +141,6 @@ class System:
|
|||
def create_time(pid):
|
||||
return psutil.Process(pid).create_time()
|
||||
|
||||
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def cpu_times(pid):
|
||||
return psutil.Process(pid).cpu_times()
|
||||
|
|
@ -180,17 +164,14 @@ class System:
|
|||
@staticmethod
|
||||
def threads(pid):
|
||||
return psutil.Process(pid).threads()
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def nice(pid):
|
||||
return psutil.Process(pid).nice()
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def environment(pid):
|
||||
return psutil.Process(pid).environ()
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def details():
|
||||
|
|
@ -198,15 +179,6 @@ class System:
|
|||
|
||||
class Sessions(object):
|
||||
|
||||
@staticmethod
|
||||
def user_name():
|
||||
arr = []
|
||||
for user in psutil.get_users():
|
||||
if str(user[0]) is not 'None' and user[0] not in arr:
|
||||
arr.append(user[0])
|
||||
return arr
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def user_name():
|
||||
arr = []
|
||||
|
|
@ -219,27 +191,30 @@ class System:
|
|||
def user_details():
|
||||
return psutil.users()
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@staticmethod
|
||||
def last_login_username():
|
||||
# TODO
|
||||
pass
|
||||
|
||||
class Os(object):
|
||||
"""
|
||||
@staticmethod
|
||||
def user_name():
|
||||
arr = []
|
||||
for user in psutil.get_users():
|
||||
if str(user[0]) is not 'None' and user[0] not in arr:
|
||||
arr.append(user[0])
|
||||
return arr
|
||||
"""
|
||||
|
||||
class Os(object):
|
||||
|
||||
@staticmethod
|
||||
def architecture():
|
||||
return platform.architecture()[0]
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def boot_time():
|
||||
return psutil.boot_time()
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def file_format():
|
||||
|
|
@ -346,7 +321,6 @@ class System:
|
|||
arr.append(ip)
|
||||
return arr
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def getHwAddr(ifname):
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
|
|
@ -359,13 +333,10 @@ class System:
|
|||
info = fcntl.ioctl(s.fileno(), 0x8927, struct.pack('256s', ifname[:15]))
|
||||
return ''.join(['%02x:' % ord(char) for char in info[18:24]])[:-1]
|
||||
|
||||
|
||||
|
||||
@staticmethod
|
||||
def mac_addresses():
|
||||
mac = get_mac()
|
||||
':'.join(("%012X" % mac)[i:i+2] for i in range(0, 12, 2)
|
||||
|
||||
':'.join(("%012X" % mac)[i:i + 2] for i in range(0, 12, 2))
|
||||
arr = []
|
||||
for iface in psutil.net_io_counters(pernic=True):
|
||||
try:
|
||||
|
|
@ -376,9 +347,9 @@ class System:
|
|||
except Exception as e:
|
||||
pass
|
||||
|
||||
# return arr
|
||||
"""
|
||||
return arr
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def mac_addresses():
|
||||
arr=[]
|
||||
|
|
@ -387,8 +358,8 @@ class System:
|
|||
if str(mac[0:17]) != "00:00:00:00:00:00":
|
||||
arr.append(mac[0:17])
|
||||
return arr
|
||||
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def interfaces_details():
|
||||
return psutil.net_if_addrs()
|
||||
|
|
@ -401,7 +372,6 @@ class System:
|
|||
if re.match(r'^((\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])$', ip) and str(ip) != 'localhost' and str(ip) != '127.0.0.1':
|
||||
arr.append(ip)
|
||||
return arr
|
||||
"""
|
||||
|
||||
class Cpu(object):
|
||||
|
||||
|
|
@ -413,7 +383,6 @@ class System:
|
|||
def architecture():
|
||||
return platform.processor()
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def physical_core_count():
|
||||
return psutil.cpu_count(logical=False)
|
||||
|
|
@ -425,9 +394,7 @@ class System:
|
|||
@staticmethod
|
||||
def stats():
|
||||
return psutil.cpu_stats()
|
||||
"""
|
||||
|
||||
"""
|
||||
@staticmethod
|
||||
def vendor():
|
||||
return cpuinfo.get_cpu_info()['vendor_id']
|
||||
|
|
@ -455,5 +422,3 @@ class System:
|
|||
@staticmethod
|
||||
def model():
|
||||
return cpuinfo.get_cpu_info()['model']
|
||||
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ class Util:
|
|||
@staticmethod
|
||||
def create_directory(dir_path):
|
||||
try:
|
||||
os.makedirs(dir_path)
|
||||
return os.makedirs(dir_path)
|
||||
except:
|
||||
raise
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue