diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 946a24d7..de984f12 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -17,6 +17,7 @@ syslog_servers: nagios_ip_v4: - 89.45.233.197 - 94.176.224.229 + - 94.176.224.101 nrpe_clients: - 127.0.0.1 - 127.0.1.1 @@ -24,6 +25,7 @@ nrpe_clients: - 2001:948:4:6::111 - 89.45.233.197 - 94.176.224.229 + - 94.176.224.101 ssh_authorized_keys: diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 23669b5f..8d866bdf 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -531,6 +531,9 @@ classes: memory: '4096' netmask: 255.255.255.240 search: [sveidas.se] + monitor-tug-3.komreg.net: {bridge: br-infra, cpus: '4', description: eid tug + monitor, gateway: 94.176.224.97, ip: 94.176.224.101, mac: '52:54:20:02:02:02', + memory: '4096', netmask: 255.255.255.240} entropyclient: null infra_ca_rp: null mailclient: *id002 @@ -650,6 +653,17 @@ classes: nrpe: null sunet::rsyslog: null sunetops: null + monitor-tug-3.komreg.net: + autoupdate: null + common: null + eid::dockerhost: null + entropyclient: null + infra_ca_rp: null + mailclient: *id002 + nagios_monitor: null + nrpe: null + sunet::rsyslog: null + sunetops: null natmd-1.komreg.net: autoupdate: null common: null @@ -891,10 +905,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] autoupdate: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, @@ -903,9 +917,9 @@ members: eupub-1.komreg.net, eupub-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, - natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, - nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, - prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, + monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, + natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, + prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] common: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, @@ -917,17 +931,17 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, - natmd-1.komreg.net, natmd-2.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se, - refidp-1.qa.sveidas.se, test-1.qa.sveidas.se] + monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, prid-1.sveidas.se, + prid-2.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se] eid::kvmhost: [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] @@ -947,10 +961,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] github_client_credential: [web-1.qa.sveidas.se] infra_ca_rp: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, @@ -962,10 +976,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net] konsulter: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, @@ -984,10 +998,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, p1.komreg.net, p2.qa.komreg.net] md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, natmd-1.komreg.net, @@ -998,7 +1012,7 @@ members: metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net] - nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net] + nagios_monitor: [monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, nic.komreg.net] nrpe: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, @@ -1009,10 +1023,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] @@ -1043,9 +1057,9 @@ members: kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-1.sveidas.se, log-2.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, - natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, - nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, - prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, + monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, + natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, + prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, @@ -1061,10 +1075,10 @@ members: 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, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, - monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, - natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.qa.komreg.net, web-1.qa.sveidas.se] + monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, + natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, + prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] swedenconnect_refidp: [refidp-1.qa.sveidas.se] validator: [validator-1.qa.komreg.net] diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index c152a7b0..2d2b24c4 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -48,6 +48,15 @@ kvminfra-tug-3.komreg.net: description: 'eid tug log' cpus: '4' memory: '4096' + monitor-tug-3.komreg.net: + mac: '52:54:20:02:02:02' + ip: '94.176.224.101' + netmask: '255.255.255.240' + gateway: '94.176.224.97' + bridge: 'br-infra' + description: 'eid tug monitor' + cpus: '4' + memory: '4096' kvmmeta-tug-3.komreg.net: eid::kvmhost: @@ -318,6 +327,11 @@ monitor-fre-3.komreg.net: autoupdate: nagios_monitor: +monitor-tug-3.komreg.net: + autoupdate: + eid::dockerhost: + nagios_monitor: + natmd-1.komreg.net: autoupdate: eid::dockerhost: diff --git a/monitor-tug-3.komreg.net/README b/monitor-tug-3.komreg.net/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/monitor-tug-3.komreg.net/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + diff --git a/monitor-tug-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/monitor-tug-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc new file mode 100644 index 00000000..cc6c613d --- /dev/null +++ b/monitor-tug-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc @@ -0,0 +1,24 @@ +STATUS=UPDATED + +-----BEGIN PGP MESSAGE----- +Version: GnuPG v2 + +hQEMA1oCdNtf0MkqAQf+PaOPlVeHOhTuUG5NziTgocSJRSg/DWUh+YQavod/jOe2 +Z5NuHqr19MB2orULEXr7+FTpcHo9IZ4oroe/aqTYs8AW1DKb8uhOGZm8Lb5JHv1h +wr1RfKbrPVLDpZ35NK7jELByLrifGoEbq54qZhmNnU0MjSCchEQOV4sCXIDic9My +3o6RTAzlKSYA6/uikmsYE0TiD06oTEBgqlN+Z/q3xuU7iEetEguv1N/eaI52bFaG +s2SfIeFSq2n0F91bHXYhz4rn9YSSavGw1HvycNBLIj7YsWxIcri4rPUTc458ufUx +Jv4awMSgNiQAjyNVL2xNygtMfuL7kHNGmbQgCI0AMNLpAb+Nm/MoMHrfA70CTwFX +tjr+NpzUXxh4jUrO4Alx9ZoV4qBuRZyWYrK939kQlxOx6YQgWr+y2bWDxA4SH/IF +fIOxfN9LXbpdZG45GdQExBAszA7HPLBiW3LrGn1Lhj9X93fRecY2Tqp2PHoDeajq +ddNtrolpGoXoe7QbrWSTh7gty3OrTN3PqeNDSDePHfIA9VtoAc1iA/TlC/MyIiVW +1Fqpi2/+h2WmvJcJrnqUQAS5y+ObMPTojiI5+0Jf7Fr8rzGj6O176NbRPbXIVwjr +qd4zEGh8Ohx+CFQoUaGsAAzRKLuiIrcYT6TYwPgwQQLM2udEkSWQ6yQlt4qukB8l +GAMGlEDXBMYfSpbXjxBk0i2L22BYmycU30pTPgx6l+EgLILpwQstEqY6lwFTD42F +lqFJjgs37NMi+CK3+J4kAXHXxLngex4BljHm6gyLZruAGHeTHjOAGhUDm3MKOqnf +SBjPKh/7GDEFSNj+oMi7+JJvyhn7gZSru00fiW+6IiAq7s/kD7zdomroi69/5J8S +iMjgY8K/9hdJili89pirwnhjeuCol2yaAC0XUXxjStqmmPROQK1mcBI1nVvX7ADG +A0zfCyTEBBqV84pwsx5O2o6crrELCQ4lNaQw0ViQmR6hB17u5ccxOxiAquYbEf0A +x84Ype6Gq+eA96PgKdEJVmkbB6x1wvjwzYYEtkJCs5yixlAtaETgBXf0yzq4 +=9V1N +-----END PGP MESSAGE-----