From ea580c7a7dae35fddacabe50cb53cea47334270d Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Mon, 29 Sep 2025 12:53:10 +0800
Subject: [PATCH] playbooks: update exporters vhosts and add monitor server

- deploy_exporters_vhosts.yml: refined configuration and variables
- deploy_monitor_server.yml: introduce new playbook for openobserve + Grafana
---
 playbooks/deploy_exporters_vhosts.yml | 78 ---------------------------
 playbooks/deploy_monitor_server.yml   | 72 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 78 deletions(-)
 create mode 100644 playbooks/deploy_monitor_server.yml

diff --git a/playbooks/deploy_exporters_vhosts.yml b/playbooks/deploy_exporters_vhosts.yml
index 48dd19b..75ba6b8 100644
--- a/playbooks/deploy_exporters_vhosts.yml
+++ b/playbooks/deploy_exporters_vhosts.yml
@@ -1,93 +1,15 @@
 - name: setup otel exporters
   hosts: cn-homepage.svc.plus
   become: true
-  vars:
-    group: web
-    otlp_endpoint: &otel_endpoint https://otel.svc.plus/api/default/
-    otlp_auth: &otel_auth "Basic cm9vdEBleGFtcGxlLmNvbTpRN01wRjZBTzZFelRjRjdJ"
-    otel_prometheus_node_static_configs: &otel_node_static_configs
-      - targets: ['172.31.2.33:9100']
-        labels:
-          vendor: aws
-          account: prod
-          group: core
-          name: tky-proxy.svc.plus
-          iid: '172.31.2.33'
-      - targets: ['167.179.72.223:9100']
-        labels:
-          vendor: aws
-          account: prod
-          group: web-system
-          name: global-homepage.svc.plus
-          iid: '167.179.72.223'
-      - targets: ['47.120.61.35:9100']
-        labels:
-          vendor: alicloud
-          account: prod
-          group: web-system
-          name: cn-homepage.svc.plus
-          iid: '47.120.61.35'
-    otel_prometheus_process_static_configs: &otel_process_static_configs
-      - targets: ['172.31.2.33:9256']
-        labels:
-          vendor: aws
-          account: prod
-          group: core
-          name: tky-proxy.svc.plus
-          iid: '172.31.2.33'
-      - targets: ['167.179.72.223:9256']
-        labels:
-          vendor: aws
-          account: prod
-          group: web-system
-          name: global-homepage.svc.plus
-          iid: '167.179.72.223'
-      - targets: ['47.120.61.35:9256']
-        labels:
-          vendor: alicloud
-          account: prod
-          group: web-system
-          name: cn-homepage.svc.plus
-          iid: '47.120.61.35'
-    exporters:
-      endpoint: *otel_endpoint
   roles:
     - roles/vhosts/common/
     - roles/vhosts/node_exporter/
     - roles/vhosts/process_exporter/
-    - roles/vhosts/otel-collector/
 
 - name: setup otel exporters
   hosts: global-homepage.svc.plus
   become: true
-  vars:
-    group: web
-    otlp_endpoint: *otel_endpoint
-    otlp_auth: *otel_auth
-    otel_prometheus_node_static_configs: *otel_node_static_configs
-    otel_prometheus_process_static_configs: *otel_process_static_configs
-    exporters:
-      endpoint: *otel_endpoint
   roles:
     - roles/vhosts/common/
     - roles/vhosts/node_exporter/
     - roles/vhosts/process_exporter/
-    - roles/vhosts/otel-collector/
-
-- name: setup otel exporters
-  hosts: otel.svc.plus
-  become: true
-  vars:
-    group: web
-    otlp_endpoint: *otel_endpoint
-    otlp_auth: *otel_auth
-    otel_prometheus_node_static_configs: *otel_node_static_configs
-    otel_prometheus_process_static_configs: *otel_process_static_configs
-    exporters:
-      endpoint: *otel_endpoint
-  roles:
-    - roles/vhosts/node_exporter/
-    - roles/vhosts/process_exporter/
-    - roles/vhosts/otel-collector/
-    - roles/vhosts/grafana/
-    - roles/vhosts/openobserve/
diff --git a/playbooks/deploy_monitor_server.yml b/playbooks/deploy_monitor_server.yml
new file mode 100644
index 0000000..a00cf2d
--- /dev/null
+++ b/playbooks/deploy_monitor_server.yml
@@ -0,0 +1,72 @@
+- name: setup otel exporters
+  hosts: otel.svc.plus
+  become: true
+  vars:
+    group: web
+    otlp_endpoint: &otel_endpoint https://otel.svc.plus/api/default/
+    otlp_auth: &otel_auth "Basic cm9vdEBleGFtcGxlLmNvbTpRN01wRjZBTzZFelRjRjdJ"
+    otel_prometheus_node_static_configs: &otel_node_static_configs
+      - targets: ['172.31.2.33:9100']
+        labels:
+          vendor: aws
+          account: prod
+          group: core
+          name: tky-proxy.svc.plus
+          iid: '172.31.2.33'
+      - targets: ['167.179.72.223:9100']
+        labels:
+          vendor: aws
+          account: prod
+          group: web-system
+          name: global-homepage.svc.plus
+          iid: '167.179.72.223'
+      - targets: ['47.120.61.35:9100']
+        labels:
+          vendor: alicloud
+          account: prod
+          group: web-system
+          name: cn-homepage.svc.plus
+          iid: '47.120.61.35'
+    otel_prometheus_process_static_configs: &otel_process_static_configs
+      - targets: ['172.31.2.33:9256']
+        labels:
+          vendor: aws
+          account: prod
+          group: core
+          name: tky-proxy.svc.plus
+          iid: '172.31.2.33'
+      - targets: ['167.179.72.223:9256']
+        labels:
+          vendor: aws
+          account: prod
+          group: web-system
+          name: global-homepage.svc.plus
+          iid: '167.179.72.223'
+      - targets: ['47.120.61.35:9256']
+        labels:
+          vendor: alicloud
+          account: prod
+          group: web-system
+          name: cn-homepage.svc.plus
+          iid: '47.120.61.35'
+    exporters:
+      endpoint: *otel_endpoint
+  roles:
+    - roles/vhosts/otel-collector/
+
+- name: setup otel exporters
+  hosts: otel.svc.plus
+  become: true
+  vars:
+    group: web
+    otlp_endpoint: *otel_endpoint
+    otlp_auth: *otel_auth
+    otel_prometheus_node_static_configs: *otel_node_static_configs
+    otel_prometheus_process_static_configs: *otel_process_static_configs
+    exporters:
+      endpoint: *otel_endpoint
+  roles:
+    - roles/vhosts/node_exporter/
+    - roles/vhosts/process_exporter/
+    - roles/vhosts/grafana/
+    - roles/vhosts/openobserve/