update
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
action="${1:-}"
|
action="${1:-}"
|
||||||
FOLDER='/opt/idssys/ta-proxmenu'
|
FOLDER='/opt/idssys/ta-proxmenu'
|
||||||
VERS='2026.7.25-57'
|
VERS='2026.7.25-58'
|
||||||
|
|
||||||
noupdate=' '
|
noupdate=' '
|
||||||
|
|
||||||
|
|||||||
+11
-4
@@ -117,7 +117,7 @@ if not isinstance(agent, dict) or not str(agent.get("id", "")).strip():
|
|||||||
}
|
}
|
||||||
|
|
||||||
TAPM_PULSE_AGENT_TOKEN_REQUEST_JSON() {
|
TAPM_PULSE_AGENT_TOKEN_REQUEST_JSON() {
|
||||||
printf '%s\n' '{"type":"host","enableCommands":false}'
|
printf '%s\n' '{"type":"pve","enableCommands":true}'
|
||||||
}
|
}
|
||||||
|
|
||||||
TAPM_PULSE_ONLINE_NODES_FROM_JSON() {
|
TAPM_PULSE_ONLINE_NODES_FROM_JSON() {
|
||||||
@@ -756,7 +756,10 @@ print(urllib.parse.quote(os.environ["TAPM_PULSE_NODE_NAME"], safe=""))
|
|||||||
'
|
'
|
||||||
)" || return 1
|
)" || return 1
|
||||||
|
|
||||||
for (( attempt = 1; attempt <= 20; attempt++ )); do
|
# Pulse v6.1.1 completes its Proxmox setup before sending the first host
|
||||||
|
# report. Its built-in registration retries can span at least 135 seconds,
|
||||||
|
# so allow up to four minutes before treating the active agent as unconfirmed.
|
||||||
|
for (( attempt = 1; attempt <= 80; attempt++ )); do
|
||||||
response="$(
|
response="$(
|
||||||
curl --fail --silent --show-error \
|
curl --fail --silent --show-error \
|
||||||
--connect-timeout 3 --max-time 5 \
|
--connect-timeout 3 --max-time 5 \
|
||||||
@@ -855,7 +858,9 @@ TAPM_PULSE_INSTALL_AGENT_LOCAL() {
|
|||||||
--token-file "$token_file" \
|
--token-file "$token_file" \
|
||||||
--hostname "$node" \
|
--hostname "$node" \
|
||||||
--enable-host \
|
--enable-host \
|
||||||
--disable-proxmox \
|
--enable-proxmox \
|
||||||
|
--proxmox-type pve \
|
||||||
|
--enable-commands \
|
||||||
--non-interactive \
|
--non-interactive \
|
||||||
--insecure || status=$?
|
--insecure || status=$?
|
||||||
fi
|
fi
|
||||||
@@ -948,7 +953,9 @@ bash "$installer_file" \
|
|||||||
--token-file "$token_file" \
|
--token-file "$token_file" \
|
||||||
--hostname "$node" \
|
--hostname "$node" \
|
||||||
--enable-host \
|
--enable-host \
|
||||||
--disable-proxmox \
|
--enable-proxmox \
|
||||||
|
--proxmox-type pve \
|
||||||
|
--enable-commands \
|
||||||
--non-interactive \
|
--non-interactive \
|
||||||
--insecure
|
--insecure
|
||||||
systemctl is-active --quiet pulse-agent
|
systemctl is-active --quiet pulse-agent
|
||||||
|
|||||||
+2
-2
@@ -49,9 +49,9 @@ assert_success "registered Pulse agent response accepted" \
|
|||||||
'{"agent":{"id":"agent-123","hostname":"pve1"}}'
|
'{"agent":{"id":"agent-123","hostname":"pve1"}}'
|
||||||
assert_failure "missing Pulse agent ID rejected" \
|
assert_failure "missing Pulse agent ID rejected" \
|
||||||
TAPM_PULSE_AGENT_REGISTERED_FROM_RESPONSE '{"agent":{"hostname":"pve1"}}'
|
TAPM_PULSE_AGENT_REGISTERED_FROM_RESPONSE '{"agent":{"hostname":"pve1"}}'
|
||||||
assert_equal '{"type":"host","enableCommands":false}' \
|
assert_equal '{"type":"pve","enableCommands":true}' \
|
||||||
"$(TAPM_PULSE_AGENT_TOKEN_REQUEST_JSON)" \
|
"$(TAPM_PULSE_AGENT_TOKEN_REQUEST_JSON)" \
|
||||||
"host telemetry enrollment requested with commands disabled"
|
"Pulse PVE unified-agent enrollment requested with commands enabled"
|
||||||
|
|
||||||
setup_token='0123456789abcdef0123456789abcdef'
|
setup_token='0123456789abcdef0123456789abcdef'
|
||||||
setup_host='https://pve1.example.test:8006'
|
setup_host='https://pve1.example.test:8006'
|
||||||
|
|||||||
Reference in New Issue
Block a user