From 3ae633e14e0b9fec1e03dc3cd4083bff40419795 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 16 Apr 2018 10:12:17 +0200 Subject: [PATCH 1/8] added my ssh public key --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index d8ea784e..374828a2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -471,6 +471,14 @@ class sunetops { user => 'root' } + ssh_authorized_key {'mariah+CA747E57': + ensure => present, + name => 'mariah+CA747E57@nordu.net', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQfL3uYsqjzkKOxn9nhjDHeWdWQ5SRwcPzq7gINcwJ7omA5c7wJ4RKDqBPihJ9tp2rgM6DKKGxtSyjO6LFhkGNa86uub2PLS0ar+aRobPZ6sOeASqHbO3S1mmvZZWTQ30AFjtY98jjlvfKEI5Xu1+UKyQJqK+/UBVKlPaW6GMSYLr9Z5Uu4XS/sBPdL/ZtR95zDO9OKY8OtTufQi8Zy3pl4Q3xcOsSLZrKiEKMYDCLPlxytHD8FDDYLsgiuPlbF8/uVYYrt/LHHMkD552xC+EjA7Qde1jDU6iHTpttn7j/3FKoxvM8BXUG+QpbqGUESjAlAz/PMNCUZ0kVYh9eeXr', + type => 'ssh-rsa', + user => 'root' + } + # OS hardening if $::hostname =~ /kvm/ { class {'bastion': From f12ae80cd0ae157a6dbaffe17c8c4dc8c1ac0f8f Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 16 Apr 2018 10:16:25 +0200 Subject: [PATCH 2/8] added Berra's new gpg key --- .../etc/cosmos/keys/berra-96E0A9D4.pub | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 global/overlay/etc/cosmos/keys/berra-96E0A9D4.pub diff --git a/global/overlay/etc/cosmos/keys/berra-96E0A9D4.pub b/global/overlay/etc/cosmos/keys/berra-96E0A9D4.pub new file mode 100644 index 00000000..23ea05cb --- /dev/null +++ b/global/overlay/etc/cosmos/keys/berra-96E0A9D4.pub @@ -0,0 +1,112 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: GPGTools - https://gpgtools.org + +mQINBFpk+4kBEADeRoAvo+sbj6GFc7NOY0P1QasAiSTqYztHsfUk/dht8izxcd3G +ba3QBX4CZlKZkpk8cYbmztOO2EroJWjKg6SDQUfCh+QE/Hx+f2xfVax3118cEbRo +ClnfA1CD9+vMEvFRB39UrGckxHp0wxcUtSQXwxTSVhw1HxRVLPDj5xJ/W5H7GwEA +Rmrj4S0OIRU9gJUlqLW8k18c8Di1asr0y99Fuek5Mw/oRZhkx8+41dRB0lG2BNOZ +ncyDi9wSLi8sC4udCZuv0pVtTHR/onGrEYi71PpY7XYAL0YZnp6RB8ObdchMNZVH +1WKED/aK2MVJoAMXmpA7SVRaGw+dUvJBwtnKqSUT1lNgX6dTyKdxPKdvzmcb1htM +byx1mc1ruQy+sLQ+ZtWgRENvrPpYZ2vcQ3vSZ9YOXt5m75JzbfGNHyCAWhziwhVX +u+UqPPKU8k8GVato3tB6PcAugG5OCqGE9EmJG7a+VFThDjJeWAGBolWydBeIqk7B +NeM3zA/K0PwY/YlLc01bmiquCS5Z5MQwPHRGMKmuEtfJmSBOjv7CGnNFm4kkfRzr +5TR6J9oWlFZXs0cJcJWxrwutYszBbNUgRebij5U6ju7QnJYH5zqctIYafpqotcoR +I5VaZmeYhGBaZdf6ZW/bcDSQJYoi9wsfKU2Mcgb5GY3Aey6z9EYxNoqstQARAQAB +tB9FcmlrIEJlcmdzdHJvbSA8YmVycmFAc3VuZXQuc2U+iQJUBBMBCgA+FiEEH7Iv +tEkmWDvHQAEiSaQlHJbgqdQFAlpk/MgCGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgID +AQACHgECF4AACgkQSaQlHJbgqdRZ9A/+NIPwthDlQUXqsgKKLgVh/VV7MbYhW9Ie +/lUmOIrw9lwreJYQs8U1cfvueyvU0/XsWvzpU6/Q002HIMsuHN0eCIra6Voxa5zF +RUI/7d2VtoG0OvPH9Pl+zblDQhjUoGFZB6FPJ+bxQFf0GkxDfQKebb0uyfyP1GlF +UABTYmmCkhHtbTRFbi+wPwGs96X+5kL914CLgx83QjgyG3+8uixyMstZjoV29lN/ +pp3W/ax0ovuteZPsh9mXdWJ4LSCso6mOGqqipKnw5HPXFC+hrlR8XBAR4EmHG0qA +ZA76/oKrJnWWF62Px5pP+Ti8f+8eXVYQDx8s6dZmJFSND55i31kTuoy3t9/eXkMZ +VOfGmiXhkVpY3qntfqJ5S7o86tXiOteFBgs5XWvfJvRl3FsTT51NusOEj6fAb+Jr +H9G+sk1KFyKhqxFUfU/xM01i788DBw+NLbiQBySKXrMD/sn8zV4yoRNFuRGSjv9K +UWkl93LkOu81C3BvuHbQK5EcsU1Ipa/0UJjOcT8P/NYuM3bcAAwMI6bFXJRSjUNc +U12qR106s+s7wdsDqXZ0BeTaxvqbHL5/xc7m+WaaqMLMYNb/YBwyGOFsODkZU+Jv +0xsuW06iSZopwOJIwhSoG29SUJOR/3ivUDdIeZFFUvesJr1H0JFfqjagvoKBL7s5 +EFiZH+1tUXeJAjMEEAEKAB0WIQQ1TU+CEZFX8KHW4icToPXn2nwJmwUCWmr7uAAK +CRAToPXn2nwJm8qgD/9qx+e/Ke3u275rKDxQW3Ycx4Yo9BlQT17d5zrx61y60Ivu +7mO4jSaC1uDFdrUrx1OjkyEs25oLq2uxm7RrDEUceVN0PH72OltVSqIj4TASxgSw +BbKduXtwvwjGF9rPMpjJ15ReDosnHTQwUAZJ+xOaoTC35ZHVbrNruSBhSpbjUCSI +uUpu0LHqv9ug2qZorkqvg4C2IjrOnaY8Vmyy0qHHVQNBgAtZSYQhd7rIwwBHvVbP +VWNzRvyFTKTkfNZFnjljCbkCMxdIgisg23qGCC9O+UJ56wl1XoetHPzvTqe7eCeV +aizSDcXgdp0ZKdbGu/mPMPFg8+EXMdzaOJarrAihUw0RgY47cyAzRs/Y/nbJcdgw +kJWFpzu/CcjPlGgbisLhOcf3vG+vFcdKtZoWxBdysd37JJZsZrJijyaOAZj0w95u +wIf7ABChwkMY5aj27HOWwYCREhusNnsfxG2wOZAz36TdyC0gneJfE2/mJ1/YQ5m4 +1U9WdQcCH/rFJvId3GZDrd1XSZBfv03gO/vhucB29zEoK3jHvbfOwu/5kej7E3Ak +uQ1ehCXaSaBOKA7g71/f7bWnDjPEgxj3PrJyNQ4ML7AWcxflcvjbisoe+HiJiQze +BDhNZCm4oqg/kV0BLqJvMqSx4DxOXilKE5bvqvvyroLNC+W6DTpzMhVarUhWx7Qg +RXJpayBCZXJnc3Ryb20gPGJlcnJhQG5vcmR1Lm5ldD6JAlQEEwEKAD4WIQQfsi+0 +SSZYO8dAASJJpCUcluCp1AUCWmT7iQIbAwUJAeEzgAULCQgHAwUVCgkICwUWAgMB +AAIeAQIXgAAKCRBJpCUcluCp1Ph6EACZBXwZrkhOcRmvkctZ9S7tcGCtbBbGQ02H +fQBH4rvsf9DVsVJVHoMsmViqL4Jb0aJ0OyrlPTbfCJWOaLYrZ58EdTD7VgUyoQUx +PL43Fehj6g6+7kXjpFGtw2lrSd0NEc420IhlTsG6LWQCAYuhZXvrsWyRmv7aG0B7 +mP49C00HxQqavvXvvqWyV0PIIYmEmp4Zpi0Qpbi4USgEhqne74uMmVxtJOFhloTW +dLrh434y17h70tvD3gpTzKg3unZQCLFui/wgpJRoBDvwjcFHr9Ms1HBJHQdY/Tsp +KiZjcWDu/H9QX7e0s9zD/UhKk4LtXiYX6GBcM4sexPIMlRg0tT1q99dj1MqdCYsa +Tba+4RUwhBjkpa752VDFUpywxPbtutAbrVxq/82Ban68GRwfM9disUSnFCUGrLBZ +m1lGOwF3vSvxIX3votHXySYB2tbOVOw0xDM3FNEU0tu14cIfr/oUJsIV7eL1q/v/ +1c92+KlhJIOLmfBKp9xQkUetZpai51jZXzfjhoCFXQ03IfIDhikrq1QFgemywcUt +CCWOBCTwXfrqMK40cofcKY5mjlczz/flHP94pfzGkrX1io0eCS+USXLHYT94++iK +LKlj9d8Dbcu+N0LuaYdQZv/gRcbm8lTDDMVhyhETJ/bPxkiL87BxRExlm5nDA/jJ +gm0v7MFoKYkCMwQQAQoAHRYhBDVNT4IRkVfwodbiJxOg9efafAmbBQJaavu7AAoJ +EBOg9efafAmbE6kQANPGtPM/Qbt5DqiFN/pvAS0QjF9B8neqdB283ANAMDoLDCy0 +0KJTCXcG9tZCZXiUWv0N9Cd92GaEtSdKn02Ncbi42kTLyRF1+bo51ku7PF9FTMdU +lhtSo+/1hUrktYjc00I4rWkK5osTBccHX5VytQhMVnXngNdDCQ9Zom2l4cocrDn9 +n50775AcvhRzkzpALNHfDUZ4rVjskZKGMBZ60xU2FMvxwnxpuxDptwuBZaW3iVAv +V0pqqXZU07UasTJg7HMdzrvJU7OJtW5rvY7AI7LMO/VqJGgTPOOY7Y3F0OL4b6ml +Lk5yf3VfygnZwAZZ81nQ6pnyJLOZGnApmfuaETEdzqldmqzP39EdwW+FVidUr2SW +BDUZYOMDy1sNYl5UepH9HlxqUN6heXZyozlPEEppyR7lYeuNv/vvZN/u9cbbUX87 +AO8o0DlSQnOmK2djkk2focucRkPYJDgxa0UR5sOKM4ePjk79HbGSbpzhFiIeTPpS +Os3YzHzlF/NC+AYVWQGXQahv4OFayxFFnQz6Bf/VUibqPx2mcsRKJvGdovfd/Zif +oLSgD30vUcah0u2xm+OC9oKBUEHkWtoOKLcexxGkt67VqMrY85bECOZhyrmV4WHw +mm40R5DIf3P4d0hs0qoLnzENn7qokdiaoF1v4/ZK4S0c5pZINxk7sv5adHssuQIN +BFpk+4kBEAC7yqRbae/se4eUF14+pePi+ZRNyTsdhc+vW2pRDQwtgSi6Rgs/cnTQ +njKbxWhvmGxM6lKm+N59J+N9aGOMSf+BGWabxfN/HIf4+slaI+89ErOnKUtXcXnh +xPxLGfa1OpEeFSMihjNFoCTCEngtk+D2ng41GOKb/qh3IItbLasqev6Iy6A88L9U +Zt9Orznzd5vctR6nk+nJwnsbVE65HQuT7jiMr9oWKIqZpsB3va7kGwzcC8j1EGIF +HxdT509exAaoAEco/aN7ywLD3JWPCYXEj1Xnq1GZHkh/2W9gHDQzLKEXdoJ0hOnm +GHhRdC/MHZZYrTSkvb1byBJIamC7HTK4rkU3jDJZwXeCUpdxuxlh4KHv0OzvMwJ5 +r/yS4j5KhbUhTcJ41gSDIy3bH9/WguAKOY9TYLitBZBcOUNnA6Oc3iTZDex0Al2I +z0kYAJK4NJxJ6QIe7VwgXV/HwdBUhy9tGbfSYXzPDusfjv8Q5qtz42S1RPkP4w0o +chb1KdD76i5N/HAknHvTbC626IQ+HAELyG94exy0mhjjzIVLdUfz05BtKirZPMqa +NFpAeLJbJ4pW7iU3IHlb2Hj1oBKOfkZ/6T/sIqwigJZj4aFsrl1IcoAW8y2XHOMp +Q20/PGf0PA0kbJ8jfmAn/2Qnpz09g656aSbiawkbgz8OR6+WtX6X9wARAQABiQI8 +BBgBCgAmFiEEH7IvtEkmWDvHQAEiSaQlHJbgqdQFAlpk+4kCGwwFCQHhM4AACgkQ +SaQlHJbgqdRR9A/8DjhZE1zy/d/PLIZFreKwtdPg0T4sY0iJXCl3XXiDePLsoEDm +kNVRG5r7/Mx1Hzxaf9MySnP6YYwDvKfgDzqcIznwm8Gc2MFQ5gXdyVMWzUV69Nma +2Y3CQ8rtvLxod0rP2gTIon/GxmkcFChpNp3CPyu7fIHjwVLv9eoHfpsxsw5fdn+v +2g3bNWm+R+R5a/Na335cPikXql6tl55ErHmRmhijZof+T9OVvHpspfKCsaq1yyb1 +r5E+tlPP69XXid0N35zUEGTJ2nJ7Wn1kPGTiKhFYoh1HksN4P62OXOm8bxf53WgP +Ti14cneTPbNcBED4ghE31Z8TaAoAwbzx3UVw+tAFQczhncudcmKpJZhc38sDKpH/ +wPccJztmobMOkYND6fDMIrnzmdCbESuDaToOf0YlqAWx9rybo5ClisGEKRJcK37d +iH3eMo17Aj/BwjGBUZgvZr93wZL3ZSWUNklQaeubtIBSJHeNlhphC/S1w4r9vkuz +pqnNF4Oq8S5wkfMRD3sEy/I5FL/oJwuYCubf7ZVkAifqLWSIcD6XRzoJ1pdR+5Zs +P3l3HIlC4PUfvB9VTy5lUwuJyBM3PILD0XPfYb4XjuJJxDOxdlCSddE/nhwHWvaU +ipDwyoNMknBoGtlRq7zdAsoRo/xaCedhlkTYPu8+CCqGFlXJwwA+1P140vi5Ag0E +WmT82gEQANLhyooD5T8reN9yqakSOBnGoe5NqWbDwuObbrFFI/jiq8SV8MzDMOC4 +MRgRKSeR/gulj40r+fL5s8bs9QFa3WbK3galHerfQ9F+TPCJaVWc0GkH2M2P3yH7 +ANTugqnp+JENzPF3ybypht2c8RueM8QIkcCUG1HTf4G2JYky6HppkcCgWgpQjoXV +J1foyPfxPDqwTITWPR9mgpYu89+eCV2eePZS+F7EcXGZPji3KGSISThDOpu0tBBT +iLtS5fBmcrO0u1g7GNy9KVSwixvpHiCPsxeodjIH5o4Bg4/5OBlzoLsLfgdKQyQ8 +HHCP/VtmGwZIhVrAVT08lN3dI9cFosfYtpzLlE8C2suEhX0yGJHPnfel8qC1Ly5p +x5MDIAkWExssHPN/g9VEMsE0taZwhdPmkcHm8rhz1cxBA9mb2J2lBP6pOp+l2csL +LIr5g2e2gV9KdNq4ognNWD+khWWStKVp1x1Cy2CiJ64pYGzkFxFPFu89L9XG8Gjt +0XwoYM01gn20K3qb3yrSvjFh3exyqfE51DuqUntAXxv3KmgITjs6/OCHd+qXjJKf +Wh7bEnNmywtQZHsfqC3p8Ob7juP9R0HuxlV3q72BVXsfGBPtWPnNeMHCszAQLoao +eoyznXTDddDye8BoBJvhcyI1fayLtOxD5nkXoW/ddk0ym+JlNBnNABEBAAGJAjwE +GAEKACYWIQQfsi+0SSZYO8dAASJJpCUcluCp1AUCWmT82gIbIAUJAeEzgAAKCRBJ +pCUcluCp1KD/D/9JhkS+w9UTdBrpdZt1YCnth9sm6hIFG736I64CgFtUaVwN+0jM +0hVAnYSo0SFMCH4wj6aWo3hwp2EVwPLmh93MZNdLEqIRzy+iWzlvJiRuc+YHr/NE +d3HnbqJAV+9GqQeH1QRVzz+4ALhlriT02lKfGpCfNZMhmjLfaa1LlDLeYbkQnr0S +K+gyk5rEsOepZo4OIegJ16cg3o/7OmPDPR86rPoOkx+PEPqKcjDWE7zF/CoVbkcQ +bFjzHeaYq3tGhdczIQz4aplLULdqbHwWuYHztABuIIfSIelFPn1ragcEaNumProc +sO9BXfwFEAqaOGpTxixBALOVuCoGMPmHSvnIho/cxOGkjKxCEypc6sFg36HGotwU +nGErWT6FKq+keWMjyYRlUZOdmO2/u0eJLF2T9VGRF4eVuZzOd1HX8lnH5zNzSYk0 +9UXEzRw0bT1MU//gTIFJ9ucErI08y/xxixKaIpw5m3tsQl0TTFsnLDzA5XwU7Cwr +Iy8HyY9oo9flsJh7lY3+ccva4FBtIpEqh9iacW78WIgPl9wZBpLM8DRqayialQpZ +JrItBLUadUmpjg448sgRru5gjTk0jiVGticDnnKfDd8VxCvj07WLZakprugwX6RB +tmjkCRk7OFxJhh5gTerBY5hpzlMAu6vsdpSu1jP8F7tfJqV8u/TT9A+wPw== +=97dC +-----END PGP PUBLIC KEY BLOCK----- From 5f09bbce2a1400e532a0787025dba4c00fcf74b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Mon, 16 Apr 2018 10:19:27 +0200 Subject: [PATCH 3/8] added new ssh key for berra --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 374828a2..04e2806a 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -463,6 +463,14 @@ class sunetops { user => 'root' } + ssh_authorized_key {'berra+96E0A9D4': + ensure => present, + name => 'berra+96E0A9D4@nordu.net', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDS4cqKA+U/K3jfcqmpEjgZxqHuTalmw8Ljm26xRSP44qvElfDMwzDguDEYESknkf4LpY+NK/ny+bPG7PUBWt1myt4GpR3q30PRfkzwiWlVnNBpB9jNj98h+wDU7oKp6fiRDczxd8m8qYbdnPEbnjPECJHAlBtR03+BtiWJMuh6aZHAoFoKUI6F1SdX6Mj38Tw6sEyE1j0fZoKWLvPfngldnnj2UvhexHFxmT44tyhkiEk4QzqbtLQQU4i7UuXwZnKztLtYOxjcvSlUsIsb6R4gj7MXqHYyB+aOAYOP+TgZc6C7C34HSkMkPBxwj/1bZhsGSIVawFU9PJTd3SPXBaLH2Lacy5RPAtrLhIV9MhiRz533pfKgtS8uaceTAyAJFhMbLBzzf4PVRDLBNLWmcIXT5pHB5vK4c9XMQQPZm9idpQT+qTqfpdnLCyyK+YNntoFfSnTauKIJzVg/pIVlkrSladcdQstgoieuKWBs5BcRTxbvPS/VxvBo7dF8KGDNNYJ9tCt6m98q0r4xYd3scqnxOdQ7qlJ7QF8b9ypoCE47Ovzgh3fql4ySn1oe2xJzZssLUGR7H6gt6fDm+47j/UdB7sZVd6u9gVV7HxgT7Vj5zXjBwrMwEC6GqHqMs510w3XQ8nvAaASb4XMiNX2si7TsQ+Z5F6Fv3XZNMpviZTQZzQ==', + type => 'ssh-rsa', + user => 'root' + } + ssh_authorized_key {'berra+DA7C099B': ensure => present, name => 'berra+DA7C099B@nordu.net', From c3e2e77f2e498ae716cd395755e1aa3beaf8f423 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 17 Apr 2018 15:33:49 +0200 Subject: [PATCH 4/8] Created a class for a special check only for nic.komreg.net --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 + global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 47448751..c2fb9c3f 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -25,6 +25,7 @@ nic.komreg.net: autoupdate: konsulter: nagios_monitor: + nic_checks: r1.komreg.net: sunet_iaas_cloud: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 04e2806a..ce297582 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -675,4 +675,8 @@ class nagios_monitor { # description => 'check https certificate validity on port 443', # contact_groups => ['alerts'] #} + +class nic_checks { + sunet::nagios::nrpe_check_nagios { 'nagios': } +} } From cf137f0a8afac2af24ff09ba225a72943455085b Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 17 Apr 2018 15:33:57 +0200 Subject: [PATCH 5/8] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 7b834e71..88f60157 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -176,6 +176,7 @@ classes: konsulter: null mailclient: *id001 nagios_monitor: null + nic_checks: null nrpe: null sunet::rsyslog: null sunet_iaas_cloud: null @@ -281,6 +282,7 @@ members: md_repo_server: [r1.komreg.net] md_signer: [md-eu1.qa.komreg.net, md1.komreg.net] nagios_monitor: [nic.komreg.net] + nic_checks: [nic.komreg.net] nrpe: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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, From dd228a8a96d22674a43d4a5172a12c7108b8e3b2 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 17 Apr 2018 15:46:54 +0200 Subject: [PATCH 6/8] removed a class --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index c2fb9c3f..47448751 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -25,7 +25,6 @@ nic.komreg.net: autoupdate: konsulter: nagios_monitor: - nic_checks: r1.komreg.net: sunet_iaas_cloud: From 7868b5de34184cecc7fb33846653d92f6aba8ee3 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 17 Apr 2018 15:46:59 +0200 Subject: [PATCH 7/8] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 88f60157..7b834e71 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -176,7 +176,6 @@ classes: konsulter: null mailclient: *id001 nagios_monitor: null - nic_checks: null nrpe: null sunet::rsyslog: null sunet_iaas_cloud: null @@ -282,7 +281,6 @@ members: md_repo_server: [r1.komreg.net] md_signer: [md-eu1.qa.komreg.net, md1.komreg.net] nagios_monitor: [nic.komreg.net] - nic_checks: [nic.komreg.net] nrpe: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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, From f800422f6627c9b354e92a315ef82caeda3392e7 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 18 Apr 2018 15:24:17 +0200 Subject: [PATCH 8/8] removed a class --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index ce297582..04e2806a 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -675,8 +675,4 @@ class nagios_monitor { # description => 'check https certificate validity on port 443', # contact_groups => ['alerts'] #} - -class nic_checks { - sunet::nagios::nrpe_check_nagios { 'nagios': } -} }