PMM-12762 Get notified about new version.

api/serverpb/json/serverpb.json

@@ -805,7 +805,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

api/serverpb/server.proto

@@ -79,7 +79,9 @@ message CheckUpdatesResponse {
   google.protobuf.Timestamp last_check = 5;
 }
 
-message StartUpdateRequest {}
+message StartUpdateRequest {
+  string new_image = 1;
+}
 
 message StartUpdateResponse {
   // Authentication token for getting update statuses.

api/swagger/swagger-dev.json

@@ -3649,7 +3649,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

api/swagger/swagger.json

@@ -805,7 +805,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - ENABLE_RBAC=${ENABLE_RBAC:-0}
       - LESS_LOG_NOISE=1
       - PERCONA_TEST_VERSION_SERVICE_URL=${PERCONA_TEST_VERSION_SERVICE_URL}
+      - PMM_WATCHTOWER_HOST=${PMM_WATCHTOWER_HOST:-http://watchtower:8080}
+      - PMM_WATCHTOWER_TOKEN=${PMM_WATCHTOWER_TOKEN:-INSECURE_TOKEN}
       # - PERCONA_TEST_PLATFORM_ADDRESS=https://check.localhost
       # - PERCONA_TEST_PLATFORM_INSECURE=1
       # - PERCONA_TEST_PLATFORM_PUBLIC_KEY=<public key>
@@ -94,6 +96,22 @@ services:
     #     /opt/entrypoint.sh
     #   "
 
+# docker run -v /var/run/docker.sock:/var/run/docker.sock -e WATCHTOWER_HTTP_API_UPDATE=1 -e WATCHTOWER_HTTP_API_TOKEN=123 --hostname=watchtower --network=pmm_default docker.io/bupychuk/watchtower
+  watchtower:
+    profiles:
+      - pmm
+    image: ${WATCHTOWER_IMAGE:-perconalab/watchtower}
+    container_name: watchtower
+    environment:
+        - WATCHTOWER_HTTP_LISTEN_PORT=8080
+        - WATCHTOWER_HTTP_API_UPDATE=1
+        - WATCHTOWER_HTTP_API_TOKEN=${PMM_WATCHTOWER_TOKEN:-INSECURE_TOKEN}
+    hostname: watchtower
+    networks:
+      - ${NETWORK:-default}
+    volumes:
+        - /var/run/docker.sock:${DOCKER_PATH:-/var/run/docker.sock}
+
   # PMM with external DBs
   ch:
     profiles:

managed/cmd/pmm-managed/main.go

@@ -137,7 +137,7 @@ const (
 
 var pprofSemaphore = semaphore.NewWeighted(1)
 
-func addLogsHandler(mux *http.ServeMux, logs *supervisord.Logs) {
+func addLogsHandler(mux *http.ServeMux, logs *server.Logs) {
 	l := logrus.WithField("component", "logs.zip")
 
 	mux.HandleFunc("/logs.zip", func(rw http.ResponseWriter, req *http.Request) {
@@ -147,7 +147,7 @@ func addLogsHandler(mux *http.ServeMux, logs *supervisord.Logs) {
 		if err != nil {
 			l.Debug("Unable to read 'pprof' query param. Using default: pprof=false")
 		}
-		var pprofConfig *supervisord.PprofConfig
+		var pprofConfig *server.PprofConfig
 		if pprofQueryParameter {
 			if !pprofSemaphore.TryAcquire(1) {
 				rw.WriteHeader(http.StatusLocked)
@@ -160,7 +160,7 @@ func addLogsHandler(mux *http.ServeMux, logs *supervisord.Logs) {
 			defer pprofSemaphore.Release(1)
 
 			contextTimeout += pProfProfileDuration + pProfTraceDuration
-			pprofConfig = &supervisord.PprofConfig{
+			pprofConfig = &server.PprofConfig{
 				ProfileDuration: pProfProfileDuration,
 				TraceDuration:   pProfTraceDuration,
 			}
@@ -334,7 +334,7 @@ func runGRPCServer(ctx context.Context, deps *gRPCServerDeps) {
 }
 
 type http1ServerDeps struct {
-	logs       *supervisord.Logs
+	logs       *server.Logs
 	authServer *grafana.AuthServer
 }
 
@@ -723,6 +723,8 @@ func main() { //nolint:cyclop,maintidx
 	clickHouseDatabaseF := kingpin.Flag("clickhouse-name", "Clickhouse database name").Default("pmm").Envar("PERCONA_TEST_PMM_CLICKHOUSE_DATABASE").String()
 	clickhouseAddrF := kingpin.Flag("clickhouse-addr", "Clickhouse database address").Default("127.0.0.1:9000").Envar("PERCONA_TEST_PMM_CLICKHOUSE_ADDR").String()
 
+	watchtowerHostF := kingpin.Flag("watchtower-host", "Watchtower host").Default("http://watchtower:8080").Envar("PMM_WATCHTOWER_HOST").URL()
+
 	kingpin.Parse()
 
 	logger.SetupGlobalLogger()
@@ -873,13 +875,12 @@ func main() { //nolint:cyclop,maintidx
 	connectionCheck := agents.NewConnectionChecker(agentsRegistry)
 	serviceInfoBroker := agents.NewServiceInfoBroker(agentsRegistry)
 
-	pmmUpdateCheck := supervisord.NewPMMUpdateChecker(logrus.WithField("component", "supervisord/pmm-update-checker"))
+	updater := server.NewUpdater(*watchtowerHostF, gRPCMessageMaxSize)
 
-	logs := supervisord.NewLogs(version.FullInfo(), pmmUpdateCheck, vmParams)
+	logs := server.NewLogs(version.FullInfo(), updater, vmParams)
 
 	supervisord := supervisord.New(
 		*supervisordConfigDirF,
-		pmmUpdateCheck,
 		&models.Params{
 			VMParams: vmParams,
 			PGParams: &models.PGParams{
@@ -893,8 +894,7 @@ func main() { //nolint:cyclop,maintidx
 				SSLCertPath: *postgresSSLCertPathF,
 			},
 			HAParams: haParams,
-		},
-		gRPCMessageMaxSize)
+		})
 
 	haService.AddLeaderService(ha.NewStandardService("pmm-agent-runner", func(ctx context.Context) error {
 		return supervisord.StartSupervisedService("pmm-agent")
@@ -981,6 +981,7 @@ func main() { //nolint:cyclop,maintidx
 		AwsInstanceChecker:   awsInstanceChecker,
 		GrafanaClient:        grafanaClient,
 		VMAlertExternalRules: externalRules,
+		Updater:              updater,
 	}
 
 	server, err := server.NewServer(serverParams)

managed/services/server/deps.go

@@ -17,11 +17,11 @@ package server
 
 import (
 	"context"
+	"net/url"
 	"time"
 
 	"github.com/percona/pmm/api/serverpb"
 	"github.com/percona/pmm/managed/models"
-	"github.com/percona/pmm/version"
 )
 
 // healthChecker interface wraps all services that implements the IsReady method to report the
@@ -73,13 +73,13 @@ type vmAlertExternalRules interface {
 // supervisordService is a subset of methods of supervisord.Service used by this package.
 // We use it instead of real type for testing and to avoid dependency cycle.
 type supervisordService interface {
-	InstalledPMMVersion(ctx context.Context) *version.PackageInfo
-	LastCheckUpdatesResult(ctx context.Context) (*version.UpdateCheckResult, time.Time)
-	ForceCheckUpdates(ctx context.Context) error
-
-	StartUpdate() (uint32, error)
-	UpdateRunning() bool
-	UpdateLog(offset uint32) ([]string, uint32, error)
+	//InstalledPMMVersion(ctx context.Context) *version.PackageInfo
+	//LastCheckUpdatesResult(ctx context.Context) (*version.UpdateCheckResult, time.Time)
+	//ForceCheckUpdates(ctx context.Context) error
+	//
+	//StartUpdate() (uint32, error)
+	//UpdateRunning() bool
+	//UpdateLog(offset uint32) ([]string, uint32, error)
 
 	UpdateConfiguration(settings *models.Settings, ssoDetails *models.PerconaSSODetails) error
 }
@@ -108,3 +108,10 @@ type templatesService interface {
 type haService interface {
 	IsLeader() bool
 }
+
+// victoriaMetricsParams is a subset of methods of models.VMParams used by this package.
+// We use it instead of real type to avoid dependency cycle.
+type victoriaMetricsParams interface {
+	ExternalVM() bool
+	URLFor(path string) (*url.URL, error)
+}

managed/services/supervisord/logs.go → managed/services/server/logs.go

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-package supervisord
+package server
 
 import (
 	"archive/zip"
@@ -56,12 +56,12 @@ type fileContent struct {
 // Logs is responsible for interactions with logs.
 type Logs struct {
 	pmmVersion       string
-	pmmUpdateChecker *PMMUpdateChecker
+	pmmUpdateChecker *Updater
 	vmParams         victoriaMetricsParams
 }
 
 // NewLogs creates a new Logs service.
-func NewLogs(pmmVersion string, pmmUpdateChecker *PMMUpdateChecker, vmParams victoriaMetricsParams) *Logs {
+func NewLogs(pmmVersion string, pmmUpdateChecker *Updater, vmParams victoriaMetricsParams) *Logs {
 	return &Logs{
 		pmmVersion:       pmmVersion,
 		pmmUpdateChecker: pmmUpdateChecker,
@@ -204,7 +204,7 @@ func (l *Logs) files(ctx context.Context, pprofConfig *PprofConfig) []fileConten
 	})
 
 	// update checker installed info
-	b, err = json.Marshal(l.pmmUpdateChecker.Installed(ctx))
+	b, err = json.Marshal(l.pmmUpdateChecker.InstalledPMMVersion())
 	files = append(files, fileContent{
 		Name: "installed.json",
 		Data: b,

managed/services/supervisord/logs_test.go → managed/services/server/logs_test.go

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-package supervisord
+package server
 
 import (
 	"archive/zip"
@@ -27,7 +27,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -143,10 +142,10 @@ func TestAddAdminSummary(t *testing.T) {
 }
 
 func TestFiles(t *testing.T) {
-	checker := NewPMMUpdateChecker(logrus.WithField("test", t.Name()))
+	updater := &Updater{}
 	params, err := models.NewVictoriaMetricsParams(models.BasePrometheusConfigPath, models.VMBaseURL)
 	require.NoError(t, err)
-	l := NewLogs("2.4.5", checker, params)
+	l := NewLogs("2.4.5", updater, params)
 	ctx := logger.Set(context.Background(), t.Name())
 
 	files := l.files(ctx, nil)
@@ -184,10 +183,10 @@ func TestFiles(t *testing.T) {
 func TestZip(t *testing.T) {
 	t.Skip("FIXME")
 
-	checker := NewPMMUpdateChecker(logrus.WithField("test", t.Name()))
+	updater := &Updater{}
 	params, err := models.NewVictoriaMetricsParams(models.BasePrometheusConfigPath, models.VMBaseURL)
 	require.NoError(t, err)
-	l := NewLogs("2.4.5", checker, params)
+	l := NewLogs("2.4.5", updater, params)
 	ctx := logger.Set(context.Background(), t.Name())
 
 	var buf bytes.Buffer