swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sigh testing again soon.

Browse source
This commit is contained in:
Einar Lönn 2020-11-12 12:59:19 +01:00
parent 4bdb9679c8
commit 136bc747d1
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
View file

@ -35,15 +35,6 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
$_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf","/var/run/utmp:/var/run/utmp:ro",$volumes]) $_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf","/var/run/utmp:/var/run/utmp:ro",$volumes])
if ($influx2_token != 'NOT_SET_IN_HIERA') {
sunet::docker_run {"telegraf":
hostname => "${::fqdn}",
image => "docker.sunet.se/eduid/telegraf",
imagetag => "latest",
volumes => $_volumes,
ports => $ports,
env => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
} else {
sunet::docker_run {"telegraf": sunet::docker_run {"telegraf":
hostname => "${::fqdn}", hostname => "${::fqdn}",
image => "docker.sunet.se/eduid/telegraf", image => "docker.sunet.se/eduid/telegraf",
@ -53,5 +44,3 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
env => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"] env => ["INFLUXDB2_TOKEN=$influxdb2_token","INFLUXDB2_ORG=$influxdb2_org","INFLUXDB2_BUCKET=$influxdb2_bucket"]
} }
} }
}
}