PMM-14969: UI upgrade removal

.env.dev.example

@@ -60,17 +60,6 @@ PMM_PORT_HTTPS=443
 # GF_SMTP_FROM_NAME=Percona
 # GF_SMTP_FROM_ADDRESS=admin@percona.com
 
-# Watchtower configuration for automatic updates of PMM Server and its components.
-# --profile=watchtower must be enabled in docker-compose.dev.yml for these settings to take effect.
-WATCHTOWER_IMAGE=perconalab/watchtower
-# PMM_DEV_UPDATE_DOCKER_IMAGE=percona/pmm-server:3
-# PMM_WATCHTOWER_HOST=http://watchtower:8080
-PMM_WATCHTOWER_TOKEN=INSECURE_TOKEN
-WATCHTOWER_HTTP_LISTEN_PORT=8080
-WATCHTOWER_HTTP_API_UPDATE=1
-WATCHTOWER_NO_RESTART=0
-WATCHTOWER_DOCKER_PATH=/var/run/docker.sock
-
 # Grafana Image Renderer configuration for rendering Grafana panels as images.
 # --profile=renderer must be enabled in docker-compose.dev.yml for these settings to take effect
 # GF_RENDERING_SERVER_URL=http://renderer:8081/render

.env.example

@@ -60,17 +60,6 @@ PMM_PORT_HTTPS=443
 # GF_SMTP_FROM_NAME=Percona
 # GF_SMTP_FROM_ADDRESS=admin@percona.com
 
-# Watchtower configuration for automatic updates of PMM Server and its components.
-# --profile=watchtower must be enabled in docker-compose.dev.yml for these settings to take effect.
-# WATCHTOWER_IMAGE=perconalab/watchtower
-# PMM_WATCHTOWER_HOST=http://watchtower:8080
-# PMM_WATCHTOWER_TOKEN=INSECURE_TOKEN
-# PMM_DEV_UPDATE_DOCKER_IMAGE=percona/pmm-server:3
-# WATCHTOWER_HTTP_LISTEN_PORT=8080
-# WATCHTOWER_HTTP_API_UPDATE=1
-# WATCHTOWER_NO_RESTART=0
-# WATCHTOWER_DOCKER_PATH=/var/run/docker.sock
-
 # Grafana Image Renderer configuration for rendering Grafana panels as images.
 # --profile=renderer must be enabled in docker-compose.dev.yml for these settings to take effect
 # GF_RENDERING_SERVER_URL=http://renderer:8081/render

AGENTS.md

@@ -238,7 +238,7 @@ All long-running daemons expose on `127.0.0.1`:
 ## Key Files to Reference
 
 - `Makefile`, `Makefile.include` — build and development targets
-- `docker-compose.dev.yml` — development environment (PMM Server, renderer, watchtower)
+- `docker-compose.dev.yml` — development environment (PMM Server, renderer)
 - `docker-compose.yml` — community/quickstart compose (stable image, minimal config)
 - `go.mod` — Go module definition
 - `.golangci.yml` — linter configuration

build/Makefile

@@ -3,7 +3,6 @@ export PACKER_VERSION := 1.9.4
 # check available versions at https://vagrantcloud.com/api/v2/vagrant/bento/oraclelinux-9
 export BOX_VERSION := 202502.21.0
 export PMM_SERVER_IMAGE ?= docker.io/perconalab/pmm-server:3-dev-latest
-export WATCHTOWER_IMAGE ?= docker.io/perconalab/watchtower:dev-latest
 # --- Go-related variables ----------------------------------------------------------------
 GO_VERSION := $(shell grep '^go ' $(CURDIR)/../go.mod | awk '{print $$2}')
 
@@ -29,7 +28,6 @@ deps:
 pmm-ovf: fetch
 	/usr/bin/packer build \
 		-var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' \
-		-var 'watchtower_image_name=${WATCHTOWER_IMAGE}' \
 		-only virtualbox-ovf -color=false packer/pmm.json | tee build.log
 
 pmm-digitalocean:
@@ -41,7 +39,6 @@ pmm-azure:
 pmm-ami:
 	docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build \hashicorp/packer:${PACKER_VERSION} \
 		build -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' \
-		-var 'watchtower_image_name=${WATCHTOWER_IMAGE}' \
 		-only amazon-ebs -color=false packer/pmm.json | tee build.log
 ## ----------------- PACKER ------------------
 

build/packer/ansible/roles/podman-setup/tasks/main.yml

@@ -19,11 +19,6 @@
   set_fact:
     pmm_distribution_method: ami
 
-- name: Set SELinux in permissive mode for watchtower
-  selinux:
-    policy: targeted
-    state: permissive
-
 - name: Update podman.conf
   lineinfile:
     path: /usr/lib/tmpfiles.d/podman.conf
@@ -79,22 +74,6 @@
     group: admin
     mode: '0644'
 
-- name: Copy watchtower environment file for service to user-specific directory
-  template:
-    src: watchtower.env
-    dest: /home/admin/.config/systemd/user/
-    owner: admin
-    group: admin
-    mode: '0644'
-
-- name: Copy watchtower systemd service file to user-specific directory
-  template:
-    src: watchtower.service
-    dest: /home/admin/.config/systemd/user/
-    owner: admin
-    group: admin
-    mode: '0644'
-
 - name: Get user ID of admin user
   command: id -u admin
   register: admin_user_id
@@ -121,13 +100,6 @@
   environment:
     DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ admin_user_id.stdout }}/bus"
 
-- name: Enable and start watchtower container as a user service
-  command: systemctl --user enable --now watchtower
-  become: true
-  become_user: admin
-  environment:
-    DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ admin_user_id.stdout }}/bus"
-
 - name: Sleep for 1 minute
   pause:
     minutes: 1

build/packer/ansible/roles/podman-setup/templates/pmm-server.env

@@ -1,4 +1,2 @@
-PMM_WATCHTOWER_HOST=http://watchtower:8080
-PMM_WATCHTOWER_TOKEN=123
 PMM_IMAGE={{ pmm_server_image_name }}
 PMM_DISTRIBUTION_METHOD={{ pmm_distribution_method }}

build/packer/pmm.json

@@ -1,8 +1,7 @@
 {
   "variables": {
     "single_disk": "false",
-    "pmm_server_image_name": "docker.io/perconalab/pmm-server:3-dev-latest",
-    "watchtower_image_name": "docker.io/perconalab/watchtower:dev-latest"
+    "pmm_server_image_name": "docker.io/perconalab/pmm-server:3-dev-latest"
   },
   "builders": [
     {
@@ -93,7 +92,7 @@
         "-vvv",
         "-u root",
         "--extra-vars",
-        "\"pmm_server_image_name='{{ user `pmm_server_image_name` }}' watchtower_image_name='{{ user `watchtower_image_name` }}'\""
+        "\"pmm_server_image_name='{{ user `pmm_server_image_name` }}'\""
       ],
       "role_paths": [
         "packer/ansible/roles/lvm-init",

docker-compose.dev.yml

@@ -68,20 +68,6 @@ services:
     ports:
       - ${PMM_PORT_RENDERER:-8081}:8081
 
-  watchtower:
-    profiles:
-      - watchtower
-    image: ${WATCHTOWER_IMAGE:-perconalab/watchtower}
-    container_name: watchtower
-    hostname: watchtower
-    environment:
-      - WATCHTOWER_HTTP_LISTEN_PORT
-      - WATCHTOWER_HTTP_API_UPDATE
-      - WATCHTOWER_HTTP_API_TOKEN=${PMM_WATCHTOWER_TOKEN}
-      - WATCHTOWER_NO_RESTART
-    volumes:
-      - ${WATCHTOWER_DOCKER_PATH:-/var/run/docker.sock}:/var/run/docker.sock
-
 volumes:
   go-modules:
     name: go-modules

get-pmm.sh

@@ -20,7 +20,6 @@ repo=${PMM_REPO:-percona/pmm-server}
 port=${PMM_PORT:-443}
 container_name=${CONTAINER_NAME:-pmm-server}
 docker_socket_path=${DOCKER_SOCKET_PATH:-/var/run/docker.sock}
-watchtower_token=${WATCHTOWER_TOKEN:-}
 volume_name=${VOLUME_NAME:-pmm-data}
 backup_data=0
 interactive=0
@@ -57,9 +56,6 @@ Available options:
 -b, --backup
       Backup data from existing PMM Server instance
 
--wt, --watchtower-token
-      Watchtower token to use for PMM Server updates
-
 -dsp, --docker-socket-path
       Path to docker socket (default: /var/run/docker.sock)
 
@@ -140,10 +136,6 @@ parse_params() {
       shift
       ;;
     -b | --backup) backup_data=1 ;;
-    -wt | --watchtower-token)
-      watchtower_token="${2-}"
-      shift
-      ;;
     -dsp | --docker-socket-path)
       docker_socket_path="${2-}"
       shift
@@ -261,30 +253,6 @@ run_docker() {
   fi
 }
 
-#######################################
-# Generates Watchtower token if needed, or reuses existing one.
-#######################################
-generate_watchtower_token() {
-  if [ !  "$watchtower_token" == "" ]; then
-    msg "Using provided Watchtower token"
-    return 0
-  fi
-  if run_docker "inspect watchtower 1> /dev/null 2> /dev/null"; then
-    watchtower_token=$(run_docker "inspect --format='{{range .Config.Env}}{{println .}}{{end}}' watchtower | grep WATCHTOWER_HTTP_API_TOKEN | cut -d'=' -f2")
-    msg "Found Watchtower Token: $watchtower_token"
-    return 0
-  fi
-  if run_docker "inspect pmm-server 1> /dev/null 2> /dev/null"; then
-    watchtower_token=$(run_docker "inspect --format='{{range .Config.Env}}{{println .}}{{end}}' pmm-server | grep PMM_WATCHTOWER_TOKEN | cut -d'=' -f2")
-    msg "Found Watchtower Token: $watchtower_token"
-    # we don't return here, as we want to generate a new token if it's not found
-  fi
-  if [ "$watchtower_token" == "" ]; then
-    watchtower_token=random-$(date "+%F-%H%M%S")
-    msg "Generated Watchtower Token: $watchtower_token"
-  fi
-}
-
 #######################################
 # Creates PMM Network if needed.
 #######################################
@@ -295,16 +263,6 @@ create_pmm_network() {
   fi
 }
 
-#######################################
-# Starts Watchtower container if needed.
-#######################################
-start_watchtower() {
-  if ! run_docker "inspect watchtower 1> /dev/null 2> /dev/null"; then
-    run_docker "run -d --name watchtower --restart always --network $network_name -e WATCHTOWER_HTTP_API_TOKEN=$watchtower_token -e WATCHTOWER_HTTP_LISTEN_PORT=8080 -e WATCHTOWER_HTTP_API_UPDATE=1 -v $docker_socket_path:/var/run/docker.sock percona/watchtower --cleanup"
-    msg "Created Watchtower container"
-  fi
-}
-
 #######################################
 # Migrates PMM Server data from 2.x to 3.x
 #######################################
@@ -464,7 +422,7 @@ start_pmm() {
   msg "Pulling $repo:$tag"
   run_docker "pull $repo:$tag 1> /dev/null"
 
-  docker_env_flags="-e PMM_WATCHTOWER_HOST=http://watchtower:8080 -e PMM_WATCHTOWER_TOKEN=$watchtower_token "
+  docker_env_flags=""
   if run_docker "inspect $container_name 1> /dev/null 2> /dev/null"; then
     pmm_archive="$container_name-$(date "+%F-%H%M%S")"
     msg "\tExisting PMM Server found, renaming to $pmm_archive\n"
@@ -532,9 +490,7 @@ main() {
   msg "Gathering/downloading required components, this may take a moment\n"
   install_docker
   create_pmm_network
-  generate_watchtower_token
   start_pmm
-  start_watchtower
   show_message
 }
 

ui/apps/pmm/src/pages/updates/update-card/UpdateCard.constants.ts

@@ -1,7 +1 @@
-export const DEPRECATION_DOCKER_UPGRADE_HREF =
-  'https://per.co.na/pmm/upgrade-docker';
-
-export const DEPRECATION_PODMAN_UPGRADE_HREF =
-  'https://per.co.na/pmm/upgrade-podman';
-export const DEPRECATION_HELM_UPGRADE_HREF =
-  'https://per.co.na/pmm/upgrade-helm';
+export const UPGRADE_DOCS_HREF = 'https://docs.percona.com/percona-monitoring-and-management/3/pmm-upgrade/index.html';

ui/apps/pmm/src/pages/updates/update-card/UpdateCard.messages.ts

@@ -9,7 +9,7 @@ export const Messages = {
   home: 'PMM home',
   checkNow: 'Check updates now',
   checking: 'Checking',
-  updateNow: 'Update now',
+  howToUpdateDocs: 'How to update docs',
   error: 'There was a problem during the update',
 
   deprecation: {