From 51ec1331832fe8f03bee29019ba649bf101c2334 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 10 Mar 2023 14:09:39 +0100
Subject: [PATCH] dnsdist: Report per-incoming transport latencies in the web
 interface

Since 1.8.0 we have separate latencies based on the incoming transport,
but the internal web interface was only reporting the UDP one.
After this commit the interface will display the latency for UDP, TCP,
DoT and DoH queries.
Reported by Stephane Bortzmeyer (thanks!).
---
 pdns/dnsdistdist/html/index.html | 3 ++-
 pdns/dnsdistdist/html/local.js   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pdns/dnsdistdist/html/index.html b/pdns/dnsdistdist/html/index.html
index 7e2599780b..4f3bc695e9 100644
--- a/pdns/dnsdistdist/html/index.html
+++ b/pdns/dnsdistdist/html/index.html
@@ -50,7 +50,8 @@
     </tr></table>
     <p>
       Uptime: <span id="uptime"></span>, Number of queries: <span id="questions"></span> (<span id="qps"></span> qps), ACL drops: <span id="acl-drops"></span>, Dynamic drops: <span id="dyn-drops"></span>, Rule drops: <span id="rule-drops"></span><br/>
-      Average response time: <span id="latency"></span> ms, CPU Usage: <span id="cpu"></span>%, Cache hitrate: <span id="phitrate"></span>%, Server selection policy: <span id="server-policy"></span><br/>
+      Average response time: UDP <span id="latency"></span> ms, TCP <span id="latency-tcp"></span> ms, DoT <span id="latency-dot"></span> ms, DoH <span id="latency-doh"></span> ms <br/>
+      CPU Usage: <span id="cpu"></span>%, Cache hitrate: <span id="phitrate"></span>%, Server selection policy: <span id="server-policy"></span><br/>
       Listening on: <span id="local"></span>, ACL: <span id="acl"></span>
     </p>
     <table width="100%" cellpadding="20">
diff --git a/pdns/dnsdistdist/html/local.js b/pdns/dnsdistdist/html/local.js
index cbf9534063..05277e4e9c 100644
--- a/pdns/dnsdistdist/html/local.js
+++ b/pdns/dnsdistdist/html/local.js
@@ -151,6 +151,9 @@ $(document).ready(function() {
                 $("#rule-drops").text(data["rule-drop"]);
                 $("#uptime").text(moment.duration(data["uptime"]*1000.0).humanize());
                 $("#latency").text((data["latency-avg10000"]/1000.0).toFixed(2));
+                $("#latency-tcp").text((data["latency-tcp-avg10000"]/1000.0).toFixed(2));
+                $("#latency-dot").text((data["latency-dot-avg10000"]/1000.0).toFixed(2));
+                $("#latency-doh").text((data["latency-doh-avg10000"]/1000.0).toFixed(2));
                 if(!gdata["cpu-sys-msec"]) 
                     gdata=data;
 
-- 
2.47.2