From ad74413fdce6244aad45fd04dae4b17552118105 Mon Sep 17 00:00:00 2001
From: Patrik Holmqvist <pahol@sunet.se>
Date: Thu, 27 Mar 2025 09:27:03 +0100
Subject: [PATCH] Cleanup of telegraf2 class, SC-2522

---
 .../puppet/modules/eid/manifests/telegraf2.pp | 68 ++++++-------------
 .../templates/telegraf2/95-telegraf.conf.erb  | 17 -----
 2 files changed, 21 insertions(+), 64 deletions(-)
 delete mode 100644 global/overlay/etc/puppet/modules/eid/templates/telegraf2/95-telegraf.conf.erb

diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
index 6f9e2696..52770062 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf2.pp
@@ -11,56 +11,30 @@ class eid::telegraf2 (
   Array  $ports                  = [],
   String $service_dir            = '/etc/telegraf',
   Array  $influx_urls            = ["https://metrics-external-1.sunet.se:8086"],
-  String $influxdb2_org          = "SwedenConnect",
-  String $influxdb2_bucket       = "eidas",
-  String $influxdb2_bucket_proxy = "eidas-proxy",
+  String $influxdb2_org          = 'SwedenConnect',
+  String $influxdb2_bucket       = 'eidas',
+  String $influxdb2_bucket_proxy = 'eidas-proxy',
 ) {
 
-  # Get influx values
+  # Get influx password token from eyaml
   $influx2_token = hiera(influx2_token,'NOT_SET_IN_HIERA')
 
-  sunet::docker_compose { 'telegraf':
-    content          => template('eid/telegraf2/docker-compose.yml.erb'),
-    service_name     => 'telegraf',
-    compose_dir      => '/etc/',
-    compose_filename => 'docker-compose.yml',
-    description      => 'telegraf'
+  if $influx2_token != 'NOT_SET_IN_HIERA' {
+    sunet::docker_compose { 'telegraf':
+      content          => template('eid/telegraf2/docker-compose.yml.erb'),
+      service_name     => 'telegraf',
+      compose_dir      => '/etc/',
+      compose_filename => 'docker-compose.yml',
+      description      => 'telegraf'
+    }
+
+    file { "${service_dir}/telegraf.conf":
+      ensure  => file,
+      owner   => 'root',
+      group   => 'root',
+      path    => "${service_dir}/telegraf.conf",
+      mode    => '0644',
+      content => template('eid/telegraf2/telegraf.conf.erb'),
+    }
   }
-
-  #file {["${service_dir}/telegraf.conf.d"]: ensure => directory }
-  #concat {"${service_dir}/telegraf.conf":
-  #  owner  => 'root',
-  #  group  => 'root',
-  #  mode   => '0644',
-    #notify => [Sunet::Docker_compose["telegraf"]]
-  #}
-
-  # Below not pretty but I'm piggy-backing on this class to add a secondary output to test the new influx2-server
-  #if ($influx2_token != 'NOT_SET_IN_HIERA') {
-  #  file { "${service_dir}/telegraf.conf.d/95-telegraf.conf":
-  #    ensure  => file,
-  #    owner   => 'root',
-  #    group   => 'root',
-  #    path    => "${service_dir}/telegraf.conf.d/95-telegraf.conf",
-  #    mode    => '0644',
-  #    content => template('eid/telegraf2/95-telegraf.conf.erb'),
-  #  }
-  #}
-
-  #eid_glob(["${service_dir}/telegraf.conf.d/*.conf"]).each |String $file| {
-  #  concat::fragment { $file:
-  #    target => "${service_dir}/telegraf.conf",
-  #    source => $file,
-  #  }
-  #}
-
-  file { "${service_dir}/telegraf.conf":
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    path    => "${service_dir}/telegraf.conf",
-    mode    => '0644',
-    content => template('eid/telegraf2/telegraf.conf.erb'),
-  }
-
 }
diff --git a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/95-telegraf.conf.erb b/global/overlay/etc/puppet/modules/eid/templates/telegraf2/95-telegraf.conf.erb
deleted file mode 100644
index 314cf9b0..00000000
--- a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/95-telegraf.conf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-[[outputs.influxdb_v2]]
-  urls = ["https://metrics-external-1.sunet.se:8086"]
-  token = <%= @influxdb2_token %>
-  organization = <%= @influxdb2_org %>
-  bucket = <%= @influxdb2_bucket %>
-  insecure_skip_verify = true
-  [outputs.influxdb_v2.tagdrop]
-    influxdb_database = ["*"]
-[[outputs.influxdb_v2]]
-  urls = ["https://metrics-external-1.sunet.se:8086"]
-  token = <%= @influxdb2_token %>
-  organization = <%= @influxdb2_org %>
-  bucket = <%= @influxdb2_bucket %>
-  insecure_skip_verify = true
-  tagexclude = ["influxdb_database"]
-  [outputs.influxdb_v2.tagpass]
-    influxdb_database = ["proxy"]