From 6c68b487f1dd6d5184f01ce2cd69fbd64cfa9b6b Mon Sep 17 00:00:00 2001
From: Fanny Jiang <fanny.jiang@datadoghq.com>
Date: Fri, 14 Feb 2025 13:34:24 -0500
Subject: [PATCH] fix ubuntu kitchen tests

---
 manifests/init.pp                            | 2 ++
 templates/installer/telemetry/log.json.epp   | 2 +-
 templates/installer/telemetry/trace.json.epp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index badd8b62..952a7673 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -395,6 +395,8 @@
     $_agent_major_version = $agent_major_version
   } else {
     $_agent_major_version = $datadog_agent::params::default_agent_major_version
+    $_agent_minor_version = 0
+    $_agent_patch_version = 0
   }
 
   case $facts['os']['name'] {
diff --git a/templates/installer/telemetry/log.json.epp b/templates/installer/telemetry/log.json.epp
index c0dd58f8..c303a1d8 100644
--- a/templates/installer/telemetry/log.json.epp
+++ b/templates/installer/telemetry/log.json.epp
@@ -6,7 +6,7 @@
   "seq_id": 2,
   "origin": "puppet",
   "host": {
-    "hostname": "<%= $hostname %>",
+    "hostname": "<%= $facts['networking']['hostname'] %>",
     "os": "<%= $facts['os']['name'] %>",
     "distribution": "<%= $facts['os']['family'] %>",
     "architecture": "<%= $facts['os']['architecture'] %>",
diff --git a/templates/installer/telemetry/trace.json.epp b/templates/installer/telemetry/trace.json.epp
index bfb274a7..1c20c058 100644
--- a/templates/installer/telemetry/trace.json.epp
+++ b/templates/installer/telemetry/trace.json.epp
@@ -6,7 +6,7 @@
   "seq_id": 1,
   "origin": "puppet",
   "host": {
-    "hostname": "<%= $hostname %>",
+    "hostname": "<%= $facts['networking']['hostname'] %>",
     "os": "<%= $facts['os']['name'] %>",
     "distribution": "<%= $facts['os']['family'] %>",
     "architecture": "<%= $facts['os']['architecture'] %>",