From 76e0c2eb032286928275ab7c1bd13c92e8430e44 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Sat, 11 Jan 2025 14:38:01 +0300 Subject: [PATCH 1/3] PMM-7 fix podman tests --- .github/workflows/podman-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/podman-tests.yml b/.github/workflows/podman-tests.yml index e3cf551883..e9052564b5 100644 --- a/.github/workflows/podman-tests.yml +++ b/.github/workflows/podman-tests.yml @@ -6,7 +6,7 @@ on: - v3 pull_request: paths: - - 'documentation/docs/install-pmm/install-pmm-server/baremetal/podman.md' + - 'documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md' workflow_dispatch: @@ -16,13 +16,13 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 1 - name: Install pandoc run: | - wget https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb + curl -O -sSfL https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb sudo apt-get install -y ./pandoc-2.18-1-amd64.deb rm pandoc-2.18-1-amd64.deb @@ -30,7 +30,7 @@ jobs: run: cp documentation/resources/bin/doc_test_template.sh ./documentation/docs_test_podman.sh - name: Get CodeBlocks and push them to test template - run: pandoc -i documentation/docs/install-pmm/install-pmm-server/baremetal/podman.md --lua-filter documentation/resources/bin/CodeBlock.lua -t html -o /dev/null >> documentation/docs_test_podman.sh + run: pandoc -i documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md --lua-filter documentation/resources/bin/CodeBlock.lua -t html -o /dev/null >> documentation/docs_test_podman.sh - name: Run podman tests run: ./documentation/docs_test_podman.sh From d43c0ea1518fbb33e215949798faabdb7bca6002 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Sat, 11 Jan 2025 14:58:11 +0300 Subject: [PATCH 2/3] PMM-7 fix podman tests --- .github/workflows/podman-tests.yml | 4 ++-- .../install-pmm-server/baremetal/podman/index.md | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/podman-tests.yml b/.github/workflows/podman-tests.yml index e9052564b5..b7680aa562 100644 --- a/.github/workflows/podman-tests.yml +++ b/.github/workflows/podman-tests.yml @@ -42,6 +42,6 @@ jobs: pandoc --version podman version podman ps --all || true - systemctl status --user pmm-server || true + systemctl status --user $(id -un) || true podman inspect pmm-server || true - journalctl -r || true + # journalctl -r || true diff --git a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md index b0b5468ba4..3c99803289 100644 --- a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md +++ b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md @@ -115,8 +115,8 @@ On the other hand, the manual method offers a simpler setup with complete contro 4. Start services: ```sh - systemctl --user enable --now pmm-server - systemctl --user enable --now watchtower + systemctl --user enable --now pmm-server.service + systemctl --user enable --now watchtower.service ``` 5. Go to `https://localhost:8443` to access the PMM user interface in a web browser. If you are accessing the host remotely, replace `localhost` with the IP or server name of the host. @@ -160,7 +160,7 @@ On the other hand, the manual method offers a simpler setup with complete contro 3. Start services: ```sh - systemctl --user enable --now pmm-server + systemctl --user enable --now pmm-server.service ``` 4. Go to `https://localhost:8443` to access the PMM user interface in a web browser. If you are accessing the host remotely, replace `localhost` with the IP or server name of the host. @@ -202,7 +202,7 @@ To run Podman as a non-privileged user: # set environment for this unit Environment=PMM_PUBLIC_PORT=8443 Environment=PMM_VOLUME_NAME=%N - Environment=PMM_TAG=2.33.0 + Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server Environment=PMM_ENV_FILE=%h/.config/pmm-server/pmm-server.env @@ -249,7 +249,7 @@ To run Podman as a non-privileged user: ```text Environment=PMM_PUBLIC_PORT=8443 Environment=PMM_VOLUME_NAME=%N - Environment=PMM_TAG=2.33.0 + Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server ``` @@ -258,7 +258,7 @@ To run Podman as a non-privileged user: ```sh mkdir -p ~/.config/pmm-server/ cat << "EOF" > ~/.config/pmm-server/env - PMM_TAG=2.31.0 + PMM_TAG=2.44.0 PMM_IMAGE=docker.io/percona/pmm-server PMM_PUBLIC_PORT=8443 EOF @@ -270,7 +270,7 @@ To run Podman as a non-privileged user: 3. Enable and start: ```sh - systemctl --user enable --now pmm-server + systemctl --user enable --now pmm-server.service ``` 4. Activate the podman socket using the [Podman socket activation instructions](https://github.com/containers/podman/blob/main/docs/tutorials/socket_activation.md). From c110d878c978ed00fb2d0dc6f79e0d5f1533f672 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Sat, 11 Jan 2025 15:05:05 +0300 Subject: [PATCH 3/3] PMM-7 fix podman tests --- .github/workflows/podman-tests.yml | 6 +++--- .../install-pmm-server/baremetal/podman/index.md | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/podman-tests.yml b/.github/workflows/podman-tests.yml index b7680aa562..fa1773182b 100644 --- a/.github/workflows/podman-tests.yml +++ b/.github/workflows/podman-tests.yml @@ -41,7 +41,7 @@ jobs: cat ./documentation/docs_test_podman.sh pandoc --version podman version - podman ps --all || true - systemctl status --user $(id -un) || true + podman ps --all + systemctl --user status pmm-server.service || true podman inspect pmm-server || true - # journalctl -r || true + journalctl --user -xe diff --git a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md index 3c99803289..b82ff71687 100644 --- a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md +++ b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md @@ -115,8 +115,8 @@ On the other hand, the manual method offers a simpler setup with complete contro 4. Start services: ```sh - systemctl --user enable --now pmm-server.service - systemctl --user enable --now watchtower.service + systemctl --user enable --now pmm-server + systemctl --user enable --now watchtower ``` 5. Go to `https://localhost:8443` to access the PMM user interface in a web browser. If you are accessing the host remotely, replace `localhost` with the IP or server name of the host. @@ -160,7 +160,7 @@ On the other hand, the manual method offers a simpler setup with complete contro 3. Start services: ```sh - systemctl --user enable --now pmm-server.service + systemctl --user enable --now pmm-server ``` 4. Go to `https://localhost:8443` to access the PMM user interface in a web browser. If you are accessing the host remotely, replace `localhost` with the IP or server name of the host. @@ -200,7 +200,7 @@ To run Podman as a non-privileged user: Type=simple # set environment for this unit - Environment=PMM_PUBLIC_PORT=8443 + Environment=PMM_PUBLIC_PORT=443 Environment=PMM_VOLUME_NAME=%N Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server @@ -209,7 +209,7 @@ To run Podman as a non-privileged user: # optional env file that could override previous env settings for this unit EnvironmentFile=-%h/.config/pmm-server/env - ExecStart=/usr/bin/podman run --rm --replace=true --name=%N -p ${PMM_PUBLIC_PORT}:443/tcp --ulimit=host --volume=${PMM_VOLUME_NAME}:/srv --env-file=${PMM_ENV_FILE} --health-cmd=none --health-interval=disable ${PMM_IMAGE}:${PMM_TAG} + ExecStart=/usr/bin/podman run --rm --replace=true --name=%N -p ${PMM_PUBLIC_PORT}:8443/tcp --ulimit=host --volume=${PMM_VOLUME_NAME}:/srv --env-file=${PMM_ENV_FILE} --health-cmd=none --health-interval=disable ${PMM_IMAGE}:${PMM_TAG} ExecStop=/usr/bin/podman stop -t 10 %N Restart=on-failure RestartSec=20 @@ -247,7 +247,7 @@ To run Podman as a non-privileged user: SystemD service uses some environment variables that could be customized if needed: ```text - Environment=PMM_PUBLIC_PORT=8443 + Environment=PMM_PUBLIC_PORT=443 Environment=PMM_VOLUME_NAME=%N Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server @@ -260,7 +260,7 @@ To run Podman as a non-privileged user: cat << "EOF" > ~/.config/pmm-server/env PMM_TAG=2.44.0 PMM_IMAGE=docker.io/percona/pmm-server - PMM_PUBLIC_PORT=8443 + PMM_PUBLIC_PORT=443 EOF ``` @@ -270,7 +270,7 @@ To run Podman as a non-privileged user: 3. Enable and start: ```sh - systemctl --user enable --now pmm-server.service + systemctl --user enable --now pmm-server ``` 4. Activate the podman socket using the [Podman socket activation instructions](https://github.com/containers/podman/blob/main/docs/tutorials/socket_activation.md).