Merge branch 'PMM-9374-external-victoria-metrics' into PMM-12078-HA-P…

…hase-3-Active-Active-PoC

.github/workflows/admin.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4
@@ -95,7 +95,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4

.github/workflows/agent.yml

@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4

.github/workflows/clean.yml

@@ -52,7 +52,7 @@ jobs:
           echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
           echo "$HOME/gotip/bin" >> $GITHUB_PATH
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: true
 

.github/workflows/dependabot.yml

@@ -0,0 +1,24 @@
+name: Dependabot
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    name: Enable auto-merge
+    runs-on: ubuntu-20.04
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/devcontainer.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
 

.github/workflows/doc.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: API
         uses: readmeio/rdme@v8

.github/workflows/dockerhub-readme.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: Production
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Update Docker Hub Readme for perconalab/pmm-server
         uses: peter-evans/dockerhub-description@v3

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4

.github/workflows/managed.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Enable Go build cache
         if: ${{ fromJSON(env.DEVCONTAINER_CACHE_ENABLED) }}

.github/workflows/qan-api2.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4

.github/workflows/sbom.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create SBOM for PMM
         uses: anchore/sbom-action@v0
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create SBOM for vmproxy
         uses: anchore/sbom-action@v0

.github/workflows/update.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker Up
         run: docker compose up -d

.github/workflows/vmproxy.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go release
         uses: actions/setup-go@v4

.golangci.yml

@@ -29,7 +29,7 @@ linters-settings:
 
   godot:
     capital: true
-    period: false
+    period: true
     scope: toplevel
     exclude:
       - go-sumtype:decl 

Dockerfile

@@ -1,6 +1,6 @@
 # This Dockerfile is used only for API tests.
 
-FROM golang:1.20
+FROM golang:1.21
 
 RUN export GOPATH=$(go env GOPATH) && \
     mkdir -p $GOPATH/src/github.com/percona/pmm

admin/cli/cli.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package cli stores cli configuration and common logic for commands
+// Package cli stores cli configuration and common logic for commands.
 package cli
 
 import (

admin/cli/flags/global.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package flags holds global flags
+// Package flags holds global flags.
 package flags
 
 import (

admin/cmd/bootstrap.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package cmd holds common logic used by commands
+// Package cmd holds common logic used by commands.
 package cmd
 
 import (

admin/commands/base/setup.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package base provides helpers for all commands
+// Package base provides helpers for all commands.
 package base
 
 import (

admin/commands/inventory/inventory.go

@@ -23,9 +23,9 @@ import (
 
 // InventoryCommand is used by Kong for CLI flags and commands.
 type InventoryCommand struct {
-	List   ListCommand   `cmd:"" hidden:"" help:"List inventory commands"`
-	Add    AddCommand    `cmd:"" hidden:"" help:"Add to inventory commands"`
-	Remove RemoveCommand `cmd:"" hidden:"" help:"Remove from inventory commands"`
+	List   ListCommand   `cmd:"" help:"List inventory commands"`
+	Add    AddCommand    `cmd:"" help:"Add to inventory commands"`
+	Remove RemoveCommand `cmd:"" help:"Remove from inventory commands"`
 }
 
 // ListCommand is used by Kong for CLI flags and commands.
@@ -105,3 +105,6 @@ func formatTypeValue(acceptableTypeValues map[string][]string, input string) (*s
 	}
 	return nil, errors.Errorf("unexpected type value %q", input)
 }
+
+// RunCmd is a stub that allows to display the InventoryCommand's help.
+func (cmd *InventoryCommand) RunCmd() {}

admin/commands/pmm/client/base.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package client holds the "pmm client" command
+// Package client holds the "pmm client" command.
 package client
 
 import "github.com/percona/pmm/admin/commands"

admin/commands/pmm/server/base.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package server holds the "pmm server" command
+// Package server holds the "pmm server" command.
 package server
 
 import (

admin/commands/pmm/server/docker/base.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package docker holds the "pmm server install docker" command
+// Package docker holds the "pmm server install docker" command.
 package docker
 
 import (

admin/commands/pmm/server/docker/base_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package docker holds the "pmm server install docker" command
+// Package docker holds the "pmm server install docker" command.
 package docker
 
 import (

admin/commands/summary.go

@@ -254,7 +254,7 @@ func getURL(ctx context.Context, url string) ([]byte, error) {
 	return b, nil
 }
 
-// downloadFile download file and includes into zip file
+// downloadFile download file and includes into zip file.
 func downloadFile(ctx context.Context, zipW *zip.Writer, url, fileName string) error {
 	b, err := getURL(ctx, url)
 	if err != nil {

admin/pkg/bubbles/progress/size.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package progress contains progress bar programs to be rendered with BubbleTea
+// Package progress contains progress bar programs to be rendered with BubbleTea.
 package progress
 
 import (

admin/pkg/bubbles/styles/styles.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package styles holds common styles for BubbleTea programs
+// Package styles holds common styles for BubbleTea programs.
 package styles
 
 import "github.com/charmbracelet/lipgloss"

admin/pkg/client/client.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package client provides common methods for working with pmm-client
+// Package client provides common methods for working with pmm-client.
 package client
 
 import (

admin/pkg/client/tarball/tarball.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package tarball holds logic for pmm-client tarball specific operations
+// Package tarball holds logic for pmm-client tarball specific operations.
 package tarball
 
 import (

admin/pkg/common/common.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package common holds common methods used in admin
+// Package common holds common methods used in admin.
 package common
 
 import (

admin/pkg/docker/docker.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package docker stores common functions for working with Docker
+// Package docker stores common functions for working with Docker.
 package docker
 
 import (

agent/README.md

@@ -4,7 +4,7 @@ pmm-agent for PMM 2.x.
 
 # Contributing notes
 
-## Pre-requirements:
+## Pre-requisites:
 git, make, curl, go, gcc, docker, docker-compose, pmm-server
 
 ## Local setup

agent/agentlocal/agent_local.go

@@ -349,7 +349,7 @@ var (
 	_ agentlocalpb.AgentLocalServer = (*Server)(nil)
 )
 
-// addData add data to zip file
+// addData add data to zip file.
 func addData(zipW *zip.Writer, name string, data []byte) error {
 	f, err := zipW.Create(name)
 	if err != nil {

agent/agents/cache/cache.go

@@ -47,7 +47,7 @@ type Cache struct {
 	trimmedN  uint
 }
 
-// cacheItem is an element stored in Cache
+// cacheItem is an element stored in Cache.
 type cacheItem struct {
 	key   interface{}
 	value interface{}

agent/agents/mongodb/mongodb.go

@@ -119,7 +119,7 @@ func (m *MongoDB) Collect(ch chan<- prometheus.Metric) {
 	// This method is needed to satisfy interface.
 }
 
-// check interfaces
+// check interfaces.
 var (
 	_ prometheus.Collector = (*MongoDB)(nil)
 )

agent/agents/mysql/perfschema/history.go

@@ -25,7 +25,7 @@ import (
 	"github.com/percona/pmm/agent/agents/cache"
 )
 
-// historyCache is a wrapper for cache.Cache to use only with historyMap type
+// historyCache is a wrapper for cache.Cache to use only with historyMap type.
 type historyCache struct {
 	cache *cache.Cache
 }