diff --git a/LibreNMS/Polling/ConnectivityHelper.php b/LibreNMS/Polling/ConnectivityHelper.php
index d6eb3fa3d1..0fa31355f1 100644
--- a/LibreNMS/Polling/ConnectivityHelper.php
+++ b/LibreNMS/Polling/ConnectivityHelper.php
@@ -151,7 +151,7 @@ class ConnectivityHelper
 
         return [
             'traceroute' => $process->getOutput(),
-            'output' => $process->getErrorOutput(),
+            'traceroute_output' => $process->getErrorOutput(),
         ];
     }
 
@@ -201,8 +201,9 @@ class ConnectivityHelper
     private function savePingStats(FpingResponse $ping_response): void
     {
         $perf = $ping_response->toModel();
+        $perf->debug = ['poller_name'=>Config::get('distributed_poller_name')];
         if (! $ping_response->success() && Config::get('debug.run_trace', false)) {
-            $perf->debug = $this->traceroute();
+            $perf->debug = array_merge($perf->debug, $this->traceroute());
         }
         $this->device->perf()->save($perf);
         $this->device->last_ping_timetaken = $ping_response->avg_latency ?: $this->device->last_ping_timetaken;
diff --git a/doc/Alerting/Templates.md b/doc/Alerting/Templates.md
index 22f5a16b4a..43e1afa117 100644
--- a/doc/Alerting/Templates.md
+++ b/doc/Alerting/Templates.md
@@ -64,9 +64,11 @@ been up for 30344 seconds`.
 - ping min (if icmp enabled): `$alert->ping_min`
 - ping max (if icmp enabled): `$alert->ping_max`
 - ping avg (if icmp enabled): `$alert->ping_avg`
-- debug (array) If `$config['debug']['run_trace] = true;` is set then this will contain:
-  - traceroute (if enabled you will receive traceroute output): `$alert->debug['traceroute']`
-  - output (if the traceroute fails this will contain why): `$alert->debug['output']`
+- debug (array) 
+  - poller_name - name of poller (for distributed setups)
+  - If `$config['debug']['run_trace] = true;` is set then this will contain:
+   - traceroute (if enabled you will receive traceroute output): `$alert->debug['traceroute']`
+   - traceroute_output (if the traceroute fails this will contain why): `$alert->debug['output']`
 - Title for the Alert: `$alert->title`
 - Time Elapsed, Only available on recovery (`$alert->state == 0`): `$alert->elapsed`
 - Rule Builder (the actual rule) (use `{!! $alert->builder !!}`): `$alert->builder`