diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json index c496c52..7af0bda 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-1.json @@ -25,6 +25,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos_sentry::client", diff --git a/nodes/drone-1.json b/nodes/drone-1.json index b658d3e..7b9e733 100644 --- a/nodes/drone-1.json +++ b/nodes/drone-1.json @@ -13,6 +13,7 @@ "hostname": "drone-1", "ipaddress": "192.168.122.200", "roles": [ + "base", "kvm_guest", "drone", "postgresql_client" @@ -20,6 +21,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_postgresql::hostsfile", "kosmos_drone", @@ -38,7 +40,8 @@ "postfix::_common", "postfix::_attributes", "postfix::sasl_auth", - "hostname::default" + "hostname::default", + "firewall::default" ], "platform": "ubuntu", "platform_version": "20.04", diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json index 72f50f0..2fba750 100644 --- a/nodes/ejabberd-4.json +++ b/nodes/ejabberd-4.json @@ -24,6 +24,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos_postgresql::hostsfile", diff --git a/nodes/ejabberd-8.json b/nodes/ejabberd-8.json index 0e0ef8e..81a0b09 100644 --- a/nodes/ejabberd-8.json +++ b/nodes/ejabberd-8.json @@ -24,6 +24,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos_postgresql::hostsfile", diff --git a/nodes/garage-2.json b/nodes/garage-2.json index 9faadf1..42994c7 100644 --- a/nodes/garage-2.json +++ b/nodes/garage-2.json @@ -21,6 +21,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_garage", "kosmos_garage::default", @@ -31,6 +32,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -47,13 +49,13 @@ "cloud": null, "chef_packages": { "chef": { - "version": "18.3.0", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.3.0/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "18.1.4", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json index 9c122a2..b726be6 100644 --- a/nodes/gitea-2.json +++ b/nodes/gitea-2.json @@ -25,6 +25,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos_garage", @@ -59,13 +60,13 @@ "cloud": null, "chef_packages": { "chef": { - "version": "18.2.7", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "18.1.4", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/lq-1.json b/nodes/lq-1.json index 9102a55..a729c80 100644 --- a/nodes/lq-1.json +++ b/nodes/lq-1.json @@ -22,6 +22,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_garage", "kosmos_garage::default", @@ -33,6 +34,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -50,13 +52,13 @@ "cloud": null, "chef_packages": { "chef": { - "version": "18.2.7", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "18.1.4", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/lq-2.json b/nodes/lq-2.json index 09524d4..4acf21d 100644 --- a/nodes/lq-2.json +++ b/nodes/lq-2.json @@ -22,6 +22,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_garage", "kosmos_garage::default", @@ -33,6 +34,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -50,13 +52,13 @@ "cloud": null, "chef_packages": { "chef": { - "version": "18.2.7", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "18.1.4", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/redis-1.json b/nodes/redis-1.json index 6698a68..23d6420 100644 --- a/nodes/redis-1.json +++ b/nodes/redis-1.json @@ -21,6 +21,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_redis", "kosmos_redis::default", @@ -31,6 +32,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -40,6 +42,7 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", + "firewall::default", "redisio::default", "redisio::_install_prereqs", "redisio::install", diff --git a/nodes/redis-2.json b/nodes/redis-2.json index 2f6d10e..cbd65d4 100644 --- a/nodes/redis-2.json +++ b/nodes/redis-2.json @@ -21,6 +21,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_redis::replica", "kosmos_redis::firewall", @@ -29,6 +30,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -38,6 +40,7 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", + "firewall::default", "redisio::default", "redisio::_install_prereqs", "redisio::install", diff --git a/nodes/rs-discourse-1.json b/nodes/rs-discourse-1.json index b322827..ddc0b12 100644 --- a/nodes/rs-discourse-1.json +++ b/nodes/rs-discourse-1.json @@ -9,24 +9,27 @@ "automatic": { "fqdn": "rs-discourse-1", "os": "linux", - "os_version": "5.4.0-1076-kvm", + "os_version": "5.4.0-1118-kvm", "hostname": "rs-discourse-1", "ipaddress": "192.168.122.30", "roles": [ - "remotestorage_discourse", - "kvm_guest" + "base", + "kvm_guest", + "remotestorage_discourse" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", + "kosmos_kvm::guest", "remotestorage_discourse", "remotestorage_discourse::default", - "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -36,22 +39,21 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", - "discourse::default", "firewall::default", - "chef-sugar::default" + "discourse::default" ], "platform": "ubuntu", "platform_version": "20.04", "cloud": null, "chef_packages": { "chef": { - "version": "17.10.3", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.10.3/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "17.9.0", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/rsk-testnet-6.json b/nodes/rsk-testnet-6.json index 73ae932..ad6795b 100644 --- a/nodes/rsk-testnet-6.json +++ b/nodes/rsk-testnet-6.json @@ -20,6 +20,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_rsk::rskj", "apt::default", @@ -35,8 +36,8 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", - "kosmos_rsk::firewall", - "firewall::default" + "firewall::default", + "kosmos_rsk::firewall" ], "platform": "ubuntu", "platform_version": "24.04",