HakObserverpy 2.2.1__tar.gz → 2.3.0__tar.gz

{hakobserverpy-2.2.1 → hakobserverpy-2.3.0}/HakObserverpy/HakObserverpy.py

@@ -10,7 +10,7 @@ from datetime import datetime
 
 def StatusLogginfo(DeviceID, Step, Comment,Status):
 
-    url = f"https://api.hakware.com/HakObserver/callLog/{DeviceID}/{Step}/{Comment}/{Status}"
+    url = f"https://za.api.hakware.com/HakObserver/callLog/{DeviceID}/{Step}/{Comment}/{Status}"
 
     session = HTMLSession()
         
@@ -69,7 +69,7 @@ def get_installed_applications(HWDeviceID):
 
                     #Replace special characters in app_name
                     
-                    url = f"https://api.hakware.com/HakObserver/DeviceApps/{HWDeviceID}/{app_name}/{app_version}"
+                    url = f"https://za.api.hakware.com/HakObserver/DeviceApps/{HWDeviceID}/{app_name}/{app_version}"
 
                     #Make a GET request to the URL
                     session = HTMLSession()
@@ -130,7 +130,7 @@ def get_system_usage(HWDeviceID,ObserverVersion):
 
     from requests_html import HTMLSession
 
-    url = f"https://api.hakware.com/HakObserver/Device/{HWDeviceID}/{ObserverVersion}/{device_name}/{processor}/{device_id}/{system_type}/{os_version}/{total_memory_gb}/{total_cpus}/{total_cores}"
+    url = f"https://za.api.hakware.com/HakObserver/Device/{HWDeviceID}/{ObserverVersion}/{device_name}/{processor}/{device_id}/{system_type}/{os_version}/{total_memory_gb}/{total_cpus}/{total_cores}"
     
   
 
@@ -173,7 +173,7 @@ def get_users(DeviceID):
             PasswordAge = age // (24 * 3600)
 
             #InserUsers(DeviceID, User, PasswordAge, Comment)
-            url = f"https://api.hakware.com/HakObserver/InsertUsers/{DeviceID}/{User}/{PasswordAge}/{Comment}"
+            url = f"https://za.api.hakware.com/HakObserver/InsertUsers/{DeviceID}/{User}/{PasswordAge}/{Comment}"
             
             #Make a GET request to the URL
             session = HTMLSession()
@@ -207,7 +207,7 @@ def monitor_disk_space(DeviceID):
         Total = usage.total
         
 
-        url = f"https://api.hakware.com/HakObserver/InsertDisks/{DeviceID}/{Disk}/{fstype}/{Usage}/{Used}/{Free}/{Total}"
+        url = f"https://za.api.hakware.com/HakObserver/InsertDisks/{DeviceID}/{Disk}/{fstype}/{Usage}/{Used}/{Free}/{Total}"
 
         #Make a GET request to the URL
         session = HTMLSession()
@@ -237,7 +237,7 @@ def list_Device_Usage(DeviceID):
             CPUPercentage = proc.info['cpu_percent']
             MemoryMB =proc.info['memory_info'].rss / (1024 * 1024)
 
-            url = f"https://api.hakware.com/HakObserver/DeviceUsage/{DeviceID}/{pid}/{Name}/{CPUPercentage}/{MemoryMB}"
+            url = f"https://za.api.hakware.com/HakObserver/DeviceUsage/{DeviceID}/{pid}/{Name}/{CPUPercentage}/{MemoryMB}"
             #Make a GET request to the URL
             session = HTMLSession()
         
@@ -273,7 +273,7 @@ def list_services(DeviceID):
             Status = svc['status']
 
             #Services(DeviceID,pid,Name,display_name,binpath,username,start_type,description,Status )
-            url = f"https://api.hakware.com/HakObserver/InsertServices/{DeviceID}/{pid}/{Name}/{display_name}/{binpath}/{username}/{start_type}/{description}/{Status}"
+            url = f"https://za.api.hakware.com/HakObserver/InsertServices/{DeviceID}/{pid}/{Name}/{display_name}/{binpath}/{username}/{start_type}/{description}/{Status}"
 
             session = HTMLSession()
         
@@ -307,7 +307,7 @@ def system_usage(DeviceID):
     cpu_percentage = psutil.cpu_percent(interval=1)
     memory_mb = memory.percent
     disk = disk_usage.percent
-    url = f"https://api.hakware.com/HakObserver/InsertSystemUsage/{DeviceID}/{cpu_percentage}/{memory_mb}/{disk}"
+    url = f"https://za.api.hakware.com/HakObserver/InsertSystemUsage/{DeviceID}/{cpu_percentage}/{memory_mb}/{disk}"
     session = HTMLSession()
         
     response = session.get(url, verify=False)
@@ -522,7 +522,7 @@ def get_Security_events(DeviceID, server='localhost', log_type='Security'):
                 EventData=  event.StringInserts[0]
 
             #InsertEvents(DeviceID,RecordNumber, log_type,EventID ,EventDescription,Source,EventTime,strEventTypeID, EventTypeDescription,EventCategoryID ,category_text,EventData)
-            url = f"https://api.hakware.com/HakObserver/InsertEvents/{DeviceID}/{RecordNumber}/{log_type}/{EventID}/{EventDescription}/{Source}/{EventTime}/{strEventTypeID}/{EventTypeDescription}/{EventCategoryID}/{category_text}/{EventData}"  
+            url = f"https://za.api.hakware.com/HakObserver/InsertEvents/{DeviceID}/{RecordNumber}/{log_type}/{EventID}/{EventDescription}/{Source}/{EventTime}/{strEventTypeID}/{EventTypeDescription}/{EventCategoryID}/{category_text}/{EventData}"  
 
             session = HTMLSession()
         
@@ -607,7 +607,7 @@ def get_System_events(DeviceID,server='localhost', log_type='System'):
                 EventData=  "User : " + event.StringInserts[0]
 
             #InsertEvents(DeviceID,RecordNumber, log_type,EventID ,EventDescription,Source,EventTime,strEventTypeID, EventTypeDescription,EventCategoryID ,category_text,EventData)
-            url = f"https://api.hakware.com/HakObserver/InsertEvents/{DeviceID}/{RecordNumber}/{log_type}/{EventID}/{EventDescription}/{Source}/{EventTime}/{strEventTypeID}/{EventTypeDescription}/{EventCategoryID}/{category_text}/{EventData}"  
+            url = f"https://za.api.hakware.com/HakObserver/InsertEvents/{DeviceID}/{RecordNumber}/{log_type}/{EventID}/{EventDescription}/{Source}/{EventTime}/{strEventTypeID}/{EventTypeDescription}/{EventCategoryID}/{category_text}/{EventData}"  
 
             session = HTMLSession()
         
@@ -657,7 +657,7 @@ def get_iis_sites(HWDeviceID):
                 print("Bindings       :")
 
                 #Insert_IIS(HWDeviceID,name, state,str(path).replace("\"","**"))
-                url = f"https://api.hakware.com/HakObserver/InsertIIS/{HWDeviceID}/{name}/{state}/{strPath}"
+                url = f"https://za.api.hakware.com/HakObserver/InsertIIS/{HWDeviceID}/{name}/{state}/{strPath}"
 
                 session = HTMLSession()
             
@@ -688,7 +688,7 @@ def get_iis_sites(HWDeviceID):
                             print(f"    Cert Store    : {cert_store}")
                         print()
                         #Insert_IIS_Bindings(DeviceID,name,protocol, binding_info,ssl_flags,cert_hash,cert_store)
-                        url = f"https://api.hakware.com/HakObserver/InsertIISBindings/{HWDeviceID}/{name}/{protocol}/{binding_info}/{ssl_flags}/{cert_hash}/{cert_store}"
+                        url = f"https://za.api.hakware.com/HakObserver/InsertIISBindings/{HWDeviceID}/{name}/{protocol}/{binding_info}/{ssl_flags}/{cert_hash}/{cert_store}"
                         session = HTMLSession()
             
                         response = session.get(url, verify=False)

{hakobserverpy-2.2.1 → hakobserverpy-2.3.0}/HakObserverpy/__init__.py

@@ -2,7 +2,7 @@
 from .HakObserverpy import InitiateCollecection  # Import the function from the correct module
 
 # Optional: Define a version number for the package
-__version__ = "2.2.1"
+__version__ = "2.3.0"
 
 # Optional: Define the package's public interface
 __all__ = ["InitiateCollecection"]

{hakobserverpy-2.2.1 → hakobserverpy-2.3.0}/HakObserverpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: HakObserverpy
-Version: 2.2.1
+Version: 2.3.0
 Summary: A package connect endpoints to the Hakware Application
 Author: Jacob O'Brien
 Classifier: Programming Language :: Python :: 3
@@ -13,6 +13,13 @@ Requires-Dist: psutil
 Requires-Dist: lxml[html_clean]
 Requires-Dist: requests_html
 Requires-Dist: pywin32
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Hakware-py
 

{hakobserverpy-2.2.1 → hakobserverpy-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: HakObserverpy
-Version: 2.2.1
+Version: 2.3.0
 Summary: A package connect endpoints to the Hakware Application
 Author: Jacob O'Brien
 Classifier: Programming Language :: Python :: 3
@@ -13,6 +13,13 @@ Requires-Dist: psutil
 Requires-Dist: lxml[html_clean]
 Requires-Dist: requests_html
 Requires-Dist: pywin32
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Hakware-py
 

{hakobserverpy-2.2.1 → hakobserverpy-2.3.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='HakObserverpy', 
-    version='2.2.1',  
+    version='2.3.0',  
     description='A package connect endpoints to the Hakware Application', 
     long_description=open('README.md').read(),  
     long_description_content_type='text/markdown',