nexus/ProxmoxVE
2
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-04-05 18:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve telemetry type and report failures

Browse Source 
Respect a pre-set TELEMETRY_TYPE in misc/api.func and use it in the API payload instead of the hardcoded "lxc". In turnkey/turnkey.sh, set TELEMETRY_TYPE="turnkey" for turnkey installs and enhance turnkey_cleanup() to report failed installs to telemetry (calls post_update_to_api "failed" with the exit code when POST_TO_API_DONE is true and POST_UPDATE_DONE is not), then destroy the failed container. These changes ensure correct telemetry type propagation and that failed turnkey deployments are reported.
This commit is contained in:
CanbiZ (MickLesk)
2026-03-24 08:57:11 +01:00
parent 72ae89169c
commit 79aaf2a25e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
misc/api.func
View File

@@ -627,8 +627,8 @@ post_to_api() {
[[ "${DEV_MODE:-}" == "true" ]] && echo "[DEBUG] post_to_api() DIAGNOSTICS=$DIAGNOSTICS RANDOM_UUID=$RANDOM_UUID NSAPP=$NSAPP" >&2
# Set type for later status updates
TELEMETRY_TYPE="lxc"
# Set type for later status updates (respect pre-set value, e.g. "turnkey")
TELEMETRY_TYPE="${TELEMETRY_TYPE:-lxc}"
local pve_version=""
if command -v pveversion &>/dev/null; then
@@ -664,7 +664,7 @@ post_to_api() {
{
"random_id": "${RANDOM_UUID}",
"execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
"type": "lxc",
"type": "${TELEMETRY_TYPE}",
"nsapp": "${NSAPP:-unknown}",
"status": "installing",
"ct_type": ${CT_TYPE:-1},

14
turnkey/turnkey.sh
View File

@@ -132,11 +132,18 @@ select_storage() {
# MAIN
# ==============================================================================
# Cleanup on error: destroy container and restart monitor
# Cleanup on error: destroy container, report telemetry, and restart monitor
turnkey_cleanup() {
local exit_code=$?
if [[ $exit_code -ne 0 ]] && [[ -n "${CTID:-}" ]]; then
cleanup_ctid 2>/dev/null || true
if [[ $exit_code -ne 0 ]]; then
# Report failure to telemetry
if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
post_update_to_api "failed" "$exit_code" 2>/dev/null || true
fi
# Destroy failed container
if [[ -n "${CTID:-}" ]]; then
cleanup_ctid 2>/dev/null || true
fi
fi
if [[ -f /etc/systemd/system/ping-instances.service ]]; then
systemctl start ping-instances.service 2>/dev/null || true
@@ -285,6 +292,7 @@ fi
[[ " ${PCT_OPTIONS[*]} " =~ " -rootfs " ]] || PCT_OPTIONS+=(-rootfs "${CONTAINER_STORAGE}:${PCT_DISK_SIZE:-8}")
# Set telemetry variables for the selected turnkey
TELEMETRY_TYPE="turnkey"
NSAPP="turnkey-${turnkey}"
CT_TYPE=1
DISK_SIZE="${PCT_DISK_SIZE:-8}"