diff --git a/README.md b/README.md index ef84c82..2b43648 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,7 @@ ansible-playbook -i deploy_observability_service.yml -l us-xhtt ansible-playbook -i node.yml \ -l openclaw.svc.plus,jp-xhttp.svc.plus \ -e node_monitor_mode=push \ - -e observability_endpoint=https://observability.svc.plus/ \ - -e haproxy_enabled=false + -e observability_endpoint=https://observability.svc.plus/ ``` 如果服务端已开启 ingest 基本认证,采集端也要带上同一组凭据: @@ -85,8 +84,7 @@ ansible-playbook -i node.yml \ -e observability_endpoint=https://observability.svc.plus/ \ -e observability_ingest_basic_auth_enabled=true \ -e observability_ingest_basic_auth_user=ingest \ - -e observability_ingest_basic_auth_password='' \ - -e haproxy_enabled=false + -e observability_ingest_basic_auth_password='' ``` > `node_monitor_mode=push` 会在远端主机上部署 `node_exporter + process_exporter + vector`,并把 metrics / logs 主动汇总到 `observability.svc.plus`。`vector` 固定归到采集端任务,服务端 `infra.yml` 不再默认部署它。 diff --git a/node.yml b/node.yml index 67ec72c..dc13b4b 100755 --- a/node.yml +++ b/node.yml @@ -36,7 +36,6 @@ # ./node.yml -l openclaw.svc.plus,jp-xhttp.svc.plus \ # -e node_monitor_mode=push \ # -e observability_endpoint=https://observability.svc.plus/ \ -# -e haproxy_enabled=false # # Bootstrap with another admin user: (Create admin with another admin) # node.yml -t node_admin # create admin user for nodes diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml index ac04c2e..170f914 100644 --- a/roles/haproxy/defaults/main.yml +++ b/roles/haproxy/defaults/main.yml @@ -2,7 +2,7 @@ #----------------------------------------------------------------- # HAPROXY #----------------------------------------------------------------- -haproxy_enabled: true # enable haproxy on this node? +haproxy_enabled: false # enable haproxy on this node? haproxy_clean: false # cleanup all existing haproxy config? haproxy_reload: true # reload haproxy after config? haproxy_auth_enabled: true # enable authentication for haproxy admin page @@ -17,4 +17,4 @@ haproxy_services: [] # list of haproxy service to be exposed # PROMETHEUS (Reference) #----------------------------------------------------------------- exporter_metrics_path: /metrics # exporter metric path, `/metrics` by default -... \ No newline at end of file +... diff --git a/roles/node_monitor/defaults/main.yml b/roles/node_monitor/defaults/main.yml index 9245e06..d33eb99 100644 --- a/roles/node_monitor/defaults/main.yml +++ b/roles/node_monitor/defaults/main.yml @@ -50,7 +50,7 @@ exporter_metrics_path: /metrics # exporter metric path #----------------------------------------------------------------- # HAPROXY (Reference) #----------------------------------------------------------------- -haproxy_enabled: true # enable haproxy on this node? +haproxy_enabled: false # enable haproxy on this node? haproxy_exporter_port: 9101 # haproxy admin/exporter port, 9101 by default #----------------------------------------------------------------- # PGSQL (Reference)