From 2c1f0304feb99d72568d4c65c9febc796d8e3d96 Mon Sep 17 00:00:00 2001
From: Dave Marion <dlmarion@apache.org>
Date: Mon, 12 Jan 2026 17:09:59 +0000
Subject: [PATCH] Update telegraf yum repo due to upstream changes

---
 .../modules/config-files/main.tf                          | 8 ++++----
 .../modules/config-files/templates/influxdata.repo.tftpl  | 7 +++++++
 .../modules/config-files/templates/install_sw.sh.tftpl    | 6 +++---
 .../modules/config-files/templates/telegraf.repo.tftpl    | 7 -------
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 contrib/terraform-testing-infrastructure/modules/config-files/templates/influxdata.repo.tftpl
 delete mode 100644 contrib/terraform-testing-infrastructure/modules/config-files/templates/telegraf.repo.tftpl

diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/main.tf b/contrib/terraform-testing-infrastructure/modules/config-files/main.tf
index 5e8bb658..291a2777 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/main.tf
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/main.tf
@@ -223,10 +223,10 @@ resource "local_file" "telegraf" {
   content         = templatefile("${local.templates_dir}/telegraf.conf.tftpl", local.template_vars)
 }
 
-resource "local_file" "telegraf-repo" {
-  filename        = "${local.conf_dir}/telegraf.repo"
+resource "local_file" "influxdata-repo" {
+  filename        = "${local.conf_dir}/influxdata.repo"
   file_permission = "644"
-  content         = templatefile("${local.templates_dir}/telegraf.repo.tftpl", local.template_vars)
+  content         = templatefile("${local.templates_dir}/influxdata.repo.tftpl", local.template_vars)
 }
 
 resource "local_file" "timely-env" {
@@ -271,7 +271,7 @@ resource "null_resource" "upload_config_files" {
     local_file.initialize-hadoop,
     local_file.initialize-accumulo,
     local_file.telegraf,
-    local_file.telegraf-repo,
+    local_file.influxdata-repo,
     local_file.timely-env,
     local_file.grafana-ini,
     local_file.timely-yaml
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/influxdata.repo.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/influxdata.repo.tftpl
new file mode 100644
index 00000000..93b66a82
--- /dev/null
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/influxdata.repo.tftpl
@@ -0,0 +1,7 @@
+[influxdata]
+name = InfluxData Repository - Stable
+baseurl = https://repos.influxdata.com/stable/$basearch/main
+enabled = 1
+gpgcheck = 1
+gpgkey = https://repos.influxdata.com/influxdata-archive.key
+
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
index 07be706a..a91137a4 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
@@ -166,11 +166,11 @@ fi
 # (doing this in cloud-init puts it over the size limit)
 #
 %{ if os_distro == "centos" || os_distro == "rhel" ~}
-sudo cp ${software_root}/conf/telegraf.repo /etc/yum.repos.d/.
+sudo cp ${software_root}/conf/influxdata.repo /etc/yum.repos.d/.
 sudo yum clean all
 sudo yum install -y telegraf
-pdcp -g worker ${software_root}/conf/telegraf.repo /tmp/.
-pdsh -S -g worker sudo mv /tmp/telegraf.repo /etc/yum.repos.d/.
+pdcp -g worker ${software_root}/conf/influxdata.repo /tmp/.
+pdsh -S -g worker sudo mv /tmp/influxdata.repo /etc/yum.repos.d/.
 pdsh -S -g worker sudo yum clean all
 pdsh -S -g worker sudo yum install -y telegraf
 %{ endif ~}
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/telegraf.repo.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/telegraf.repo.tftpl
deleted file mode 100644
index 4d81379f..00000000
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/telegraf.repo.tftpl
+++ /dev/null
@@ -1,7 +0,0 @@
-[telegraf]
-name=InfluxData Repository - Stable
-baseurl=https://repos.influxdata.com/stable/$basearch/main
-enabled=1
-gpgcheck=1
-gpgkey=https://repos.influxdata.com/influxdata-archive_compat.key
-