Skip to content

Commit

Permalink
Merge branch 'main' into PMM-9769-update-all-components
Browse files Browse the repository at this point in the history
  • Loading branch information
talhabinrizwan authored Sep 5, 2023
2 parents e29e9ed + cdc9335 commit cbf8d95
Show file tree
Hide file tree
Showing 141 changed files with 587 additions and 893 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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}}
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qan-api2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sbom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vmproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ linters-settings:

godot:
capital: true
period: false
period: true
scope: toplevel
exclude:
- go-sumtype:decl
Expand Down
2 changes: 1 addition & 1 deletion admin/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/cli/flags/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/cmd/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/base/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/pmm/client/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/pmm/server/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/pmm/server/docker/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/pmm/server/docker/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/commands/summary.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/bubbles/progress/size.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/bubbles/styles/styles.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/client/tarball/tarball.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion admin/pkg/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion agent/agentlocal/agent_local.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion agent/agents/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion agent/agents/mongodb/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
2 changes: 1 addition & 1 deletion agent/agents/mysql/perfschema/history.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions agent/agents/mysql/perfschema/perfschema.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type (
summaryMap map[string]*eventsStatementsSummaryByDigest
)

// mySQLVersion contains
// mySQLVersion contains.
type mySQLVersion struct {
version float64
vendor string
Expand Down Expand Up @@ -107,7 +107,7 @@ type Params struct {
TLSSkipVerify bool
}

// newPerfSchemaParams holds all required parameters to instantiate a new PerfSchema
// newPerfSchemaParams holds all required parameters to instantiate a new PerfSchema.
type newPerfSchemaParams struct {
Querier *reform.Querier
DBCloser io.Closer
Expand Down Expand Up @@ -520,7 +520,7 @@ func (m *PerfSchema) Collect(ch chan<- prometheus.Metric) {
}
}

// check interfaces
// check interfaces.
var (
_ prometheus.Collector = (*PerfSchema)(nil)
)
2 changes: 1 addition & 1 deletion agent/agents/mysql/perfschema/summaries.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/percona/pmm/agent/agents/cache"
)

// summaryCache is a wrapper for cache.Cache to use only with summaryMap type
// summaryCache is a wrapper for cache.Cache to use only with summaryMap type.
type summaryCache struct {
cache *cache.Cache
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func (r *ContinuousFileReader) Metrics() *ReaderMetrics {
return &m
}

// check interfaces
// check interfaces.
var (
_ Reader = (*ContinuousFileReader)(nil)
)
2 changes: 1 addition & 1 deletion agent/agents/mysql/slowlog/parser/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ func (tl *testLogger) Tracef(format string, v ...interface{}) {
tl.t.Logf("TRACE: "+format, v...)
}

// check interface
// check interface.
var _ Logger = (*testLogger)(nil)
2 changes: 1 addition & 1 deletion agent/agents/mysql/slowlog/parser/simple_file_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (r *SimpleFileReader) Metrics() *ReaderMetrics {
return &m
}

// check interfaces
// check interfaces.
var (
_ Reader = (*SimpleFileReader)(nil)
)
Loading

0 comments on commit cbf8d95

Please sign in to comment.