Add vm_host label to prometheus targets

.chef/config.rb

@@ -28,5 +28,5 @@ knife[:automatic_attribute_whitelist] = %w[
 
 # Added to /etc/chef/client.rb on node bootstrap
 # https://docs.chef.io/attribute_persistence/
-knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
+knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty', 'vm_host']
-knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
+knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty', 'vm_host']

clients/rsk-testnet-5.json

@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-5",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/UHlgcSeh9Do7CTCKXC\n/4/aO2OvT+ijDVmrMYCNtE4sMeuFqKPnV1zxJZmRm4VNhkSQDkdWYD+6XvuFYW60\nyjB/N6D5lLlyjG4HD6fTkfh0K6f7t5mOYV7o4T59OoA3cBZuSROjtWmJ8jEFJ+k9\nII2kcyhPQcFN01ckzvZKRSPbVRccMoc+AKTjB3ZUfs/ERtlVoDrK4jEHluXOxUJO\nBKCcLonjJuLlpRLh7QfKrKFcR4idn5Ir43R6aSUesI/ipKwKsXnR3Bu7vXp74VF3\nMJ3EkdSBG+qJzy51fbRfQiUPAr/vSoVQZwW7FkIhIqqLkMaYCymn7qKfTGujoNU7\nlwIDAQAB\n-----END PUBLIC KEY-----\n"
-}

clients/uploads-1.json

@@ -1,4 +0,0 @@
-{
-  "name": "uploads-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJwWaz8TeGv3SFlKzLMx\nqN8GTL/c0N9ppBvv8xNSS/yF9Y40SbL418uxYzm9hIhOXgIygIgLT2EKIXX32t+R\neOJCdYycQFM3At2fhMkjhuUW0gmDRcYBcBJLC5hLh2EZ+A8V7k4qgrBpPLOjEv48\nhQY0vuAw2DGndWr4QLh5NLUmQiOrfuzcZSSNCBOTIgUZgNmRd9QcCHDq4WDH3poa\nosJo4a9JGEGUL1irOivvEdyJPwEd2f++nYAdWwj8pjCYgpRshQlLhxOlylMx7MxB\nQt2bgJC9sahfbfJCOqdlCU3DMJL0bRUiuxK77WeSsxWBJmrsiF3+Ljs2Ix+s7fnS\nywIDAQAB\n-----END PUBLIC KEY-----\n"
-}

nodes/akkounts-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.144"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "akkounts-1",

nodes/bitcoin-2.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.163"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "bitcoin-2",

nodes/discourse-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.35"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "discourse-2",

nodes/drone-1.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.128"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "drone-1",

nodes/ejabberd-4.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.113"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "ejabberd-4",

nodes/ejabberd-8.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.123"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "ejabberd-8",

nodes/garage-11.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.165"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "garage-11",

nodes/garage-14.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.151"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "garage-14",

nodes/garage-15.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.82"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "garage-15",

nodes/garage-16.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.153"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "garage-16",

nodes/garage-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.40"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "garage-2",

nodes/garage-7.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.182"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "garage-7",

nodes/garage-8.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.61"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "garage-8",

nodes/gitea-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.21"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "gitea-2",

nodes/ipfs-1.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.198"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "ipfs-1",

nodes/ldap-3.kosmos.org.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.6"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "ldap-3.kosmos.org",

nodes/ldap-4.kosmos.org.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.106"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "ldap-4.kosmos.org",

nodes/lq-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.87"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "lq-1",

nodes/lq-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.188"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "lq-2",

nodes/mail.kosmos.org.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.95"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "mail.kosmos.org",

nodes/mastodon-3.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.30"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "mastodon-3",

nodes/nodejs-4.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.138"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "nodejs-4",

nodes/postgres-11.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.91"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "postgres-11",

nodes/postgres-12.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.134"
-    }
+    },
+    "vm_host": "her"
   },
   "automatic": {
     "fqdn": "postgres-12",

nodes/prometheus-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.146"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "prometheus-1",

nodes/redis-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.225"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "redis-1",

nodes/redis-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.208"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "redis-2",

nodes/rs-discourse-1.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.187"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "rs-discourse-1",

nodes/rsk-mainnet-3.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.150"
-    }
+    },
+    "vm_host": "her"
   },
   "automatic": {
     "fqdn": "rsk-mainnet-3",

nodes/rsk-testnet-4.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.126"
-    }
+    },
+    "vm_host": "her"
   },
   "automatic": {
     "fqdn": "rsk-testnet-4",

nodes/rsk-testnet-5.json

@@ -1,61 +0,0 @@
-{
-  "name": "rsk-testnet-5",
-  "normal": {
-    "knife_zero": {
-      "host": "10.1.1.194"
-    }
-  },
-  "automatic": {
-    "fqdn": "rsk-testnet-5",
-    "os": "linux",
-    "os_version": "5.4.0-1103-kvm",
-    "hostname": "rsk-testnet-5",
-    "ipaddress": "192.168.122.171",
-    "roles": [
-      "base",
-      "kvm_guest",
-      "rskj_testnet"
-    ],
-    "recipes": [
-      "kosmos-base",
-      "kosmos-base::default",
-      "kosmos_kvm::guest",
-      "kosmos_rsk::rskj",
-      "apt::default",
-      "timezone_iii::default",
-      "timezone_iii::debian",
-      "ntp::default",
-      "ntp::apparmor",
-      "kosmos-base::systemd_emails",
-      "apt::unattended-upgrades",
-      "kosmos-base::firewall",
-      "kosmos-postfix::default",
-      "postfix::default",
-      "postfix::_common",
-      "postfix::_attributes",
-      "postfix::sasl_auth",
-      "hostname::default",
-      "kosmos_rsk::firewall",
-      "firewall::default"
-    ],
-    "platform": "ubuntu",
-    "platform_version": "20.04",
-    "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",
-        "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"
-      }
-    }
-  },
-  "run_list": [
-    "role[base]",
-    "role[kvm_guest]",
-    "role[rskj_testnet]"
-  ]
-}

nodes/rsk-testnet-6.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.20"
-    }
+    },
+    "vm_host": "leo"
   },
   "automatic": {
     "fqdn": "rsk-testnet-6",

nodes/sentry-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.132"
-    }
+    },
+    "vm_host": "her"
   },
   "automatic": {
     "fqdn": "sentry-1",

nodes/strfry-1.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.164"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "strfry-1",

nodes/uploads-1.json

@@ -1,67 +0,0 @@
-{
-  "name": "uploads-1",
-  "normal": {
-    "knife_zero": {
-      "host": "10.1.1.98"
-    }
-  },
-  "automatic": {
-    "fqdn": "uploads-1",
-    "os": "linux",
-    "os_version": "5.4.0-128-generic",
-    "hostname": "uploads-1",
-    "ipaddress": "192.168.122.230",
-    "roles": [
-      "kvm_guest"
-    ],
-    "recipes": [
-      "kosmos-base",
-      "kosmos-base::default",
-      "kosmos_kvm::guest",
-      "kosmos-ejabberd::upload_service",
-      "apt::default",
-      "timezone_iii::default",
-      "timezone_iii::debian",
-      "ntp::default",
-      "ntp::apparmor",
-      "kosmos-base::systemd_emails",
-      "apt::unattended-upgrades",
-      "kosmos-base::firewall",
-      "kosmos-postfix::default",
-      "postfix::default",
-      "postfix::_common",
-      "postfix::_attributes",
-      "postfix::sasl_auth",
-      "hostname::default",
-      "kosmos-nginx::with_perl",
-      "nginx::default",
-      "nginx::package",
-      "nginx::ohai_plugin",
-      "nginx::repo",
-      "nginx::commons",
-      "nginx::commons_dir",
-      "nginx::commons_script",
-      "nginx::commons_conf",
-      "kosmos-nginx::firewall",
-      "kosmos-base::letsencrypt"
-    ],
-    "platform": "ubuntu",
-    "platform_version": "20.04",
-    "cloud": null,
-    "chef_packages": {
-      "chef": {
-        "version": "15.14.0",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib"
-      },
-      "ohai": {
-        "version": "15.12.0",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai"
-      }
-    }
-  },
-  "run_list": [
-    "role[base]",
-    "role[kvm_guest]",
-    "recipe[kosmos-ejabberd::upload_service]"
-  ]
-}

nodes/wiki-1.json

@@ -3,7 +3,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.206"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "wiki-1",

site-cookbooks/kosmos_prometheus/recipes/server.rb

@@ -79,6 +79,7 @@ jobs = node["kosmos_prometheus"]["jobs"].merge(
       "targets" => search(:node, config["query"]).map do |n|
         target = { "target" => "#{n['knife_zero']['host']}:#{config['port']}", "instance" => n.name }
         target["env"] = n.chef_environment if n.chef_environment
+        target["vm_host"] = n["vm_host"] if n["vm_host"]
         target
       end.compact.sort_by { |t| t["instance"] },
     }

site-cookbooks/kosmos_prometheus/templates/default/prometheus.yml.erb

@@ -36,6 +36,9 @@ scrape_configs:
 <% if t['env'] %>
         env: <%= t['env'] %>
 <% end %>
+<% if t['vm_host'] %>
+        vm_host: <%= t['vm_host'] %>
+<% end %>
 <% end %>
 <% end %>