justin/Zerto_Exporter
1
0
Fork 0
mirror of https://github.com/recklessop/Zerto_Exporter.git synced 2026-07-04 08:23:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

updates for zvma10

Browse Source
This commit is contained in:
Justin Paul
2024-05-30 20:57:39 -04:00
parent 4e95d13c6d
commit a0ac6883f4
9 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+21 -2
View File
@@ -1,7 +1,22 @@
FROM python:3.12-slim FROM python:3.12.3-slim
EXPOSE 9999 EXPOSE 9999
# Install system dependencies
RUN apt-get update \
&& apt-get install -y \
curl \
gcc \
libffi-dev \
libssl-dev \
python3-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install Rust and Cargo using curl with IPv4 only
RUN CURL_IPRESOLVE=4 curl https://sh.rustup.rs -sSf | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"
WORKDIR /usr/src/app WORKDIR /usr/src/app
# Set PYTHONPATH to include /usr/src/app # Set PYTHONPATH to include /usr/src/app
@@ -13,7 +28,11 @@ COPY app /usr/src/app/
# Delete uuid.txt file if it exists # Delete uuid.txt file if it exists
RUN [ -f uuid.txt ] && rm uuid.txt || echo "No uuid.txt file to delete" RUN [ -f uuid.txt ] && rm uuid.txt || echo "No uuid.txt file to delete"
# Install Python dependencies
# Set environment variable for PyO3 compatibility
ENV PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
RUN pip install --upgrade pip
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt
# Entry point for the container # Entry point for the container
CMD ["python", "python-node-exporter.py"] CMD ["python", "python-node-exporter.py"]
app/python-node-exporter.py
+52 -27
View File
@@ -13,7 +13,7 @@ from time import sleep, time
from requests.packages.urllib3.exceptions import InsecureRequestWarning from requests.packages.urllib3.exceptions import InsecureRequestWarning
from requests.structures import CaseInsensitiveDict from requests.structures import CaseInsensitiveDict
from tinydb import TinyDB, Query from tinydb import TinyDB, Query
from tinydbstorage.storage import MemoryStorage from tinydb.storages import MemoryStorage
from version import VERSION from version import VERSION
from vmware.vcenter import vcsite from vmware.vcenter import vcsite
from zvma10.zvma import zvmsite from zvma10.zvma import zvmsite
@@ -27,11 +27,14 @@ start_time = time()
Variables: Normally these are imported from the Docker Container, but alternative values can be modified if running the script manually Variables: Normally these are imported from the Docker Container, but alternative values can be modified if running the script manually
""" """
listen_port = int(os.getenv('LISTEN_PORT', 9999))
callhomestats = os.getenv("CALL_HOME_STATS", 'True').lower() in ('false', '0', 'f') callhomestats = os.getenv("CALL_HOME_STATS", 'True').lower() in ('false', '0', 'f')
verifySSL = os.getenv("VERIFY_SSL", 'False').lower() in ('true', '1', 't') verifySSL = os.getenv("VERIFY_SSL", 'False').lower() in ('true', '1', 't')
zvm_url = os.environ.get('ZVM_HOST', '192.168.50.60') zvm_url = os.environ.get('ZVM_HOST', '192.168.50.60')
zvm_port = os.environ.get('ZVM_PORT', '443') zvm_port = os.environ.get('ZVM_PORT', '443')
client_id = os.environ.get('CLIENT_ID', 'api-script') zvm_username = os.environ.get('ZVM_USERNAME', 'admin')
zvm_password = os.environ.get('ZVM_PASSWORD', 'Zertodata987!')
client_id = os.environ.get('CLIENT_ID', 'zerto-client')
client_secret = os.environ.get('CLIENT_SECRET', 'fcYMFuA5TkIUwp6b3hDUxim0f32z8erk') client_secret = os.environ.get('CLIENT_SECRET', 'fcYMFuA5TkIUwp6b3hDUxim0f32z8erk')
scrape_speed = int(os.environ.get('SCRAPE_SPEED', 30)) scrape_speed = int(os.environ.get('SCRAPE_SPEED', 30))
api_timeout = int(os.environ.get('API_TIMEOUT', 5)) api_timeout = int(os.environ.get('API_TIMEOUT', 5))
@@ -45,9 +48,11 @@ vcenter_pwd = os.environ.get('VCENTER_PASSWORD', 'Zertodata987!')
# Thread which gets VM level encryption statistics from ZVM API # Thread which gets VM level encryption statistics from ZVM API
def GetStatsFunc(zvm_instance): def GetStatsFunc(zvm_instance):
tempdb = TinyDB(storage=MemoryStorage) # ('./db.json') used for storing db on disk for debugging tempdb = TinyDB(storage=MemoryStorage) # ('./db.json') #(storage=MemoryStorage) used for storing db on disk for debugging
dbvm = Query() dbvm = Query()
dbvpg = Query() dbvpg = Query()
dbsite = Query()
zvm = zvm_instance zvm = zvm_instance
while (True) : while (True) :
global siteId global siteId
@@ -70,9 +75,11 @@ def GetStatsFunc(zvm_instance):
if vmsiteinfo['ProtectedSite']['identifier'] == zvm.site_id: if vmsiteinfo['ProtectedSite']['identifier'] == zvm.site_id:
log.debug(f"VM is protected at this site - {vm['VmIdentifier']}") log.debug(f"VM is protected at this site - {vm['VmIdentifier']}")
oldvmdata = dict() oldvmdata = dict()
# this part of the dictionary will never exist, so not sure why i need this as i set the key/values below in the vmem section.
if 'EncryptionMetrics' not in vm: if 'EncryptionMetrics' not in vm:
vm['EncryptionMetrics'] = {} vm['EncryptionMetrics'] = {}
vm['VmName'] = None vm['VmName'] = None
vm['SiteId'] = zvm.site_id
CurrentIops = 0 CurrentIops = 0
CurrentWriteCounterInMBs = 0 CurrentWriteCounterInMBs = 0
@@ -95,12 +102,14 @@ def GetStatsFunc(zvm_instance):
vm['VmName'] = vmem['Link']['name'] vm['VmName'] = vmem['Link']['name']
log.info("Checking TempDB for VM " + vm['VmIdentifier'] + " in VPG " + vm['VpgIdentifier']) log.info("Checking TempDB for VM " + vm['VmIdentifier'] + " in VPG " + vm['VpgIdentifier'])
oldvmdata = tempdb.search(dbvm.VmIdentifier == vm['VmIdentifier'] and dbvpg.VpgIdentifier == vm['VpgIdentifier']) oldvmdata = tempdb.search((dbvm.VmIdentifier == vm['VmIdentifier']) & (dbvpg.VpgIdentifier == vm['VpgIdentifier']))
if (oldvmdata): if (oldvmdata):
log.info(vm['VmIdentifier'] + " Record Found, Updating DB") log.info(vm['VmIdentifier'] + " Record Found, Updating DB")
log.debug(oldvmdata[0]) log.debug("Old Data")
log.debug(tempdb.update(vm, dbvm.VmIdentifier == vm['VmIdentifier'] and dbvpg.VpgIdentifier == vm['VpgIdentifier'])) log.debug(oldvmdata)
log.debug(tempdb.update(vm, (dbvm.VmIdentifier == vm['VmIdentifier']) & (dbvpg.VpgIdentifier == vm['VpgIdentifier'])))
log.debug("New Data")
log.debug(vm)
log.debug("!@!@!@!@!@ Stats !@!@!@!@!@") log.debug("!@!@!@!@!@ Stats !@!@!@!@!@")
VMName = oldvmdata[0]['VmName'] VMName = oldvmdata[0]['VmName']
log.debug("Current VM " + str(VMName)) log.debug("Current VM " + str(VMName))
@@ -197,8 +206,12 @@ def GetDataFunc(zvm_instance):
metricsDictionary["vpg_configured_rpo_seconds{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["ConfiguredRpoSeconds"] metricsDictionary["vpg_configured_rpo_seconds{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["ConfiguredRpoSeconds"]
metricsDictionary["vpg_actual_history_in_minutes{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["HistoryStatusApi"]["ActualHistoryInMinutes"] metricsDictionary["vpg_actual_history_in_minutes{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["HistoryStatusApi"]["ActualHistoryInMinutes"]
metricsDictionary["vpg_configured_history_in_minutes{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["HistoryStatusApi"]["ConfiguredHistoryInMinutes"] metricsDictionary["vpg_configured_history_in_minutes{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["HistoryStatusApi"]["ConfiguredHistoryInMinutes"]
metricsDictionary["vpg_failsafe_history_in_minutes_actual{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["FailSafeHistory"]["ActualFailSafeHistory"] if(vpg["FailSafeHistory"] is None):
metricsDictionary["vpg_failsafe_history_in_minutes_configured{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["FailSafeHistory"]["ConfiguredFailSafeHistory"] metricsDictionary["vpg_failsafe_history_in_minutes_actual{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = 0
metricsDictionary["vpg_failsafe_history_in_minutes_configured{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = 0
else:
metricsDictionary["vpg_failsafe_history_in_minutes_actual{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["FailSafeHistory"]["ActualFailSafeHistory"]
metricsDictionary["vpg_failsafe_history_in_minutes_configured{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["FailSafeHistory"]["ConfiguredFailSafeHistory"]
metricsDictionary["vpg_status{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["Status"] metricsDictionary["vpg_status{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["Status"]
metricsDictionary["vpg_substatus{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["SubStatus"] metricsDictionary["vpg_substatus{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["SubStatus"]
metricsDictionary["vpg_alert_status{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["AlertStatus"] metricsDictionary["vpg_alert_status{VpgIdentifier=\"" + vpg['VpgIdentifier'] + "\",VpgName=\"" + vpg['VpgName'] + "\",VpgPriority=\"" + str(vpg['Priority']) + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = vpg["AlertStatus"]
@@ -387,9 +400,10 @@ def GetVraMetrics(zvm_instance):
if is_vcenter_set: if is_vcenter_set:
log.debug(f"vCenter Info Is Valid... Trying to get CPU and Memory usage for VRAs") log.debug(f"vCenter Info Is Valid... Trying to get CPU and Memory usage for VRAs")
try: try:
log.debug("Trying to get stats from vc module") log.debug("Trying to get stats from vCenter module")
vradata = vc_connection.get_cpu_mem_used(vra['VraName']) vradata = vc_connection.get_cpu_mem_used(vra['VraName'])
for item in vradata:
log.debug(item)
# get the CPU usage and memory usage for the VM # get the CPU usage and memory usage for the VM
cpu_usage_mhz = vradata[0] cpu_usage_mhz = vradata[0]
memory_usage_mb = vradata[1] memory_usage_mb = vradata[1]
@@ -399,7 +413,7 @@ def GetVraMetrics(zvm_instance):
metricsDictionary["vra_cpu_usage_mhz{VraIdentifierStr=\"" + vra['VraIdentifierStr'] + "\",VraName=\"" + vra['VraName'] + "\",VraVersion=\"" + vra['VraVersion'] + "\",HostVersion=\"" + vra['HostVersion'] + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = cpu_usage_mhz metricsDictionary["vra_cpu_usage_mhz{VraIdentifierStr=\"" + vra['VraIdentifierStr'] + "\",VraName=\"" + vra['VraName'] + "\",VraVersion=\"" + vra['VraVersion'] + "\",HostVersion=\"" + vra['HostVersion'] + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = cpu_usage_mhz
metricsDictionary["vra_memory_usage_mb{VraIdentifierStr=\"" + vra['VraIdentifierStr'] + "\",VraName=\"" + vra['VraName'] + "\",VraVersion=\"" + vra['VraVersion'] + "\",HostVersion=\"" + vra['HostVersion'] + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = memory_usage_mb metricsDictionary["vra_memory_usage_mb{VraIdentifierStr=\"" + vra['VraIdentifierStr'] + "\",VraName=\"" + vra['VraName'] + "\",VraVersion=\"" + vra['VraVersion'] + "\",HostVersion=\"" + vra['HostVersion'] + "\",SiteIdentifier=\"" + siteId + "\",SiteName=\"" + siteName + "\"}"] = memory_usage_mb
except: except:
log.info(f"No VM found with name {vra['VraName']}") log.info(f"No VM found with name {vra['VraName']}, or unexpected response.")
else: else:
log.debug("No VRAs Found") log.debug("No VRAs Found")
@@ -458,7 +472,7 @@ def ThreadProbe():
log.debug("VRA Metrics Thread Is NOT Alive") log.debug("VRA Metrics Thread Is NOT Alive")
metricsDictionary["exporter_thread_status{thread=\"" + "VraMetrics" + "\",ExporterInstance=\"" + container_id + "\"}"] = 0 metricsDictionary["exporter_thread_status{thread=\"" + "VraMetrics" + "\",ExporterInstance=\"" + container_id + "\"}"] = 0
log.debug("Writing Probe data to files") log.debug("Writing Thread data to files")
file_object = open('threads', 'w') file_object = open('threads', 'w')
txt_object = open('threads.txt', 'w') txt_object = open('threads.txt', 'w')
for item in metricsDictionary : for item in metricsDictionary :
@@ -471,22 +485,21 @@ def ThreadProbe():
txt_object.write(str(metricsDictionary[item])) txt_object.write(str(metricsDictionary[item]))
txt_object.write("\n") txt_object.write("\n")
log.debug("Trying to Close probe txt files") log.debug("Trying to close Thread txt files")
file_object.close() file_object.close()
txt_object.close() txt_object.close()
log.debug("Probe Thread Going to Sleep") log.debug("Probe Thread Going to Sleep")
sleep(30) sleep(30)
#----------------run http server on port 9999----------------- #----------------run http server on port -----------------
def WebServer(): def WebServer(port):
log.info("Web Server Started") log.info(f"Web Server Starting on port {port}")
PORT = 9999
Handler = http.server.SimpleHTTPRequestHandler Handler = http.server.SimpleHTTPRequestHandler
with socketserver.TCPServer(("", PORT), Handler) as httpd: with socketserver.TCPServer(("", port), Handler) as httpd:
log.info(f"Webserver running on port {PORT}") log.info(f"Webserver running on port {port}")
httpd.serve_forever() httpd.serve_forever()
def start_thread(target_func): def start_thread(target_func):
@@ -519,16 +532,18 @@ log.debug("Running with Variables:\nVerify SSL: " + str(verifySSL) + "\nZVM Host
zvm_instance = zvmsite( zvm_instance = zvmsite(
host=zvm_url, host=zvm_url,
port=zvm_port, port=zvm_port,
username=zvm_username,
password=zvm_password,
client_id=client_id, client_id=client_id,
client_secret=client_secret, client_secret=client_secret,
grant_type="client_credentials",
loglevel=LOGLEVEL, loglevel=LOGLEVEL,
logger=log, logger=log,
stats=DISABLE_STATS stats=DISABLE_STATS
) )
# grant_type="client_credentials",
# Start the zvmsite authentication thread # Start the zvmsite authentication thread
zvm_instance.connect()
zvm_instance.connect()
""" """
Global Variables used by the program Global Variables used by the program
""" """
@@ -558,9 +573,9 @@ vra_metrics_thread = start_thread(lambda: GetVraMetrics(zvm_instance))
data_thread = start_thread(lambda: GetDataFunc(zvm_instance)) data_thread = start_thread(lambda: GetDataFunc(zvm_instance))
stats_thread = start_thread(lambda: GetStatsFunc(zvm_instance)) stats_thread = start_thread(lambda: GetStatsFunc(zvm_instance))
log.debug("Starting VRA Metrics") log.debug("Starting VRA Metrics")
webserver_thread = start_thread(lambda: WebServer(listen_port))
webserver_thread = start_thread(WebServer) probe_thread = start_thread(lambda: ThreadProbe)
probe_thread = start_thread(ThreadProbe) log.debug(f"ThreadProbe just started on PID {probe_thread}")
# loop indefinitely # loop indefinitely
while True: while True:
@@ -570,20 +585,30 @@ while True:
# restart the thread # restart the thread
log.error("Probe Thread Died - Restarting") log.error("Probe Thread Died - Restarting")
probe_thread = start_thread(ThreadProbe) probe_thread = start_thread(ThreadProbe)
else:
print("Probe Thread is alive")
if not data_thread.is_alive(): if not data_thread.is_alive():
# restart the thread # restart the thread
log.error("Data Thread Died - Restarting") log.error("Data Thread Died - Restarting")
data_thread = start_thread(GetDataFunc(zvm_instance)) data_thread = start_thread(GetDataFunc(zvm_instance))
else:
print("Data API Thread is alive")
if not stats_thread.is_alive(): if not stats_thread.is_alive():
# restart the thread # restart the thread
log.error("Stats Thread Died - Restarting") log.error("Stats Thread Died - Restarting")
stats_thread = start_thread(lambda: GetStatsFunc(zvm_instance)) stats_thread = start_thread(lambda: GetStatsFunc(zvm_instance))
else:
print("Stats API Thread is alive")
if not vra_metrics_thread.is_alive(): if not vra_metrics_thread.is_alive():
# restart the thread # restart the thread
log.error("VRA Metrics Thread Died - Restarting") log.error("VRA Metrics Thread Died - Restarting")
vra_metrics_thread = start_thread(GetVraMetrics(zvm_instance)) vra_metrics_thread = start_thread(GetVraMetrics(zvm_instance))
else:
print("VRA Metrics Thread is alive")
if not webserver_thread.is_alive(): if not webserver_thread.is_alive():
# restart the thread # restart the thread
log.error("Webserver Thread Died - Restarting") log.error("Webserver Thread Died - Restarting")
webserver_thread = start_thread(WebServer) webserver_thread = start_thread(WebServer(listen_port))
sleep(api_timeout) else:
print("WebServer Thread is alive")
sleep(api_timeout)
app/requirements.txt
+2 -4
View File
@@ -12,19 +12,17 @@ jmespath==1.0.1
monotonic==1.6 monotonic==1.6
posthog==3.0.2 posthog==3.0.2
prompt-toolkit==3.0.39 prompt-toolkit==3.0.39
pydantic==2.4.2 pydantic
pydantic_core==2.10.1
pyflakes==3.1.0 pyflakes==3.1.0
Pygments==2.16.1 Pygments==2.16.1
python-dateutil==2.8.2 python-dateutil==2.8.2
pyvim==3.0.3 pyvim==3.0.3
pyvmomi==8.0.2.0 pyvmomi==8.0.2.0
redis==5.0.1 redis==5.0.1
requests==2.31.0 requests==2.32.0
s3transfer==0.7.0 s3transfer==0.7.0
six==1.16.0 six==1.16.0
tinydb==4.8.0 tinydb==4.8.0
tinydb-storage==0.1.0
typing_extensions==4.8.0 typing_extensions==4.8.0
urllib3==2.0.6 urllib3==2.0.6
wcwidth==0.2.8 wcwidth==0.2.8
app/uuid.txt
-1
View File
@@ -1 +0,0 @@
c50dfc5a-bbd3-49e4-b8f8-688b19e89960
app/version.py
+2 -2
View File
@@ -1,5 +1,5 @@
# version.py # version.py
VERSION = "2.0.0" VERSION = "2.1.0"
def main(): def main():
# Put your main program code here # Put your main program code here
@@ -7,4 +7,4 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
# This code will be executed only when the file is run as the main program # This code will be executed only when the file is run as the main program
main() main()
app/vmware/__pycache__/__init__.cpython-311.pyc
BIN
View File
Binary file not shown.
app/vmware/__pycache__/vcenter.cpython-311.pyc
BIN
View File
Binary file not shown.
app/vmware/vcenter.py
+4 -4
View File
@@ -36,7 +36,7 @@ class vcsite:
if self.__conn__ is None: if self.__conn__ is None:
context = ssl.create_default_context() context = ssl.create_default_context()
if not self.verify_ssl: if not self.verify_ssl:
log.debug("dont verify SSL") self.log.debug("dont verify SSL")
# Create an SSL context without certificate verification # Create an SSL context without certificate verification
context.check_hostname = False context.check_hostname = False
context.verify_mode = ssl.CERT_NONE context.verify_mode = ssl.CERT_NONE
@@ -90,7 +90,7 @@ class vcsite:
else: else:
self.log.debug(f"{vm_obj.name} is not a VRA") self.log.debug(f"{vm_obj.name} is not a VRA")
raise ValueError("No VRA Found") raise ValueError("No VRA Found")
def get_write_iops(self, vm): def get_write_iops(self, vm):
try: try:
content = self.__conn__.RetrieveContent() content = self.__conn__.RetrieveContent()
@@ -141,7 +141,7 @@ class vcsite:
return average_write_iops return average_write_iops
else: else:
return None return None
def get_average_write_latency(self, vm): def get_average_write_latency(self, vm):
try: try:
content = self.__conn__.RetrieveContent() content = self.__conn__.RetrieveContent()
@@ -203,4 +203,4 @@ class vcsite:
Disconnect(self.__conn__) Disconnect(self.__conn__)
self.__conn__ = None self.__conn__ = None
self.version = None self.version = None
self.log.debug(f"Disconnected from vCenter") self.log.debug(f"Disconnected from vCenter")
app/zvma10/zvma.py
+24 -24
View File
@@ -17,7 +17,7 @@ from dateutil import parser
from typing import List, Dict, Tuple, Union, Any, Optional from typing import List, Dict, Tuple, Union, Any, Optional
from requests.structures import CaseInsensitiveDict from requests.structures import CaseInsensitiveDict
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
from posthog import Posthog #from posthog import Posthog
import uuid import uuid
from requests import Request, Session from requests import Request, Session
from .version import VERSION from .version import VERSION
@@ -75,10 +75,10 @@ class zvmsite:
self.uuid = self.load_or_generate_uuid() self.uuid = self.load_or_generate_uuid()
# Posthog stats setup # Posthog stats setup
if self.stats: #if self.stats:
self.setup_posthog() # self.setup_posthog()
self.posthog.capture(self.uuid, 'ZVMA10 Python Module Loaded') # self.posthog.capture(self.uuid, 'ZVMA10 Python Module Loaded')
self.log.debug("Sent PostHog Hook") # self.log.debug("Sent PostHog Hook")
def __authhandler__(self) -> None: def __authhandler__(self) -> None:
self.log.info(f"Log Level set to {self.LOGLEVEL}") self.log.info(f"Log Level set to {self.LOGLEVEL}")
@@ -172,10 +172,10 @@ class zvmsite:
file.write(new_uuid) file.write(new_uuid)
return new_uuid return new_uuid
def setup_posthog(self) -> None: #def setup_posthog(self) -> None:
self.posthog = Posthog(project_api_key='phc_HflqUkx9majhzm8DZva8pTwXFRnOn99onA9xPpK5HaQ', host='https://posthog.jpaul.io') # self.posthog = Posthog(project_api_key='phc_HflqUkx9majhzm8DZva8pTwXFRnOn99onA9xPpK5HaQ', host='https://posthog.jpaul.io')
self.posthog.debug = True # self.posthog.debug = True
self.posthog.identify(distinct_id=self.uuid) # self.posthog.identify(distinct_id=self.uuid)
def construct_url(self, path="", params=None) -> str: def construct_url(self, path="", params=None) -> str:
full_url = f"{self.base_url}/{path}" full_url = f"{self.base_url}/{path}"
@@ -236,21 +236,21 @@ class zvmsite:
self.log.debug(f'API Request: {method} - {url}') self.log.debug(f'API Request: {method} - {url}')
# Posthog stats setup # Posthog stats setup
if self.stats: #if self.stats:
temp_base, temp_path = self.deconstruct_url(url) # temp_base, temp_path = self.deconstruct_url(url)
self.posthog.capture( self.uuid, 'API REQUEST', # self.posthog.capture( self.uuid, 'API REQUEST',
{ # {
"url": temp_base, # "url": temp_base,
"port": self.port, # "port": self.port,
"endpoint": temp_path, # "endpoint": temp_path,
"method": method, # "method": method,
"response_time_ms": int(elapsed_time_ms), # "response_time_ms": int(elapsed_time_ms),
"verify_ssl": self.verify_ssl, # "verify_ssl": self.verify_ssl,
"grant_type": self.grant_type, # "grant_type": self.grant_type,
"status_code": str(response.status_code), # "status_code": str(response.status_code),
"sdk_version": self.__version__ # "sdk_version": self.__version__
}) # })
self.log.debug("Sent PostHog Hook") # self.log.debug("Sent PostHog Hook")
return response.json() return response.json()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e: