From ea438bb5733bfc6d1473a494ccea0ee4861e1d82 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 2 Feb 2026 02:58:47 +0800 Subject: [PATCH] Rebrand and remove Pigsty-specific references from documentation, configuration defaults, and build scripts. --- Makefile | 54 +++++++++++------------------------ README.md | 31 ++++++-------------- roles/infra/defaults/main.yml | 12 ++++---- 3 files changed, 30 insertions(+), 67 deletions(-) diff --git a/Makefile b/Makefile index 5778038..361066e 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ #==============================================================# # File : Makefile -# Desc : pigsty shortcuts +# Desc : observability shortcuts # Ctime : 2019-04-13 -# Mtime : 2026-01-27 +# Mtime : 2026-02-01 # Path : Makefile -# License : Apache-2.0 @ https://pigsty.io/docs/about/license/ +# License : Apache-2.0 @ https://svc.plus/docs/about/license/ # Copyright : 2018-2026 Ruohang Feng / Vonng (rh@vonng.com) #==============================================================# -# pigsty version string +# version string VERSION?=v4.0.0 # detect architecture @@ -68,53 +68,31 @@ doc: docs/serve #-------------------------------------------------------------# -# (1). BOOTSTRAP pigsty pkg & util preparedness +# Prepare +# (1). make deps (once) Install MacOS deps with homebrew +# (2). make dns (once) Write static DNS +# (3). make start (once) Pull-up vm nodes and setup ssh access +# (4). make demo Boot meta node same as Quick-Start +#=============================================================# + +#-------------------------------------------------------------# +# (1). BOOTSTRAP util preparedness boot: bootstrap bootstrap: ./bootstrap -# (2). CONFIGURE pigsty in interactive mode +# (2). CONFIGURE interactive mode conf: configure configure: ./configure -# (3). DEPLOY pigsty on current node +# (3). DEPLOY install on current node deploy: ./deploy.yml ############################################################### -############################################################### -# OUTLINE # -############################################################### -# (1). Quick-Start : shortcuts for launching pigsty (above) -# (2). Download : shortcuts for downloading resources -# (3). Configure : shortcuts for configure pigsty -# (4). Install : shortcuts for running playbooks -# (5). Sandbox : shortcuts for manage sandbox vm nodes -# (6). Testing : shortcuts for testing features -# (7). Develop : shortcuts for dev purpose -# (8). Release : shortcuts for release and publish -# (9). Misc : shortcuts for miscellaneous tasks -############################################################### - - - -############################################################### -# 2. Download # -############################################################### -# There are two things that need to be downloaded: -# pigsty.tgz : source code -# pkg.tgz : offline rpm packages (optional) -# -# get latest stable version to ~/pigsty -src: - curl -SL https://github.com/pgsty/pigsty/releases/download/${VERSION}/${SRC_PKG} -o ~/pigsty.tgz -############################################################### - - - ############################################################### # 3. Configure # ############################################################### @@ -507,7 +485,7 @@ release-dba: gd: get-dba get-dba: - curl -fsSL "https://repo.pigsty.cc/dba/$(DBA_PKG)" | tar -xzf - + curl -fsSL "https://repo.svc.plus/dba/$(DBA_PKG)" | tar -xzf - @echo "DBA package extracted to current directory" ud: upload-dba diff --git a/README.md b/README.md index 3b34158..698f6d5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Observability.svc.plus [![License: Apache-2.0](https://img.shields.io/badge/License-Apache--2.0-green.svg)](LICENSE) -[![Base: Pigsty v4.0](https://img.shields.io/badge/Base-Pigsty_v4.0-blue)](https://github.com/pgsty/pigsty) +[![Status: Stable](https://img.shields.io/badge/Status-Stable-blue)](https://svc.plus) -**Observability.svc.plus** is an advanced observability platform based on [**Pigsty v4.0**](https://github.com/pgsty/pigsty), strictly following the **Apache 2.0** license. +**Observability.svc.plus** is an advanced observability platform strictly following the **Apache 2.0** license. > **Focus**: Monitoring & Observability (监控/可观测). Integrating **OpenTelemetry (OTel)**, with future plans to incorporate **DeepFlow Agent** and other open-source **NPM** (Network Performance Monitoring) probes. @@ -33,7 +33,7 @@ curl -fsSL https://raw.githubusercontent.com/cloud-neutral-toolkit/observability - **Observability First**: SOTA monitoring for **PG** / **Infra** / **Node** based on **VictoriaMetrics**, **Grafana**, and **OpenTelemetry**. - **OTel Integration**: Native support for **OpenTelemetry**, facilitating unified trace, metric, and log ingestion. - **Future Ready**: Planned integration for **DeepFlow Agent** and other open-source **NPM** probes for deep network and application observability. -- **Reliable Base**: Inherits **Pigsty**'s robust self-healing **HA** clusters, **PITR**, and secure infrastructure. +- **Reliable Base**: Robust self-healing **HA** clusters, **PITR**, and secure infrastructure. - **Maintainable**: **One-Cmd Deploy**, **IaC** support, and easy customization. - **Controllable**: Self-sufficient Cloud Neutral FOSS. Run on **bare Linux**. @@ -67,7 +67,7 @@ And gather the synergistic superpowers of all [**444+ PostgreSQL Extensions**](h [![Ubuntu Support: 22/24](https://img.shields.io/badge/Ubuntu-22/24-%23E95420?style=flat&logo=ubuntu&logoColor=%23E95420)](https://svc.plus/docs/ref/linux#ubuntu) [![Docker Image](https://img.shields.io/badge/Docker-v4.0.0-%232496ED?style=flat&logo=docker&logoColor=white)](https://svc.plus/docs/setup/docker) -[**Prepare**](https://svc.plus/docs/deploy/prepare) a fresh `x86_64` / `aarch64` node runs any [**compatible**](https://svc.plus/docs/ref/linux) **Linux** OS Distros, then [**Install**](https://svc.plus/docs/setup/install#install) **Pigsty** with: +[**Prepare**](https://svc.plus/docs/deploy/prepare) a fresh `x86_64` / `aarch64` node runs any [**compatible**](https://svc.plus/docs/ref/linux) **Linux** OS Distros, then [**Install**](https://svc.plus/docs/setup/install#install) the platform with: ```bash curl -fsSL https://raw.githubusercontent.com/cloud-neutral-toolkit/observability.svc.plus/main/scripts/server-install.sh | bash @@ -80,9 +80,9 @@ Then [**configure**](https://svc.plus/docs/concept/iac/configure) and run the [* ./deploy.yml # deploy everything on current node ``` -Finally, you will get a pigsty [**singleton node ready**](https://svc.plus/docs/setup/install), with [**WebUI**](https://svc.plus/docs/setup/webui) on port `80/443` and [**Postgres**](https://svc.plus/docs/setup/pgsql) on port `5432`. +Finally, you will get a [**singleton node ready**](https://svc.plus/docs/setup/install), with [**WebUI**](https://svc.plus/docs/setup/webui) on port `80/443` and [**Postgres**](https://svc.plus/docs/setup/pgsql) on port `5432`. -For dev/testing purposes, you can also run Pigsty inside [**Docker**](https://svc.plus/docs/setup/docker) containers: `cd docker; make launch` +For dev/testing purposes, you can also run it inside [**Docker**](https://svc.plus/docs/setup/docker) containers: `cd docker; make launch` -------- @@ -148,28 +148,13 @@ curl -fsSL https://raw.githubusercontent.com/cloud-neutral-toolkit/observability -## Architecture - -Pigsty uses a [**modular**](https://svc.plus/docs/concept/arch) design. you can [**use one or all**](https://svc.plus/docs/deploy/planning), Best of breed products. Integrated as a platform. - -[![board](https://pigsty.io/img/pigsty/motherboard.gif)](https://svc.plus/docs/concept/arch) - -[![PGSQL](https://img.shields.io/badge/PGSQL-%233E668F?style=flat&logo=postgresql&labelColor=3E668F&logoColor=white)](https://svc.plus/docs/pgsql) Self-healing PostgreSQL HA cluster powered by Patroni, Pgbouncer, PgBackrest & HAProxy +Integrated as a platform. [![INFRA](https://img.shields.io/badge/INFRA-%23009639?style=flat&logo=nginx&labelColor=009639&logoColor=white)](https://svc.plus/docs/infra) Nginx, Local Repo, DNSMasq, and the entire Victoria & Grafana observability stack. -[![NODE](https://img.shields.io/badge/NODE-%23FCC624?style=flat&logo=linux&labelColor=FCC624&logoColor=black)](https://svc.plus/docs/node) Init node name, repo, pkg, NTP, ssh, admin, tune, expose services, collect logs & metrics. - -[![ETCD](https://img.shields.io/badge/ETCD-%23419EDA?style=flat&logo=etcd&labelColor=419EDA&logoColor=white)](https://svc.plus/docs/etcd) Etcd cluster is used as a reliable distributive configuration store by PostgreSQL HA Agents. - -You can compose them freely in a declarative manner. `INFRA` & `NODE` will suffice for host monitoring. -`ETCD` and `PGSQL` are used for HA PG clusters; Installing them on multiple nodes automatically forms HA clusters. - -The default [`deploy.yml`](https://github.com/pgsty/pigsty/blob/main/deploy.yml) playbook will deploy `INFRA`, `NODE`, `ETCD` & `PGSQL` on the current node. +The default [`deploy.yml`](deploy.yml) playbook will deploy `INFRA`, `NODE`, `ETCD` & `PGSQL` on the current node. Which gives you an out-of-the-box PostgreSQL singleton instance (`admin_ip:5432`) with everything ready. -[![pigsty-arch](https://pigsty.io/img/pigsty/arch.png)](https://svc.plus/docs/concept/arch) - The node can be used as an admin controller to deploy & monitor more nodes & clusters. For example, you can install these **6** **OPTIONAL** [extra modules](https://svc.plus/docs/ref/module#extra-modules) for advanced use cases: [![MinIO](https://img.shields.io/badge/MINIO-%23C72E49?style=flat&logo=minio&logoColor=white)](https://svc.plus/docs/minio) S3-compatible object storage service; used as an optional central backup server for `PGSQL`. diff --git a/roles/infra/defaults/main.yml b/roles/infra/defaults/main.yml index 8870fb0..e6ba8ef 100644 --- a/roles/infra/defaults/main.yml +++ b/roles/infra/defaults/main.yml @@ -2,18 +2,18 @@ #----------------------------------------------------------------- # INFRA_META #----------------------------------------------------------------- -version: v4.0.0 # pigsty version string +version: v4.0.0 # version string admin_ip: 10.10.10.10 # admin node ip address, overwritten by configure region: default # upstream mirror region: default,china,europe language: en # default language, en by default, could be zh -proxy_env: { no_proxy: "localhost,127.0.0.1,10.0.0.0/8,192.168.0.0/16,*.pigsty,*.aliyun.com,mirrors.*,*.myqcloud.com,*.tsinghua.edu.cn" } +proxy_env: { no_proxy: "localhost,127.0.0.1,10.0.0.0/8,192.168.0.0/16,*.aliyun.com,mirrors.*,*.myqcloud.com,*.tsinghua.edu.cn" } #----------------------------------------------------------------- # INFRA_IDENTITY #----------------------------------------------------------------- #infra_seq: 1 # infra node identity, explicitly required infra_portal: # infra services exposed via portal - home : { domain: i.pigsty } # default home server definition + home : { domain: i.observability } # default home server definition infra_domain: observability.svc.plus infra_data: /data/infra # default data path for infrastructure data infra_services: # home page navigation entries @@ -23,8 +23,8 @@ infra_services: # home page navigation entries - { name: Monitor Targets ,url: '/vmetrics/targets' ,desc: 'Prometheus Scrape Targets' ,icon: 'target' ,name_cn: '监控目标' ,desc_cn: 'VictoriaMetrics 监控对象列表' } - { name: Alert Rules ,url: '/vmalert/vmalert/groups' ,desc: 'VMAlert alert/record Rules' ,icon: 'alert' ,name_cn: '告警规则' ,desc_cn: 'VMAlert 告警规则管理' } - { name: Alert Manager ,url: '/alertmgr/#/alerts' ,desc: 'Alert Manage & Silence' ,icon: 'alertmgr' ,name_cn: '告警管理' ,desc_cn: 'AlertManager 告警管理与屏蔽' } - - { name: CA Certificate ,url: '/ca.crt' ,desc: 'Self-Signed CA Certificate' ,icon: 'lock' ,name_cn: 'CA 证书' ,desc_cn: 'Pigsty 自签CA根证书' } - - { name: Software Repo ,url: '/pigsty' ,desc: 'Local YUM/APT Repository' ,icon: 'package' ,name_cn: '软件仓库' ,desc_cn: '本地 YUM/APT 软件源' } + - { name: CA Certificate ,url: '/ca.crt' ,desc: 'Self-Signed CA Certificate' ,icon: 'lock' ,name_cn: 'CA 证书' ,desc_cn: '自签CA根证书' } + - { name: Software Repo ,url: '/repo' ,desc: 'Local YUM/APT Repository' ,icon: 'package' ,name_cn: '软件仓库' ,desc_cn: '本地 YUM/APT 软件源' } - { name: Explain Visualizer ,url: '/pev' ,desc: 'Postgres EXPLAIN Visualizer' ,icon: 'search' ,name_cn: '执行计划' ,desc_cn: 'PG 执行计划可视化工具' } infra_extra_services: [] # extra services to be added on infra home page @@ -107,7 +107,7 @@ grafana_enabled: true # enable grafana on this infra node? grafana_port: 3000 # default listen port for grafana grafana_clean: false # clean grafana data during init? grafana_admin_username: admin # grafana admin username, `admin` by default -grafana_admin_password: pigsty # grafana admin password, `pigsty` by default +grafana_admin_password: observability # grafana admin password, `observability` by default grafana_auth_proxy: false # enable grafana auth proxy? grafana_pgurl: '' # external postgres database url for grafana if given grafana_view_password: DBUser.Viewer # password for grafana meta pg datasource