Compare commits

...

3 Commits

10 changed files with 32 additions and 11 deletions

View File

@ -1 +1 @@
0.9.88 0.9.89

View File

@ -1,5 +1,10 @@
## PVC Changelog ## PVC Changelog
###### [v0.9.89](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.89)
* [API/Worker Daemons] Fixes a bug with the Celery result backends not being properly initialized on Debian 10/11.
* [API Daemon] Fixes a bug if VM CPU stats are missing on Debian 10.
###### [v0.9.88](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.88) ###### [v0.9.88](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.88)
* [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats. * [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats.

View File

@ -27,7 +27,7 @@ from distutils.util import strtobool as dustrtobool
import daemon_lib.config as cfg import daemon_lib.config as cfg
# Daemon version # Daemon version
version = "0.9.88" version = "0.9.89"
# API version # API version
API_VERSION = 1.0 API_VERSION = 1.0

View File

@ -118,7 +118,7 @@ celery_task_uri = "redis://{}:{}{}".format(
celery = Celery( celery = Celery(
app.name, app.name,
broker=celery_task_uri, broker=celery_task_uri,
result_backend=celery_task_uri, backend=celery_task_uri,
result_extended=True, result_extended=True,
) )
app.config["broker_url"] = celery_task_uri app.config["broker_url"] = celery_task_uri

View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="pvc", name="pvc",
version="0.9.88", version="0.9.89",
packages=["pvc.cli", "pvc.lib"], packages=["pvc.cli", "pvc.lib"],
install_requires=[ install_requires=[
"Click", "Click",

View File

@ -1187,7 +1187,10 @@ def get_resource_metrics(zkhandler):
) )
output_lines.append("# TYPE pvc_vm_vcpus_cpu_time gauge") output_lines.append("# TYPE pvc_vm_vcpus_cpu_time gauge")
for vm in vm_data: for vm in vm_data:
cpu_time = vm["vcpu_stats"]["cpu_time"] / 1000000 try:
cpu_time = vm["vcpu_stats"]["cpu_time"] / 1000000
except Exception:
cpu_time = 0
output_lines.append(f"pvc_vm_vcpus_cpu_time{{vm=\"{vm['name']}\"}} {cpu_time}") output_lines.append(f"pvc_vm_vcpus_cpu_time{{vm=\"{vm['name']}\"}} {cpu_time}")
output_lines.append( output_lines.append(
@ -1195,7 +1198,10 @@ def get_resource_metrics(zkhandler):
) )
output_lines.append("# TYPE pvc_vm_vcpus_user_time gauge") output_lines.append("# TYPE pvc_vm_vcpus_user_time gauge")
for vm in vm_data: for vm in vm_data:
user_time = vm["vcpu_stats"]["user_time"] / 1000000 try:
user_time = vm["vcpu_stats"]["user_time"] / 1000000
except Exception:
cpu_time = 0
output_lines.append( output_lines.append(
f"pvc_vm_vcpus_user_time{{vm=\"{vm['name']}\"}} {user_time}" f"pvc_vm_vcpus_user_time{{vm=\"{vm['name']}\"}} {user_time}"
) )
@ -1205,7 +1211,10 @@ def get_resource_metrics(zkhandler):
) )
output_lines.append("# TYPE pvc_vm_vcpus_system_time gauge") output_lines.append("# TYPE pvc_vm_vcpus_system_time gauge")
for vm in vm_data: for vm in vm_data:
system_time = vm["vcpu_stats"]["system_time"] / 1000000 try:
system_time = vm["vcpu_stats"]["system_time"] / 1000000
except Exception:
system_time = 0
output_lines.append( output_lines.append(
f"pvc_vm_vcpus_system_time{{vm=\"{vm['name']}\"}} {system_time}" f"pvc_vm_vcpus_system_time{{vm=\"{vm['name']}\"}} {system_time}"
) )

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
pvc (0.9.89-0) unstable; urgency=high
* [API/Worker Daemons] Fixes a bug with the Celery result backends not being properly initialized on Debian 10/11.
* [API Daemon] Fixes a bug if VM CPU stats are missing on Debian 10.
-- Joshua M. Boniface <joshua@boniface.me> Tue, 09 Jan 2024 12:15:53 -0500
pvc (0.9.88-0) unstable; urgency=high pvc (0.9.88-0) unstable; urgency=high
* [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats. * [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats.

View File

@ -33,7 +33,7 @@ import os
import signal import signal
# Daemon version # Daemon version
version = "0.9.88" version = "0.9.89"
########################################################## ##########################################################

View File

@ -49,7 +49,7 @@ import re
import json import json
# Daemon version # Daemon version
version = "0.9.88" version = "0.9.89"
########################################################## ##########################################################

View File

@ -44,7 +44,7 @@ from daemon_lib.vmbuilder import (
) )
# Daemon version # Daemon version
version = "0.9.88" version = "0.9.89"
config = cfg.get_configuration() config = cfg.get_configuration()
@ -58,7 +58,7 @@ celery_task_uri = "redis://{}:{}{}".format(
celery = Celery( celery = Celery(
"pvcworkerd", "pvcworkerd",
broker=celery_task_uri, broker=celery_task_uri,
result_backend=celery_task_uri, backend=celery_task_uri,
result_extended=True, result_extended=True,
) )