diff --git a/nodes/bitcoin-2.json b/nodes/bitcoin-2.json index 4ccd759..eaec80c 100644 --- a/nodes/bitcoin-2.json +++ b/nodes/bitcoin-2.json @@ -25,6 +25,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_sentry::client", "tor-full", diff --git a/nodes/discourse-2.json b/nodes/discourse-2.json index bc40c6a..4e76389 100644 --- a/nodes/discourse-2.json +++ b/nodes/discourse-2.json @@ -10,10 +10,11 @@ "automatic": { "fqdn": "discourse-2", "os": "linux", - "os_version": "5.4.0-1087-kvm", + "os_version": "5.4.0-1133-kvm", "hostname": "discourse-2", "ipaddress": "192.168.122.104", "roles": [ + "base", "kvm_guest", "garage_gateway", "kosmos_discourse" @@ -21,6 +22,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos_garage", "kosmos_garage::default", @@ -33,6 +35,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -43,7 +46,6 @@ "postfix::sasl_auth", "hostname::default", "firewall::default", - "chef-sugar::default", "discourse::default" ], "platform": "ubuntu", @@ -51,13 +53,13 @@ "cloud": null, "chef_packages": { "chef": { - "version": "17.9.52", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/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/draco.kosmos.org.json b/nodes/draco.kosmos.org.json index 8ae21b4..2c17307 100644 --- a/nodes/draco.kosmos.org.json +++ b/nodes/draco.kosmos.org.json @@ -36,6 +36,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::host", "kosmos_kvm::backup", "kosmos_email::firewall", diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json index a57af22..41f19ef 100644 --- a/nodes/fornax.kosmos.org.json +++ b/nodes/fornax.kosmos.org.json @@ -30,6 +30,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::host", "kosmos_kvm::backup", "kosmos_openresty", diff --git a/nodes/her.json b/nodes/her.json index ba758d0..53e6ffc 100644 --- a/nodes/her.json +++ b/nodes/her.json @@ -9,9 +9,9 @@ "automatic": { "fqdn": "her", "os": "linux", - "os_version": "5.15.0-84-generic", + "os_version": "5.15.0-101-generic", "hostname": "her", - "ipaddress": "192.168.30.172", + "ipaddress": "192.168.30.173", "roles": [ "base", "kvm_host" @@ -19,6 +19,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::host", "kosmos_kvm::backup", "apt::default", @@ -26,6 +27,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", diff --git a/nodes/ipfs-1.json b/nodes/ipfs-1.json index 4b70fb0..c4f0118 100644 --- a/nodes/ipfs-1.json +++ b/nodes/ipfs-1.json @@ -13,12 +13,14 @@ "hostname": "ipfs-1", "ipaddress": "192.168.122.195", "roles": [ + "base", "kvm_guest", "ipfs_gateway" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-ipfs", "kosmos-ipfs::default", @@ -28,6 +30,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", diff --git a/nodes/mail.kosmos.org.json b/nodes/mail.kosmos.org.json index f0ee81b..7dbb29e 100644 --- a/nodes/mail.kosmos.org.json +++ b/nodes/mail.kosmos.org.json @@ -11,7 +11,7 @@ "fqdn": "mail.kosmos.org", "os": "linux", "os_version": "5.15.0-1048-kvm", - "hostname": "mail.kosmos.org", + "hostname": "mail", "ipaddress": "192.168.122.131", "roles": [ "base", @@ -22,6 +22,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos_email", diff --git a/nodes/nodejs-4.json b/nodes/nodejs-4.json index 2181fc0..48ab1fa 100644 --- a/nodes/nodejs-4.json +++ b/nodes/nodejs-4.json @@ -22,6 +22,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-hubot::botka_irc-libera-chat", "kosmos-hubot::hal8000_xmpp", @@ -36,6 +37,7 @@ "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", diff --git a/nodes/strfry-1.json b/nodes/strfry-1.json index 41f868b..3b60167 100644 --- a/nodes/strfry-1.json +++ b/nodes/strfry-1.json @@ -23,6 +23,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "strfry", diff --git a/nodes/wiki-1.json b/nodes/wiki-1.json index 9216e81..9b43155 100644 --- a/nodes/wiki-1.json +++ b/nodes/wiki-1.json @@ -20,6 +20,7 @@ "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_prometheus::node_exporter", "kosmos_kvm::guest", "kosmos-dirsrv::hostsfile", "kosmos-mediawiki",