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:
Erik Bergström 2022-04-07 14:01:48 +02:00
commit cf34bc80e1
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eidas-proxy-1.qa.sveidas.se/overlay/etc/telegraf/telegraf.conf.d/50-json-input.conf Normal file
View file

@ -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"

5
global/overlay/etc/puppet/cosmos-db.yaml
View file

@ -184,6 +184,7 @@ classes:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.5~3-0~ubuntu-bionic'} 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, eidas_proxy: {hostname: qa.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION,
version: 1.4.6_hsm2} version: 1.4.6_hsm2}
entropyclient: null entropyclient: null
@ -1646,8 +1647,8 @@ members:
eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, 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, 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] 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, eid::telegraf: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.test.sveidas.se,
log-1.test.sveidas.se, log-2.sveidas.se, log.qa.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: [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-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] eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se]

1
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -1073,6 +1073,7 @@ log-1.sveidas.se:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.5~3-0~ubuntu-bionic' version: '5:20.10.5~3-0~ubuntu-bionic'
konsulter: konsulter:
eid::telegraf:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
servicemonitor: servicemonitor: