From 4f044b412d3ca221e77caa40f90087f2d79cacef Mon Sep 17 00:00:00 2001 From: Vonng Date: Tue, 21 Mar 2023 21:20:18 +0800 Subject: [PATCH] bump pigsty version string to v2.0.1 --- Makefile | 2 +- README.md | 20 ++++++++--------- bin/get | 2 +- bin/getb | 2 +- bootstrap | 2 +- configure | 2 +- docs/FAQ.md | 8 +++---- docs/INSTALL.md | 42 +++++++++++++++++------------------ docs/INSTALL_ZH.md | 36 +++++++++++++++--------------- docs/PARAM.md | 4 ++-- docs/README.md | 20 ++++++++--------- docs/RELEASENOTE.md | 41 ++++++++++++++++++++++++---------- files/cmdb.sql | 2 +- files/grafana/pigsty.json | 2 +- files/pigsty/auto.yml | 2 +- files/pigsty/build.yml | 2 +- files/pigsty/citus.yml | 2 +- files/pigsty/demo.yml | 2 +- files/pigsty/dual.yml | 2 +- files/pigsty/el7.yml | 2 +- files/pigsty/el8.yml | 2 +- files/pigsty/el9.yml | 2 +- files/pigsty/full.yml | 2 +- files/pigsty/minio.yml | 2 +- files/pigsty/public.yml | 2 +- files/pigsty/redis.yml | 2 +- files/pigsty/remote.yml | 2 +- files/pigsty/security.yml | 2 +- files/pigsty/test.yml | 2 +- pigsty.yml | 2 +- roles/infra/defaults/main.yml | 2 +- roles/repo/defaults/main.yml | 2 +- 32 files changed, 119 insertions(+), 102 deletions(-) diff --git a/Makefile b/Makefile index 3476e2789..3aad707f7 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # License : AGPLv3 #==============================================================# # pigsty version & default develop & testing el version -VERSION?=v2.0.0 +VERSION?=v2.0.1 EL_VER=9 # local name diff --git a/README.md b/README.md index 2cdf05023..43b34dfb6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ > > —— **A battery-included, local-first, open-source RDS PG alternative.** > -> [Release v2.0.0](https://github.com/Vonng/pigsty/releases/tag/v2.0.0) | [Repo](https://github.com/Vonng/pigsty) | [Demo](http://demo.pigsty.cc) | [Docs](https://vonng.github.io/pigsty/#/) | [Blog](https://pigsty.cc/en/) | [Telegram](https://t.me/joinchat/gV9zfZraNPM3YjFh) | [Discord](https://discord.gg/sfBqv7S5) +> [Release v2.0.1](https://github.com/Vonng/pigsty/releases/tag/v2.0.1) | [Repo](https://github.com/Vonng/pigsty) | [Demo](http://demo.pigsty.cc) | [Docs](https://vonng.github.io/pigsty/#/) | [Blog](https://pigsty.cc/en/) | [Telegram](https://t.me/joinchat/gV9zfZraNPM3YjFh) | [Discord](https://discord.gg/sfBqv7S5) > > [Get Started](docs/INSTALL.md) with `curl -fsSL http://download.pigsty.cc/get | bash` @@ -50,12 +50,12 @@ FROM CDN : bash -c "$(curl -fsSL http://download.pigsty.cc/get)" FROM GITHUB : bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" [Downloading] =========================================== [ OK ] download pigsty source code from CDN -[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz +[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz ... -MD5: 78a6ae5ff9ab0b8aa3848805aeadd1d8 /tmp/pigsty-v2.0.0.tgz +MD5: abcdef1234567890abcdef1234567890 /tmp/pigsty-v2.0.1.tgz [Extracting] =========================================== -[ OK ] extract '/tmp/pigsty-v2.0.0.tgz' to '/root/pigsty' -[ OK ] $ tar -xf /tmp/pigsty-v2.0.0.tgz -C ~; +[ OK ] extract '/tmp/pigsty-v2.0.1.tgz' to '/root/pigsty' +[ OK ] $ tar -xf /tmp/pigsty-v2.0.1.tgz -C ~; cd ~/pigsty # entering pigsty home directory before proceeding [Proceeding] =========================================== ./bootstrap # install ansible & download the optional offline packages @@ -78,7 +78,7 @@ You can also download pigsty source with `git`, don't forget to checkout a speci ```bash git clone https://github.com/Vonng/pigsty; -cd pigsty; git checkout v2.0.0 +cd pigsty; git checkout v2.0.1 ``` @@ -93,10 +93,10 @@ You can also download pigsty source & offline pkgs directly from GitHub release bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" # or download tarball directly with curl -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz -o ~/pigsty.tgz # SRC -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz -o ~/pigsty.tgz # SRC +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 ``` diff --git a/bin/get b/bin/get index 01f5ba76e..a5996841e 100755 --- a/bin/get +++ b/bin/get @@ -12,7 +12,7 @@ set -o pipefail # Author : Ruohang Feng (rh@vonng.com) # License : AGPLv3 #==============================================================# -VERSION=v2.0.0 +VERSION=v2.0.1 #--------------------------------------------------------------# diff --git a/bin/getb b/bin/getb index f760b9410..b5e5ad61f 100755 --- a/bin/getb +++ b/bin/getb @@ -11,7 +11,7 @@ set -o pipefail # Author : Ruohang Feng (rh@vonng.com) # License : AGPLv3 #==============================================================# -VERSION=v2.0.0 +VERSION=v2.0.1 #--------------------------------------------------------------# diff --git a/bootstrap b/bootstrap index e95239c18..8b802aa2a 100755 --- a/bootstrap +++ b/bootstrap @@ -8,7 +8,7 @@ # Author : Ruohang Feng (rh@vonng.com) # License : AGPLv3 #==============================================================# -VERSION=v2.0.0 +VERSION=v2.0.1 #--------------------------------------------------------------# diff --git a/configure b/configure index e11da13f4..97390d5e8 100755 --- a/configure +++ b/configure @@ -8,7 +8,7 @@ # Author : Ruohang Feng (rh@vonng.com) # License : AGPLv3 #==============================================================# -VERSION=v2.0.0 +VERSION=v2.0.1 #--------------------------------------------------------------# diff --git a/docs/FAQ.md b/docs/FAQ.md index 2d990f339..65bd50f47 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -86,10 +86,10 @@ If a firewall or GFW blocks some repo, consider using a [`proxy_env`](PARAM#prox Offline packages can be downloaded during [`bootstrap`](INSTALL#bootstrap), or you can download them directly via: ```bash -https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz # source code -https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz # el7 packages -https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz # el8 packages -https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz # el9 packages +https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz # source code +https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz # el7 packages +https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz # el8 packages +https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz # el9 packages ```
diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 7f4a6ce1a..0e7149060 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -31,12 +31,12 @@ FROM CDN : bash -c "$(curl -fsSL http://download.pigsty.cc/get)" FROM GITHUB : bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" [Downloading] =========================================== [ OK ] download pigsty source code from CDN -[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz +[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz ... -MD5: 78a6ae5ff9ab0b8aa3848805aeadd1d8 /tmp/pigsty-v2.0.0.tgz +MD5: abcdef1234567890abcdef1234567890 /tmp/pigsty-v2.0.1.tgz [Extracting] =========================================== -[ OK ] extract '/tmp/pigsty-v2.0.0.tgz' to '/root/pigsty' -[ OK ] $ tar -xf /tmp/pigsty-v2.0.0.tgz -C ~; +[ OK ] extract '/tmp/pigsty-v2.0.1.tgz' to '/root/pigsty' +[ OK ] $ tar -xf /tmp/pigsty-v2.0.1.tgz -C ~; cd ~/pigsty # entering pigsty home directory before proceeding [Proceeding] =========================================== ./bootstrap # install ansible & download the optional offline packages @@ -59,7 +59,7 @@ You can also download pigsty source with `git`, don't forget to checkout a speci ```bash git clone https://github.com/Vonng/pigsty; -cd pigsty; git checkout v2.0.0 +cd pigsty; git checkout v2.0.1 ``` @@ -74,10 +74,10 @@ You can also download pigsty source & offline pkgs directly from GitHub release bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" # or download tarball directly with curl -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz -o ~/pigsty.tgz # SRC -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz -o ~/pigsty.tgz # SRC +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 ``` @@ -128,15 +128,15 @@ curl -fsSL http://download.pigsty.cc/get | bash If you want to download a specific version, use the following URLs: ```bash -VERSION=v2.0.0 +VERSION=v2.0.1 https://github.com/Vonng/pigsty/releases/download/${VERSION}/pigsty-${VERSION}.tgz ``` -For example, Pigsty v2.0.0 source can be acquired with: +For example, Pigsty v2.0.1 source can be acquired with: ```bash -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz -o ~/pigsty.tgz -curl -L http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz -o ~/pigsty.tgz # China CDN Mirror +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz -o ~/pigsty.tgz +curl -L http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz -o ~/pigsty.tgz # China CDN Mirror ``` @@ -154,7 +154,7 @@ You can also download it manually and put it under `/tmp/pkg.tgz` for later use.
Download offline packages manually ```bash -VERSION=v2.0.0 +VERSION=v2.0.1 OS_VERSION=$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release) | grep -o '^[^.]\+') ARCH=$(uname -m) FILENAME=pigsty-pkg-${VERSION}.el${OS_VERSION}.${ARCH}.tgz @@ -162,11 +162,11 @@ PKG_URL="https://github.com/Vonng/pigsty/releases/download/${VERSION}/${FILENAME echo ${PKG_URL} && curl -L ${PKG_URL} -o /tmp/pkg.tgz ``` -For example, Pigsty v2.0.0 on EL7.x86_64 will have the following packages: +For example, Pigsty v2.0.1 on EL7.x86_64 will have the following packages: ```bash -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz -curl -L http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # China CDN Mirror +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz +curl -L http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # China CDN Mirror ``` > Not all combinations of OS and architecture are supported yet. Please check the official release page. @@ -225,7 +225,7 @@ It will also download / extract / setup the offline [packages](#offline-packages If `/tmp/pkg.tgz` already exists, bootstrap will use it directly: ```bash -bootstrap pigsty v2.0.0 begin +bootstrap pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 @@ -249,7 +249,7 @@ proceed with ./configure Download `pkg.tgz` from Github and extract it: ```bash -bootstrap pigsty v2.0.0 begin +bootstrap pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 @@ -257,7 +257,7 @@ bootstrap pigsty v2.0.0 begin [ OK ] sudo = vagrant ok [ IN ] Cache /tmp/pkg.tgz not exists, download? (y/n): => y -[ OK ] download from Github http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz to /tmp/pkg.tgz +[ OK ] download from Github http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz to /tmp/pkg.tgz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 913M 100 913M 0 0 661k 0 0:23:33 0:23:33 --:--:-- 834k @@ -345,7 +345,7 @@ When `-n|--non-interactive` is specified, you have to specify a primary IP addre ```bash [vagrant@meta pigsty]$ ./configure -configure pigsty v2.0.0 begin +configure pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 diff --git a/docs/INSTALL_ZH.md b/docs/INSTALL_ZH.md index 91c2fe306..d3b0e4a55 100644 --- a/docs/INSTALL_ZH.md +++ b/docs/INSTALL_ZH.md @@ -36,12 +36,12 @@ FROM CDN : bash -c "$(curl -fsSL http://download.pigsty.cc/get)" FROM GITHUB : bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" [Downloading] =========================================== [ OK ] download pigsty source code from CDN -[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz +[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz ... -MD5: 78a6ae5ff9ab0b8aa3848805aeadd1d8 /tmp/pigsty-v2.0.0.tgz +MD5: abcdef1234567890abcdef1234567890 /tmp/pigsty-v2.0.1.tgz [Extracting] =========================================== -[ OK ] extract '/tmp/pigsty-v2.0.0.tgz' to '/root/pigsty' -[ OK ] $ tar -xf /tmp/pigsty-v2.0.0.tgz -C ~; +[ OK ] extract '/tmp/pigsty-v2.0.1.tgz' to '/root/pigsty' +[ OK ] $ tar -xf /tmp/pigsty-v2.0.1.tgz -C ~; cd ~/pigsty # entering pigsty home directory before proceeding [Proceeding] =========================================== ./bootstrap # install ansible & download the optional offline packages @@ -63,7 +63,7 @@ You can also download pigsty source with `git`, don't forget to checkout a speci ```bash git clone https://github.com/Vonng/pigsty; -cd pigsty; git checkout v2.0.0 +cd pigsty; git checkout v2.0.1 ```
@@ -115,11 +115,11 @@ curl http://download.pigsty.cc/get | bash ```bash # 从 CDN 或 Github 下载源码包 -curl -L http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz +curl -L http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz # 如果 curl 不可用，git clone 也可以 -git clone https://github.com/Vonng/pigsty; cd pigsty; git checkout v2.0.0 +git clone https://github.com/Vonng/pigsty; cd pigsty; git checkout v2.0.1 ``` ### 离线软件包 @@ -132,14 +132,14 @@ Pigsty 会在 [Bootstrap/准备](#准备) 时，提示下载对应的离线软 ```bash # CDN EL 7,8,9 -curl -L http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 -curl -L http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 -curl -L http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 +curl -L http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 +curl -L http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 +curl -L http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 # GITHUB EL 7,8,9 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 ``` @@ -189,7 +189,7 @@ Bootstrap 的详细逻辑如下： 如果离线软件包存在于 `/tmp/pkg.tgz`， bootstrap 会直接使用它： ```bash -bootstrap pigsty v2.0.0 begin +bootstrap pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 @@ -213,7 +213,7 @@ proceed with ./configure 从 Github/CDN 下载 `pkg.tgz` 并解压使用： ```bash -bootstrap pigsty v2.0.0 begin +bootstrap pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 @@ -221,7 +221,7 @@ bootstrap pigsty v2.0.0 begin [ OK ] sudo = vagrant ok [ IN ] Cache /tmp/pkg.tgz not exists, download? (y/n): => y -[ OK ] download from Github http://download.pigsty.cc/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz to /tmp/pkg.tgz +[ OK ] download from Github http://download.pigsty.cc/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz to /tmp/pkg.tgz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 913M 100 913M 0 0 661k 0 0:23:33 0:23:33 --:--:-- 834k @@ -310,7 +310,7 @@ proceed with ./configure ```bash [vagrant@meta pigsty]$ ./configure -configure pigsty v2.0.0 begin +configure pigsty v2.0.1 begin [ OK ] region = china [ OK ] kernel = Linux [ OK ] machine = x86_64 diff --git a/docs/PARAM.md b/docs/PARAM.md index 80099e437..e8f39bb66 100644 --- a/docs/PARAM.md +++ b/docs/PARAM.md @@ -290,7 +290,7 @@ Parameters about pigsty infrastructure components: local yum repo, nginx, dnsmas This section contains some metadata of current pigsty deployments, such as version string, admin node IP address, repo mirror [`region`](#region) and http(s) proxy when downloading pacakges. ```yaml - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe proxy_env: # global proxy env when downloading packages @@ -306,7 +306,7 @@ name: `version`, type: `string`, level: `G` pigsty version string -default value:`v2.0.0` +default value:`v2.0.1` It will be used for pigsty introspection & content rendering. diff --git a/docs/README.md b/docs/README.md index 4e14032a5..510ecd7b1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,7 +4,7 @@ > > —— **A battery-included, local-first, open-source RDS PG alternative.** > -> [Release v2.0.0](https://github.com/Vonng/pigsty/releases/tag/v2.0.0) | [Repo](https://github.com/Vonng/pigsty) | [Demo](http://demo.pigsty.cc) | [Docs](https://vonng.github.io/pigsty/#/) | [Blog](https://pigsty.cc/en/) | [Telegram](https://t.me/joinchat/gV9zfZraNPM3YjFh) | [Discord](https://discord.gg/sfBqv7S5) +> [Release v2.0.1](https://github.com/Vonng/pigsty/releases/tag/v2.0.1) | [Repo](https://github.com/Vonng/pigsty) | [Demo](http://demo.pigsty.cc) | [Docs](https://vonng.github.io/pigsty/#/) | [Blog](https://pigsty.cc/en/) | [Telegram](https://t.me/joinchat/gV9zfZraNPM3YjFh) | [Discord](https://discord.gg/sfBqv7S5) > > [Get Started](INSTALL.md) with `curl -fsSL http://download.pigsty.cc/get | bash` @@ -50,12 +50,12 @@ FROM CDN : bash -c "$(curl -fsSL http://download.pigsty.cc/get)" FROM GITHUB : bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" [Downloading] =========================================== [ OK ] download pigsty source code from CDN -[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.0/pigsty-v2.0.0.tgz +[ OK ] $ curl -SL http://download.pigsty.cc/v2.0.1/pigsty-v2.0.1.tgz ... -MD5: 78a6ae5ff9ab0b8aa3848805aeadd1d8 /tmp/pigsty-v2.0.0.tgz +MD5: abcdef1234567890abcdef1234567890 /tmp/pigsty-v2.0.1.tgz [Extracting] =========================================== -[ OK ] extract '/tmp/pigsty-v2.0.0.tgz' to '/root/pigsty' -[ OK ] $ tar -xf /tmp/pigsty-v2.0.0.tgz -C ~; +[ OK ] extract '/tmp/pigsty-v2.0.1.tgz' to '/root/pigsty' +[ OK ] $ tar -xf /tmp/pigsty-v2.0.1.tgz -C ~; cd ~/pigsty # entering pigsty home directory before proceeding [Proceeding] =========================================== ./bootstrap # install ansible & download the optional offline packages @@ -78,7 +78,7 @@ You can also download pigsty source with `git`, don't forget to checkout a speci ```bash git clone https://github.com/Vonng/pigsty; -cd pigsty; git checkout v2.0.0 +cd pigsty; git checkout v2.0.1 ``` @@ -93,10 +93,10 @@ You can also download pigsty source & offline pkgs directly from GitHub release bash -c "$(curl -fsSL https://raw.githubusercontent.com/Vonng/pigsty/master/bin/get)" # or download tarball directly with curl -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-v2.0.0.tgz -o ~/pigsty.tgz # SRC -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 -curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.0/pigsty-pkg-v2.0.0.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-v2.0.1.tgz -o ~/pigsty.tgz # SRC +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el9.x86_64.tgz -o /tmp/pkg.tgz # EL9 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el8.x86_64.tgz -o /tmp/pkg.tgz # EL8 +curl -L https://github.com/Vonng/pigsty/releases/download/v2.0.1/pigsty-pkg-v2.0.1.el7.x86_64.tgz -o /tmp/pkg.tgz # EL7 ``` diff --git a/docs/RELEASENOTE.md b/docs/RELEASENOTE.md index b4c53aead..b48cd04d9 100644 --- a/docs/RELEASENOTE.md +++ b/docs/RELEASENOTE.md @@ -2,7 +2,7 @@ | Version | Time | Description | Release | |:----------------|:----------:|---------------------------------------------------------|-------------------------------------------------------------------------------------------| -| [v2.0.1](#v201) | 2023-03-31 | Working in progress with some minor bug fixes | WIP | +| [v2.0.1](#v201) | 2023-03-21 | v2 Bug Fix, security enhance and bump grafana version | [v2.0.1](https://github.com/Vonng/pigsty/releases/tag/v2.0.1) | | [v2.0.0](#v200) | 2023-02-28 | Compatibility Security Maintainability Enhancement | [v2.0.0](https://github.com/Vonng/pigsty/releases/tag/v2.0.0) | | [v1.5.1](#v151) | 2022-06-18 | Grafana Security Hotfix | [v1.5.1](https://github.com/Vonng/pigsty/releases/tag/v1.5.1) | | [v1.5.0](#v150) | 2022-05-31 | Docker Applications | [v1.5.0](https://github.com/Vonng/pigsty/releases/tag/v1.5.0) | @@ -34,33 +34,50 @@ ## v2.0.1 -> WORKING IN PROGRESS! +Bug fix for v2.0.0, security improvement routine update. **Enhancement** +* Replace the pig shape logo for compliance with the PostgreSQL trademark policy. * Bump grafana version to v9.4 with better UI and bugfix. * Bump patroni version to v3.0.1 with some bugfix. -* New script `bin/upgrade` for pigsty self upgrade. * Change: rollback grafana systemd service file to rpm default. * Use slow `copy` instead of `rsync` to copy grafana dashboards. -* enhancement: add back default repo files after bootstrap -* Add asciinema video for administration tasks +* Enhancement: add back default repo files after bootstrap +* Add asciinema video for various administration tasks. * Security Enhance Mode: restrict monitor user privilege. -* New config template: `dual.yml` for two node deployment. -* Enable `log_connections` and `log_disconnections` in `crit.yml` template -* Enable `$lib/passwordcheck` in `pg_libs` in `crit.yml` template -* Explicitly grant monitor view permission to `pg_monitor` role +* New config template: `dual.yml` for two-node deployment. +* Enable `log_connections` and `log_disconnections` in `crit.yml` template. +* Enable `$lib/passwordcheck` in `pg_libs` in `crit.yml` template. +* Explicitly grant monitor view permission to `pg_monitor` role. * Remove default `dbrole_readonly` from `dbuser_monitor` to limit monitor user privilege -* Replace the pig shape logo +* Now patroni listen on `{{ inventory_hostname }}` instead of `0.0.0.0` +* Now you can control postgres/pgbouncer listen to address with `pg_listen` +* Now you can use placeholder `${ip}`, `${lo}`, `${vip}` in `pg_listen` +* Bump Aliyun terraform image to rocky Linux 9 instead of centos 7.9 +* Bump bytebase to v1.14.0 **Bug Fixes** * Add missing advertise address for alertmanager -* Add `-a password` to redis-join task @ `redis.yml` +* Fix missing `pg_mode` error when adding postgres user with `bin/pgsql-user` +* Add `-a password` to redis-join task @ `redis.yml` * Fix missing default value in `infra-rm.yml`.`remove infra data` * Fix prometheus targets file ownership to `prometheus` -* Use admin user rather than root to delete metadata in dcs +* Use admin user rather than root to delete metadata in DCS +* Fix Meta datasource missing database name due to grafana 9.4 bug. + + +**Caveats** + +Official EL8 pgdg upstream is broken now, DO use it with caution! + +Affected packages: `postgis33_15, pgloader, postgresql_anonymizer_15*, postgresql_faker_15` + + + + ------------------------------ diff --git a/files/cmdb.sql b/files/cmdb.sql index f13858a29..02a286884 100644 --- a/files/cmdb.sql +++ b/files/cmdb.sql @@ -1239,7 +1239,7 @@ TRUNCATE pigsty.default_var; INSERT INTO pigsty.default_var VALUES -- INFRA PARAMETERS -(101, 'version', '"v2.0.0"', 'INFRA', 'META', 'string', 'G', 'pigsty version string', NULL), +(101, 'version', '"v2.0.1"', 'INFRA', 'META', 'string', 'G', 'pigsty version string', NULL), (102, 'admin_ip', '"10.10.10.10"', 'INFRA', 'META', 'ip', 'G', 'admin node ip address', NULL), (103, 'region', '"default"', 'INFRA', 'META', 'enum', 'G', 'upstream mirror region: default,china,europe', NULL), (104, '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"}', 'INFRA', 'META', 'dict', 'G', 'global proxy env when downloading packages', NULL), diff --git a/files/grafana/pigsty.json b/files/grafana/pigsty.json index 94c9ad3da..19202437c 100644 --- a/files/grafana/pigsty.json +++ b/files/grafana/pigsty.json @@ -1813,7 +1813,7 @@ "description": "Pigsty Version Number", "hide": 2, "name": "version", - "query": "v2.0.0", + "query": "v2.0.1", "skipUrlSync": false, "type": "constant" } diff --git a/files/pigsty/auto.yml b/files/pigsty/auto.yml index 86b7fe13b..1ba79684f 100644 --- a/files/pigsty/auto.yml +++ b/files/pigsty/auto.yml @@ -37,7 +37,7 @@ all: node_crontab: [ '00 01 * * * postgres /pg/bin/pg-backup full' ] # make a full backup every 1am vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/build.yml b/files/pigsty/build.yml index 05e8a67e1..e7a104f0d 100644 --- a/files/pigsty/build.yml +++ b/files/pigsty/build.yml @@ -29,7 +29,7 @@ all: vars: - version: v2.0.0 + version: v2.0.1 admin_ip: 10.10.10.10 region: china etcd_clean: true diff --git a/files/pigsty/citus.yml b/files/pigsty/citus.yml index 4dc48ce4b..6819006e3 100644 --- a/files/pigsty/citus.yml +++ b/files/pigsty/citus.yml @@ -50,7 +50,7 @@ all: pg_libs: 'citus, timescaledb, pg_stat_statements, auto_explain' # citus will be added by patroni automatically pg_conf: tiny.yml # use tiny for demo citus nodes - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe ... \ No newline at end of file diff --git a/files/pigsty/demo.yml b/files/pigsty/demo.yml index 14140140f..f5091476f 100644 --- a/files/pigsty/demo.yml +++ b/files/pigsty/demo.yml @@ -85,7 +85,7 @@ all: vars: # global variables - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe node_tune: tiny # use tiny template for NODE in demo environment diff --git a/files/pigsty/dual.yml b/files/pigsty/dual.yml index 3e305dd0a..56ff79be8 100644 --- a/files/pigsty/dual.yml +++ b/files/pigsty/dual.yml @@ -51,7 +51,7 @@ all: #pg_vip_interface: eth1 vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/el7.yml b/files/pigsty/el7.yml index 9c5e3374b..82a00ca03 100644 --- a/files/pigsty/el7.yml +++ b/files/pigsty/el7.yml @@ -37,7 +37,7 @@ all: node_crontab: [ '00 01 * * * postgres /pg/bin/pg-backup full' ] # make a full backup every 1am vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/el8.yml b/files/pigsty/el8.yml index fa019d594..4d8b90173 100644 --- a/files/pigsty/el8.yml +++ b/files/pigsty/el8.yml @@ -37,7 +37,7 @@ all: node_crontab: [ '00 01 * * * postgres /pg/bin/pg-backup full' ] # make a full backup every 1am vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/el9.yml b/files/pigsty/el9.yml index 5a210bf35..93e936220 100644 --- a/files/pigsty/el9.yml +++ b/files/pigsty/el9.yml @@ -37,7 +37,7 @@ all: node_crontab: [ '00 01 * * * postgres /pg/bin/pg-backup full' ] # make a full backup every 1am vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/full.yml b/files/pigsty/full.yml index 28bfb4bdf..18d192ce3 100644 --- a/files/pigsty/full.yml +++ b/files/pigsty/full.yml @@ -182,7 +182,7 @@ all: #----------------------------------------------------------------- # META #----------------------------------------------------------------- - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe proxy_env: # global proxy env when downloading packages diff --git a/files/pigsty/minio.yml b/files/pigsty/minio.yml index 9318e9639..0a0f33b4d 100644 --- a/files/pigsty/minio.yml +++ b/files/pigsty/minio.yml @@ -101,7 +101,7 @@ all: vars: - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/public.yml b/files/pigsty/public.yml index fed9e2104..1a9734261 100644 --- a/files/pigsty/public.yml +++ b/files/pigsty/public.yml @@ -87,7 +87,7 @@ all: vars: # global variables - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe infra_portal: # domain names and upstream servers diff --git a/files/pigsty/redis.yml b/files/pigsty/redis.yml index 0e412d659..501a9da8c 100644 --- a/files/pigsty/redis.yml +++ b/files/pigsty/redis.yml @@ -31,7 +31,7 @@ all: vars: { redis_cluster: redis-test ,redis_password: 'redis.test' ,redis_mode: cluster, redis_max_memory: 32MB } vars: - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe diff --git a/files/pigsty/remote.yml b/files/pigsty/remote.yml index 8ff1d8e9f..7652bf84b 100644 --- a/files/pigsty/remote.yml +++ b/files/pigsty/remote.yml @@ -23,7 +23,7 @@ all: 20004: { pg_cluster: pg-bar, pg_seq: 3, pg_host: 10.10.10.13 , pg_monitor_username: dbuser_monitor, pg_monitor_password: DBUser.Monitor } vars: - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default,china,europe ... \ No newline at end of file diff --git a/files/pigsty/security.yml b/files/pigsty/security.yml index 0820be282..33c76b7a6 100644 --- a/files/pigsty/security.yml +++ b/files/pigsty/security.yml @@ -76,7 +76,7 @@ all: # Parameters # #################################################################### vars: # global variables - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe patroni_ssl_enabled: true # secure patroni RestAPI communications with SSL? diff --git a/files/pigsty/test.yml b/files/pigsty/test.yml index 133a3f35f..0dff20e14 100644 --- a/files/pigsty/test.yml +++ b/files/pigsty/test.yml @@ -44,7 +44,7 @@ all: vars: # global parameters - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe infra_portal: # domain names and upstream servers diff --git a/pigsty.yml b/pigsty.yml index 5a7848d12..8ddd9bbe9 100644 --- a/pigsty.yml +++ b/pigsty.yml @@ -85,7 +85,7 @@ all: vars: # global variables - version: v2.0.0 # pigsty version string + version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address region: default # upstream mirror region: default|china|europe node_tune: tiny # use tiny template for NODE in demo environment diff --git a/roles/infra/defaults/main.yml b/roles/infra/defaults/main.yml index 5cfca4392..efb1fde37 100644 --- a/roles/infra/defaults/main.yml +++ b/roles/infra/defaults/main.yml @@ -94,7 +94,7 @@ nginx_cert_exists: false #----------------------------------------------------------------- # META (Reference) #----------------------------------------------------------------- -version: v2.0.0 # pigsty version string +version: v2.0.1 # pigsty version string admin_ip: 10.10.10.10 # admin node ip address, overwritten by configure #----------------------------------------------------------------- # CA (Reference) diff --git a/roles/repo/defaults/main.yml b/roles/repo/defaults/main.yml index 63f3d595d..3b231517c 100644 --- a/roles/repo/defaults/main.yml +++ b/roles/repo/defaults/main.yml @@ -64,7 +64,7 @@ repo_exists: false #----------------------------------------------------------------- # META (Reference) #----------------------------------------------------------------- -version: v2.0.0 # pigsty version string +version: v2.0.1 # pigsty version string region: default # choose a region from where to download repo pkgs: default|china|europe proxy_env: # global proxy env when downloading packages 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"