feat: 添加Nomad集群监控与配置更新

fix(nomad): 修复服务器网络配置和重复配置问题 perf: 优化Podman与Nomad集成配置 refactor: 重构inventory文件结构 docs: 添加Telegraf监控部署文档 chore: 清理旧配置文件和脚本
2025-09-25 14:07:55 +00:00
parent d0e7f64c1d
commit 79b721e165
49 changed files with 2699 additions and 457 deletions
--- a/configuration/inventories/production/consul-nodes.ini
+++ b/configuration/inventories/production/consul-nodes.ini
@@ -0,0 +1,7 @@
+[consul_servers]
+master ansible_host=100.117.106.136 ansible_user=ben ansible_become=yes ansible_become_pass=3131
+ash3c ansible_host=100.116.80.94 ansible_user=ben ansible_become=yes ansible_become_pass=3131
+hcs ansible_host=100.84.197.26 ansible_user=ben ansible_become=yes ansible_become_pass=3131
+
+[consul_servers:vars]
+ansible_ssh_private_key_file=~/.ssh/id_ed25519
--- a/configuration/inventories/production/group_vars/all.yml
+++ b/configuration/inventories/production/group_vars/all.yml
@@ -4,8 +4,8 @@
 # InfluxDB 2.x 连接配置
 influxdb_url: "http://influxdb1.tailnet-68f9.ts.net:8086"
 influxdb_token: "VU_dOCVZzqEHb9jSFsDe0bJlEBaVbiG4LqfoczlnmcbfrbmklSt904HJPL4idYGvVi0c2eHkYDi2zCTni7Ay4w=="
-influxdb_org: "nomad"                     # 组织名称
-influxdb_bucket: "nomad_monitoring"        # Bucket 名称
+influxdb_org: "seekkey"                     # 组织名称
+influxdb_bucket: "VPS"        # Bucket 名称

 # 远程 Telegraf 配置 URL
 telegraf_config_url: "http://influxdb1.tailnet-68f9.ts.net:8086/api/v2/telegrafs/0f8a73496790c000"
--- a/configuration/inventories/production/inventory.ini
+++ b/configuration/inventories/production/inventory.ini
@@ -5,12 +5,16 @@ dev2 ansible_host=dev2 ansible_user=ben ansible_become=yes ansible_become_pass=3
 [oci_kr]
 ch2 ansible_host=ch2 ansible_user=ben ansible_become=yes ansible_become_pass=3131
 ch3 ansible_host=ch3 ansible_user=ben ansible_become=yes ansible_become_pass=3131
-master ansible_host=master ansible_port=60022 ansible_user=ben ansible_become=yes ansible_become_pass=3131

 [oci_us]
 ash1d ansible_host=ash1d ansible_user=ben ansible_become=yes ansible_become_pass=3131
 ash2e ansible_host=ash2e ansible_user=ben ansible_become=yes ansible_become_pass=3131
+
+[oci_a1]
+master ansible_host=master ansible_port=60022 ansible_user=ben ansible_become=yes ansible_become_pass=3131
 ash3c ansible_host=ash3c ansible_user=ben ansible_become=yes ansible_become_pass=3131
+
+
 [huawei]
 hcs ansible_host=hcs ansible_user=ben ansible_become=yes ansible_become_pass=3131
 [google]
@@ -18,6 +22,7 @@ benwork ansible_host=benwork ansible_user=ben ansible_become=yes ansible_become_

 [ditigalocean]
 syd ansible_host=syd ansible_user=ben ansible_become=yes ansible_become_pass=3131
+
 [aws]
 #aws linux dnf
 awsirish ansible_host=awsirish ansible_user=ben ansible_become=yes ansible_become_pass=3131
@@ -29,12 +34,16 @@ nuc12 ansible_host=nuc12 ansible_user=root ansible_become=yes ansible_become_pas

 [lxc]
 #集中在三台机器，不要同时upgrade 会死掉，顺序调度来 (Debian/Ubuntu containers using apt)
-warden ansible_host=warden ansible_user=ben ansible_become=yes ansible_become_pass=3131
 gitea ansible_host=gitea ansible_user=root ansible_become=yes ansible_become_pass=313131
-influxdb ansible_host=influxdb1 ansible_user=root ansible_become=yes ansible_become_pass=313131
 mysql ansible_host=mysql ansible_user=root ansible_become=yes ansible_become_pass=313131
 postgresql ansible_host=postgresql ansible_user=root ansible_become=yes ansible_become_pass=313131

+[nomadlxc]
+influxdb ansible_host=influxdb1 ansible_user=root ansible_become=yes ansible_become_pass=313131
+warden ansible_host=warden ansible_user=ben ansible_become=yes ansible_become_pass=3131
+[semaphore]
+semaphoressh ansible_host=semaphore ansible_user=root ansible_become=yes ansible_become_pass=313131
+
 [alpine]
 #Alpine Linux containers using apk package manager
 redis ansible_host=redis ansible_user=root ansible_become=yes ansible_become_pass=313131
@@ -56,5 +65,30 @@ onecloud1 ansible_host=onecloud1 ansible_user=ben ansible_ssh_pass=3131 ansible_

 [germany]
 de ansible_host=de ansible_user=ben ansible_ssh_pass=3131 ansible_become=yes ansible_become_pass=3131
+
+[beijing:children]
+nomadlxc
+hcp
+
 [all:vars]
-ansible_ssh_common_args='-o StrictHostKeyChecking=no'
+ansible_ssh_common_args='-o StrictHostKeyChecking=no'
+
+[nomad_clients:children]
+nomadlxc
+hcp
+oci_a1
+huawei
+ditigalocean
+germany
+[nomad_servers:children]
+oci_us
+oci_kr
+semaphore
+
+[nomad_cluster:children]
+nomad_servers
+nomad_clients
+
+[beijing:children]
+nomadlxc
+hcp
--- a/configuration/inventories/production/nomad-cluster.ini
+++ b/configuration/inventories/production/nomad-cluster.ini
@@ -1,30 +0,0 @@
-[nomad_servers]
-semaphore ansible_connection=local nomad_role=server nomad_bootstrap_expect=6
-ash2e ansible_host=ash2e ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=6
-ash1d ansible_host=ash1d ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=6
-ch2 ansible_host=ch2 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=6
-ch3 ansible_host=ch3 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=6
-# 新增的 Mac 和 Windows 节点（请替换为实际的 Tailscale IP）
-mac-laptop ansible_host=100.xxx.xxx.xxx ansible_user=your_mac_user nomad_role=server nomad_bootstrap_expect=6
-win-laptop ansible_host=100.xxx.xxx.xxx ansible_user=your_win_user nomad_role=server nomad_bootstrap_expect=6
-
-[nomad_clients]
-master ansible_host=100.117.106.136 ansible_port=60022 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-ash3c ansible_host=100.116.80.94 ansible_port=22 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-hcp1 ansible_host=hcp1 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcp2 ansible_host=hcp2 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcs ansible_host=hcs ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-syd ansible_host=100.117.137.105 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-
-[nomad_cluster:children]
-nomad_servers
-nomad_clients
-
-[nomad_cluster:vars]
-ansible_ssh_private_key_file=~/.ssh/id_ed25519
-ansible_user=ben
-ansible_become=yes
-nomad_version=1.10.5
-nomad_datacenter=dc1
-nomad_region=global
-nomad_encrypt_key=NVOMDvXblgWfhtzFzOUIHnKEOrbXOkPrkIPbRGGf1YQ=
--- a/configuration/inventories/production/nomad-cluster.ini.backup
+++ b/configuration/inventories/production/nomad-cluster.ini.backup
@@ -1,22 +0,0 @@
-[nomad_servers]
-master ansible_host=100.117.106.136 ansible_port=60022 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=3
-semaphore ansible_connection=local nomad_role=server nomad_bootstrap_expect=3
-ash3c ansible_host=100.116.80.94 ansible_port=22 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=3
-
-[nomad_clients]
-hcp1 ansible_host=hcp1 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcp2 ansible_host=hcp2 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcs ansible_host=hcs ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-
-[nomad_cluster:children]
-nomad_servers
-nomad_clients
-
-[nomad_cluster:vars]
-ansible_ssh_private_key_file=~/.ssh/id_ed25519
-ansible_user=ben
-ansible_become=yes
-nomad_version=1.10.5
-nomad_datacenter=dc1
-nomad_region=global
-nomad_encrypt_key=NVOMDvXblgWfhtzFzOUIHnKEOrbXOkPrkIPbRGGf1YQ=
--- a/configuration/inventories/production/nomad-cluster.ini.backup-20250924-025928
+++ b/configuration/inventories/production/nomad-cluster.ini.backup-20250924-025928
@@ -1,23 +0,0 @@
-[nomad_servers]
-master ansible_host=100.117.106.136 ansible_port=60022 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=3
-semaphore ansible_connection=local nomad_role=server nomad_bootstrap_expect=3
-ash3c ansible_host=100.116.80.94 ansible_port=22 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=server nomad_bootstrap_expect=3
-
-[nomad_clients]
-hcp1 ansible_host=hcp1 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcp2 ansible_host=hcp2 ansible_user=root ansible_become=yes ansible_become_pass=313131 nomad_role=client
-hcs ansible_host=hcs ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-syd ansible_host=100.117.137.105 ansible_user=ben ansible_become=yes ansible_become_pass=3131 nomad_role=client
-
-[nomad_cluster:children]
-nomad_servers
-nomad_clients
-
-[nomad_cluster:vars]
-ansible_ssh_private_key_file=~/.ssh/id_ed25519
-ansible_user=ben
-ansible_become=yes
-nomad_version=1.10.5
-nomad_datacenter=dc1
-nomad_region=global
-nomad_encrypt_key=NVOMDvXblgWfhtzFzOUIHnKEOrbXOkPrkIPbRGGf1YQ=