From 59c379ade1b195648bfff963da56b681d32266dc Mon Sep 17 00:00:00 2001
From: filippolauria <filippo.lauria@iit.cnr.it>
Date: Fri, 14 Mar 2025 15:11:06 +0100
Subject: [PATCH] clarify ping timeout labels and descriptions
---
src/lang/en.json | 5 +++--
src/pages/EditMonitor.vue | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/lang/en.json b/src/lang/en.json
index 9a01491c4..4538d8728 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1058,7 +1058,8 @@
"pingNumericDescription": "If checked, IP addresses will be output instead of symbolic hostnames",
"pingDeadlineLabel": "Max Duration",
"pingDeadlineDescription": "Total time in seconds before ping stops, regardless of packets sent",
- "pingTimeoutLabel": "Response Timeout",
- "pingTimeoutDescription": "Maximum time in seconds to wait for each response",
+ "pingTimeoutLabel": "Per-Ping Timeout",
+ "pingTimeoutDescription": "applies to each individual ping packet sent",
+ "pingTimeoutHelp": "This is the maximum waiting time (in seconds) before considering a single ping packet lost",
"pingIntervalAdjusted": "Interval has been adjusted according to deadline, timeout and packet count"
}
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index fdd87ff26..30ce5459b 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -598,10 +598,11 @@
<!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP only -->
<div v-if="monitor.type === 'http' || monitor.type === 'json-query' || monitor.type === 'keyword' || monitor.type === 'ping' || monitor.type === 'rabbitmq' || monitor.type === 'snmp'" class="my-3">
<label for="timeout" class="form-label">
- {{ timeoutLabel }} ({{ monitor.type === 'ping' ? $t("timeoutAfter", [monitor.timeout]) : $t("timeoutAfter", [monitor.timeout || clampTimeout(monitor.interval)]) }})
+ {{ monitor.type === 'ping' ? $t("pingTimeoutLabel") : $t("Request Timeout") }}
+ ({{ monitor.type === 'ping' ? $t("pingTimeoutDescription") : $t("timeoutAfter", [monitor.timeout || clampTimeout(monitor.interval)]) }})
</label>
<input id="timeout" v-model="monitor.timeout" type="number" class="form-control" :min="timeoutMin" :max="timeoutMax" :step="timeoutStep" required>
- <div class="form-text">{{ timeoutDescription }}</div>
+ <div v-if="monitor.type === 'ping'" class="form-text">{{ $t("pingTimeoutHelp") }}</div>
</div>
<div class="my-3">