From 4fbcf174cd8729d476ebdd1cd85080a8e8319694 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Thu, 7 Apr 2022 12:39:58 +0200 Subject: [PATCH 1/3] Add telegraf config for proxy in qa. --- .../etc/telegraf/telegraf.conf.d/50-json-input.conf | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 eidas-proxy-1.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf diff --git a/eidas-proxy-1.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf b/eidas-proxy-1.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf new file mode 100644 index 00000000..4f0b4d87 --- /dev/null +++ b/eidas-proxy-1.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf @@ -0,0 +1,8 @@ +[[inputs.tail]] + files = ["/var/log/eidas_stats.log"] + data_format = "json" + tag_keys = ["type","timestamp","connectorEntityId","requesterId","loaMatching","connectorCountry","spType","requestedLoa","eidasResponseLoA","eidasRequestId","eidasResponseId","principal","nationalAssertionId","nationalRequestId","nationalIdP","eIDASAssertionIssueTime","eidasAssertionId"] + json_name_key = "type" + json_time_key = "timestamp" + json_time_format = "unix_ms" + json_timezone = "Local" From 9c53cbdd32e994ebde5088ac23b20d9d6a76f8f6 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Thu, 7 Apr 2022 12:40:54 +0200 Subject: [PATCH 2/3] Add telegraf to proxy service in qa. --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index f7576871..7bad478e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1073,6 +1073,7 @@ log-1.sveidas.se: eid::dockerhost: version: '5:20.10.5~3-0~ubuntu-bionic' konsulter: + eid::telegraf: sunet_iaas_cloud: autoupdate: servicemonitor: From f2a9d71409bbe36173a3c016704ca0d81e1bcd45 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Thu, 7 Apr 2022 12:41:31 +0200 Subject: [PATCH 3/3] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 6c7a2d46..b8182c7b 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -183,6 +183,7 @@ classes: autoupdate: null common: null eid::dockerhost: {version: '5:20.10.5~3-0~ubuntu-bionic'} + eid::telegraf: null eidas_proxy: {hostname: qa.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, version: 1.4.6_hsm2} entropyclient: null @@ -1645,8 +1646,8 @@ members: eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net] - eid::telegraf: [eidas-proxy-1.test.sveidas.se, eidas-proxy-2.test.sveidas.se, log-1.sveidas.se, - log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se] + eid::telegraf: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.test.sveidas.se, + log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se] eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se]