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

Merge branch 'master' of gitops.sunet.se:eid-ops

Browse source
This commit is contained in:
Maria Haider 2020-11-04 15:01:34 +01:00
commit a6b030176f
Signed by: mariah
GPG key ID: 7414A760CA747E57
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ require concat
class eid::telegraf(String $version = "stable", Array $volumes = [], Array $ports = []) {
$influxdb2_token = hiera("influxdb2_token","NOT_SET_IN_HIERA");
$influx2_token = hiera("influx2_token","NOT_SET_IN_HIERA");
$influxdb2_org = hiera("influxdb2_org","NOT_SET_IN_HIERA");
$influxdb2_bucket = hiera("influxdb2_bucket","NOT_SET_IN_HIERA");
file {['/etc/telegraf','/etc/telegraf/telegraf.conf.d']: ensure => directory }
@ -13,6 +14,18 @@ class eid::telegraf(String $version = "stable", Array $volumes = [], Array $port
notify => Sunet::Docker_run['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 { "/etc/telegraf/telegraf.conf.d/95-telegraf.conf":
ensure => file,
owner => 'root',
group => 'root',
path => "/etc/telegraf/telegraf.conf.d/95-telegraf.conf",
mode => '0644',
content => template('eid/telegraf/95-telegraf.conf.erb'),
}
}
eid_glob(["/etc/telegraf/telegraf.conf.d/*.conf"]).each |String $file| {
concat::fragment { $file:
target => "/etc/telegraf/telegraf.conf",

5
global/overlay/etc/puppet/modules/eid/templates/telegraf/95-telegraf.conf.erb Normal file
View file

@ -0,0 +1,5 @@
[[outputs.influx2]]
urls = ["https://influx-1.sunet.se:8086"]
token = "$INFLUX2_TOKEN"
organization = "$INFLUXDB2_ORG"
bucket = "$INFLUXDB2_BUCKET"

2
log.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
View file

@ -4,5 +4,7 @@
---
influxdb2_token: ENC[PKCS7,MIIDDQYJKoZIhvcNAQcDoIIC/jCCAvoCAQAxggJkMIICYAIBADBIMDsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDDAKBgNVBAMMA2xvZwIJAKJzqf9oYCsrMA0GCSqGSIb3DQEBAQUABIICAJhthCOUa3kJqtsYYIEqLTrXo2yMq0fATP28uTXTQv0VX53m46Htwazda2o2h10HaNK9Zf+WnrhJ3T/moJA4Dge/IA3bfSOt8fqKO+ms14gm+LSHV46H4TPbzcuxKW4Hg2PKKtpPJWKeEP8JETbiyWnV/t980ZeXmOq2z9C63Fa5IMzeMQf10bw++egKSubg6soURq079FIbiu6tkZfJ9krlhQKHEkb1YpuHIFgzfuYgm8XD6Jj/Lr7iwtz+aEXWCNWA1tmD+G7Nbrv7MWg+tBBRJXZS3NCfDXs3NfRqG1dHCgyMdQFMkKc+qKytAZWX3HvRiXELERFPA86iqcMdpjRhp+a++7x/O49pkhSrhGPmYfrCutUARxRablw336hGHHX/gYA1c9a1Ok+jCha+NySFtvVW4I2uGbL+HFqJ1HcJj+Nln7wjc3xFIhUtZjrzKO0k4hBBmDSFQC6Be/U7hG2kZyKVAS0tCr7/+GW75QDBIr+0dupPVvm+nf+uhEeAfzxi4rDiDUMRgWw37yv8sWyZCTXRkGbjw/b3wPeVuDhCTqn4RWwNBYaZHYGhlHx4tt0GKgR7ai4+JSsGXaOaSru0rWW6+S5G7xB6NvOGOnEhIaYD7+QkAio7gkBPrvCHG9XoCe0seeAattWsYO+/0VpjXiG9J9/8Vab2Hnf8YCIRMIGMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDvAD6BebaqttB7yd7OfCeAgGCVMV8yriGfJbXGuYisaR919oUWIw3fawDI06N/6qCWn1OUhkFW2wsJurw+rcEb+pM/7FN8WloZQF5s4G5xN6rbnBLYo4hPFlMlNC4iLeOgDzMCqJeU6C12U8t075i1XZc=]
influx2_token: ENC[PKCS7,MIIDDQYJKoZIhvcNAQcDoIIC/jCCAvoCAQAxggJkMIICYAIBADBIMDsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDDAKBgNVBAMMA2xvZwIJAKJzqf9oYCsrMA0GCSqGSIb3DQEBAQUABIICABIOQqaPGKHzD8+exNIPIwSg/JiLxBYdk0i2wYJzzdRqu6e1gGgYFhweEfv0cRm8APhaU312U7kmuDeU0bAyd30ORvMLBA2C9yyg0wGZ8g+L98QJbnIi1eGQrMg/8M6Js7/yRvGEGm3CUopaNmMhcpdpGx5leZgNRM5cEe3v2/Cm5qZ4Yo6bjFTmE1y5Zwf9JljD8W6I3kouF7bjnC8oOeCHODDU0q3FuThGKQnG8gOAQDzR6I2LWzOQx32X5gcu0+t1HzGp5S7brt08roPpHMybiPiKjoMuxRfDtHH7MSn56jiPd67V9u2pk853+iDTuNoCcnSN2zVTqE5GkLJHGeQSrlePs54uijaMIZqcQUuNridj3rtQKh8H0MG/py11e3Gp9EeaEwvAdz56o4gha2zsHNmA9M/GE3eiqQ3TPTv1/mFCJ4ahs8qadcg/BQeGF/ZVJxUKB2X8/bbiiqmOF1vzbWk1zPoWZfI2ii7+yI9j88WPS/zm6qJ+8LW6phudrxvyGmMEyWiGXwrdUu/TwRZRUy9/mKWQPYNm7wXAyMkg7PT26C2WAu7aRrRNEZAZwaoDE1qqaPh+/WrTS4iL54rnFahvPSZPL3Li3OwUJRW/OD3WOjgT9Qp8k6pX7gAW7HFG5FtS3og2ZP0f8BxLC7oM28O+SPwMizM4UiN6yy9mMIGMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACbQM9q9IjifGATTR+4IBLgGDnt22aiHOGHVg96OC2weZCxzJiw8Km5nFuTeF8KvVWjepl+8Ujd4vIDZaaBy2ChICxHc4Uz6my49H/k2ElWcVjB0sUVPN/Uqvo7jIGEuLVQoONwT03IU+AkB7VdLi4fdE=]