Fixed merge conflicts and changelog

Update Changelog
Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>
2025-09-02 10:36:28 +00:00 · 2022-04-20 09:40:38 -03:00 · 2022-04-20 09:16:24 -03:00 · 2022-04-20 09:16:06 -03:00 · 2022-04-20 09:01:16 -03:00 · 2022-04-20 09:01:03 -03:00
53 changed files with 110 additions and 94 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ Makefile.old
 bin/pt-mongodb-*
 bin/pt-secure-*
 bin/pt-pg-*
+bin/pt-k8s-debug-collector
 !src/go/pt-mongodb-query-digest/vendor/vendor.json
 !src/go/pt-mongodb-summary/vendor/vendor.json
 src/go/pt-mongodb-query-digest/vendor/
@@ -25,4 +26,4 @@ config/deb/control.bak
 config/rpm/percona-toolkit.spec.bak
 config/sphinx-build/percona-theme/*
 coverage.out
-.idea
+.idea
--- a/21
+++ b/21
@@ -1,21 +1,28 @@
 Changelog for Percona Toolkit

-v3.3.2 WIP release date not set yet
+v3.4.0

+ * Fixed bug   PT-1218: pt-stalk ominous open_tables function
+ * Fixed bug   PT-1336: pt-stalk removes user's files from the destination directory
+ * Fixed bug   PT-1398: pt-stalk gets the incorrect mysqld pid when the host installed a multi MySQL instance
 * Improvement PT-1417: Inconsistent creation of toolkit tables
 * Fixed bug   PT-1627:	pt-mysql-summary doesn't verify which version of jemalloc is in use
 * Fixed bug   PT-1747: pt-online-schema-change: metadata lock can break database for rebuild_constraints
- * Improvement PT-1800: PTDEBUG=1 exposes passwords
- * Fixed bug   PT-1900:	pt-query-digest not hiding parameter properly sometimes when parameter=binary
- * Improvement PT-1940:	ptsoc dropswap with mysql8: revise rejection (Thanks duxthefux)
+ * Improvement PT-1800: The environment variable PTDEBUG=1 exposes the passwords
+ * Improvement PT-1887: pt-diskstat is not working for new kernels
+ * Fixed bug   PT-1900: At times, pt-query-digest does not hide the parameters properly when parameter=binary
+ * Improvement PT-1940:	ptsoc dropswap method that was rejected for Mysql 8 has been fixed with Mysql 8.0.14
 * Fixed bug   PT-1953: pt-summary typo: Memory mamagement.
 * Fixed bug   PT-1959: go part of the toolkit still has the version 3.3.0
- * Fixed bug   PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin outputs (Thanks Sergey Kuzmichev)
+ * Fixed bug   PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin output (Thanks Sergey Kuzmichev)
 * Fixed bug   PT-1966: Test no_drop_no_swap for the pt-online-schema-change is broken (Thanks Tsubasa Tanaka)
 * Fixed bug   PT-1974: Support fingerprinting for --print in pt-kill
+ * New Tool    PT-1978: Add reporting on unused/redundant indexes for MongoDB by pt-mongodb-summary
+ * Improvement PT-1979: Add gathering of admin parameters for MongoDB by pt-mongodb-summary
 * Fixed bug   PT-1983:	pt-summary missing one DIMM	
- * Admin task  PT-2009: Update Go Lang dependencies
- * Admin task  PT-2011:	Make build reproducible
+ * Fixed bug   PT-2016: pt-table-checksum fails to build replace query when table lacks primary key
+ * Fixed bug   PT-2023: pt-upgrade Error: Wide character in print
+ * Improvement PT-2037: Add option --skip-mysql or --system-only for pt-stalk

 v3.3.1 release 2021-04-28 

--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;

 WriteMakefile(
    NAME      => 'percona-toolkit',
-    VERSION   => '3.3.1',
+    VERSION   => '3.4.0',
    EXE_FILES => [ <bin/*> ],
    MAN1PODS  => {
      'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -1364,6 +1364,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-align 3.3.2
+pt-align 3.4.0

 =cut
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -8661,6 +8661,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-archiver 3.3.2
+pt-archiver 3.4.0

 =cut
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -5917,6 +5917,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-config-diff 3.3.2
+pt-config-diff 3.4.0

 =cut
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -5710,6 +5710,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-deadlock-logger 3.3.2
+pt-deadlock-logger 3.4.0

 =cut
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -5684,6 +5684,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-diskstats 3.3.2
+pt-diskstats 3.4.0

 =cut
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -5771,6 +5771,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-duplicate-key-checker 3.3.2
+pt-duplicate-key-checker 3.4.0

 =cut
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -1653,6 +1653,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fifo-split 3.3.2
+pt-fifo-split 3.4.0

 =cut
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -5132,6 +5132,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-find 3.3.2
+pt-find 3.4.0

 =cut
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -2262,6 +2262,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fingerprint 3.3.2
+pt-fingerprint 3.4.0

 =cut
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -4693,6 +4693,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fk-error-logger 3.3.2
+pt-fk-error-logger 3.4.0

 =cut
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -7394,6 +7394,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-heartbeat 3.3.2
+pt-heartbeat 3.4.0

 =cut
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -7705,6 +7705,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-index-usage 3.3.2
+pt-index-usage 3.4.0

 =cut
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -1132,7 +1132,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-ioprofile 3.3.2
+pt-ioprofile 3.4.0

 =cut

--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -8576,6 +8576,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-kill 3.3.2
+pt-kill 3.4.0

 =cut
--- a/bin/pt-mext
+++ b/bin/pt-mext
@@ -809,7 +809,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mext 3.3.2
+pt-mext 3.4.0

 =cut

--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -3296,7 +3296,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mysql-summary 3.3.2
+pt-mysql-summary 3.4.0

 =cut

--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -13469,6 +13469,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-online-schema-change 3.3.2
+pt-online-schema-change 3.4.0

 =cut
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -901,7 +901,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-pmp 3.3.2
+pt-pmp 3.4.0

 =cut

--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -16977,6 +16977,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-query-digest 3.3.2
+pt-query-digest 3.4.0

 =cut
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2618,6 +2618,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-show-grants 3.3.2
+pt-show-grants 3.4.0

 =cut
--- a/bin/pt-sift
+++ b/bin/pt-sift
@@ -1250,7 +1250,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-sift 3.3.2
+pt-sift 3.4.0

 =cut

--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -4993,6 +4993,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-delay 3.3.2
+pt-slave-delay 3.4.0

 =cut
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -4528,6 +4528,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-find 3.3.2
+pt-slave-find 3.4.0

 =cut
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -6164,6 +6164,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-restart 3.3.2
+pt-slave-restart 3.4.0

 =cut
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -2486,7 +2486,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-stalk 3.3.2
+pt-stalk 3.4.0

 =cut

--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -2729,7 +2729,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-summary 3.3.2
+pt-summary 3.4.0

 =cut

--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -14188,6 +14188,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-checksum 3.3.2
+pt-table-checksum 3.4.0

 =cut
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -13101,6 +13101,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-sync 3.3.2
+pt-table-sync 3.4.0

 =cut
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -8519,6 +8519,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-usage 3.3.2
+pt-table-usage 3.4.0

 =cut
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11454,6 +11454,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-upgrade 3.3.2
+pt-upgrade 3.4.0

 =cut
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -6262,6 +6262,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-variable-advisor 3.3.2
+pt-variable-advisor 3.4.0

 =cut
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -3308,6 +3308,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-visual-explain 3.3.2
+pt-visual-explain 3.4.0

 =cut
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -48,9 +48,9 @@ copyright = u'2021, Percona LLC and/or its affiliates'
 # built documents.
 #
 # The short X.Y version.
-version = '3.3'
+version = '3.4'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.1'
+release = '3.4.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -567,6 +567,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-Percona Toolkit v3.3.1 released 2021-04-22
+Percona Toolkit v3.4.0 released 2022-04-05

 =cut
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/Masterminds/semver v1.4.2
 	github.com/alecthomas/kingpin v2.2.6+incompatible
+	github.com/alecthomas/kong v0.5.0
 	github.com/go-ini/ini v1.66.4
 	github.com/golang/mock v1.4.4
 	github.com/google/uuid v1.3.0
--- a/lib/Percona/Toolkit.pm
+++ b/lib/Percona/Toolkit.pm
@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;

-our $VERSION = '3.3.2';
+our $VERSION = '3.4.0';

 use strict;
 use warnings FATAL => 'all';
--- a/src/go/mongolib/proto/collstats.go
+++ b/src/go/mongolib/proto/collstats.go
@@ -1,22 +1,21 @@
 package proto

 type ShardStas struct {
-	Ns                string `json:"ns"`
-	Count             int64  `json:"count"`
-	Size              int64  `json:"size"`
-	AvgObjSize        int64  `json:"avgObjSize"`
-	NumExtents        int64  `json:"numExtents"`
-	StorageSize       int64  `json:"storageSize"`
-	LastExtentSize    int64  `json:"lastExtentSize"`
-	PaddingFactor     int64  `json:"paddingFactor"`
-	PaddingFactorNote string `json:"paddingFactorNote"`
-	UserFlags         int64  `json:"userFlags"`
-	Capped            bool   `json:"capped"`
-	Nindexes          int64  `json:"nindexes"`
-	IndexDetails      struct {
-	} `json:"indexDetails"`
-	TotalIndexSize int64 `json:"totalIndexSize"`
-	IndexSizes     struct {
+	Ns                string   `json:"ns"`
+	Count             int64    `json:"count"`
+	Size              int64    `json:"size"`
+	AvgObjSize        int64    `json:"avgObjSize"`
+	NumExtents        int64    `json:"numExtents"`
+	StorageSize       int64    `json:"storageSize"`
+	LastExtentSize    int64    `json:"lastExtentSize"`
+	PaddingFactor     int64    `json:"paddingFactor"`
+	PaddingFactorNote string   `json:"paddingFactorNote"`
+	UserFlags         int64    `json:"userFlags"`
+	Capped            bool     `json:"capped"`
+	Nindexes          int64    `json:"nindexes"`
+	IndexDetails      struct{} `json:"indexDetails"`
+	TotalIndexSize    int64    `json:"totalIndexSize"`
+	IndexSizes        struct {
 		ID       int64 `json:"_id_"`
 		IDHashed int64 `json:"_id_hashed"`
 	} `json:"indexSizes"`
--- a/src/go/pt-k8s-debug-collector/dumper/dumper.go
+++ b/src/go/pt-k8s-debug-collector/dumper/dumper.go
@@ -72,7 +72,7 @@ func New(location, namespace, resource string) Dumper {
 		cmd:       "kubectl",
 		resources: resources,
 		location:  "cluster-dump",
-		mode:      int64(0777),
+		mode:      int64(0o777),
 		namespace: namespace,
 		crType:    resource,
 	}
--- a/src/go/pt-mongodb-index-check/indexes/duplicated_test.go
+++ b/src/go/pt-mongodb-index-check/indexes/duplicated_test.go
@@ -7,12 +7,13 @@ import (
 	"time"

 	"github.com/AlekSi/pointer"
-	tu "github.com/percona/percona-toolkit/src/go/internal/testutils"
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"gopkg.in/mgo.v2/bson"
+
+	tu "github.com/percona/percona-toolkit/src/go/internal/testutils"
 )

 func TestDuplicateIndexes(t *testing.T) {
--- a/src/go/pt-mongodb-index-check/indexes/unused_test.go
+++ b/src/go/pt-mongodb-index-check/indexes/unused_test.go
@@ -9,12 +9,13 @@ import (
 	"time"

 	"github.com/AlekSi/pointer"
-	tu "github.com/percona/percona-toolkit/src/go/internal/testutils"
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"gopkg.in/mgo.v2/bson"
+
+	tu "github.com/percona/percona-toolkit/src/go/internal/testutils"
 )

 func TestUnusedIndexes(t *testing.T) {
--- a/src/go/pt-mongodb-index-check/main.go
+++ b/src/go/pt-mongodb-index-check/main.go
@@ -11,14 +11,13 @@ import (

 	"github.com/alecthomas/kong"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"

 	"github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/indexes"
 	"github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/templates"
-
-	log "github.com/sirupsen/logrus"
 )

 type cmdlineArgs struct {
--- a/src/go/pt-mongodb-query-digest/main.go
+++ b/src/go/pt-mongodb-query-digest/main.go
@@ -13,6 +13,11 @@ import (

 	"github.com/howeyc/gopass"
 	"github.com/pborman/getopt"
+	log "github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+
 	"github.com/percona/percona-toolkit/src/go/lib/config"
 	"github.com/percona/percona-toolkit/src/go/lib/versioncheck"
 	"github.com/percona/percona-toolkit/src/go/mongolib/fingerprinter"
@@ -21,10 +26,6 @@ import (
 	"github.com/percona/percona-toolkit/src/go/mongolib/stats"
 	"github.com/percona/percona-toolkit/src/go/mongolib/util"
 	"github.com/percona/percona-toolkit/src/go/pt-mongodb-query-digest/filter"
-	log "github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 )

 const (
@@ -40,7 +41,7 @@ const (
 var (
 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.3.2"      //nolint
+	Version   string = "3.4.0"      //nolint
 	Commit    string                //nolint
 )

--- a/src/go/pt-mongodb-summary/main.go
+++ b/src/go/pt-mongodb-summary/main.go
@@ -19,18 +19,19 @@ import (
 	version "github.com/hashicorp/go-version"
 	"github.com/howeyc/gopass"
 	"github.com/pborman/getopt"
-	"github.com/percona/percona-toolkit/src/go/lib/config"
-	"github.com/percona/percona-toolkit/src/go/lib/versioncheck"
-	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
-	"github.com/percona/percona-toolkit/src/go/mongolib/util"
-	"github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/oplog"
-	"github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/templates"
 	"github.com/pkg/errors"
 	"github.com/shirou/gopsutil/process"
 	log "github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
+
+	"github.com/percona/percona-toolkit/src/go/lib/config"
+	"github.com/percona/percona-toolkit/src/go/lib/versioncheck"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/mongolib/util"
+	"github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/oplog"
+	"github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/templates"
 )

 const (
@@ -56,7 +57,7 @@ const (
 var (
 	Build     string = "2020-04-23"
 	GoVersion string = "1.14.1"
-	Version   string = "3.3.2"
+	Version   string = "3.4.0"
 	Commit    string

 	defaultConnectionTimeout = 3 * time.Second
@@ -615,7 +616,8 @@ func getNodeType(ctx context.Context, client *mongo.Client) (string, error) {
 }

 func getOpCountersStats(ctx context.Context, client *mongo.Client, count int,
-	sleep time.Duration) (*opCounters, error) {
+	sleep time.Duration,
+) (*opCounters, error) {
 	oc := &opCounters{}
 	prevOpCount := &opCounters{}
 	ss := proto.ServerStatus{}
--- a/src/go/pt-mongodb-summary/main_test.go
+++ b/src/go/pt-mongodb-summary/main_test.go
@@ -8,6 +8,7 @@ import (
 	"time"

 	"github.com/pborman/getopt"
+
 	tu "github.com/percona/percona-toolkit/src/go/internal/testutils"
 	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 )
--- a/src/go/pt-mongodb-summary/oplog/oplog.go
+++ b/src/go/pt-mongodb-summary/oplog/oplog.go
@@ -6,12 +6,13 @@ import (
 	"sort"
 	"time"

-	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
-	"github.com/percona/percona-toolkit/src/go/mongolib/util"
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
+
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/mongolib/util"
 )

 func GetOplogInfo(ctx context.Context, hostnames []string, co *options.ClientOptions) ([]proto.OplogInfo, error) {
--- a/src/go/pt-pg-summary/main.go
+++ b/src/go/pt-pg-summary/main.go
@@ -8,20 +8,20 @@ import (
 	"text/template"

 	"github.com/alecthomas/kingpin"
+	_ "github.com/lib/pq"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
+
 	"github.com/percona/percona-toolkit/src/go/lib/pginfo"
 	"github.com/percona/percona-toolkit/src/go/pt-pg-summary/templates"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
-
-	_ "github.com/lib/pq"
 )

 var (
 	Build     string = "2020-04-23" //nolint
 	Commit    string                //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.3.1"      //nolint
+	Version   string = "3.4.0"      //nolint
 )

 type connOpts struct {
--- a/src/go/pt-pg-summary/main_test.go
+++ b/src/go/pt-pg-summary/main_test.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"testing"

+	"github.com/sirupsen/logrus"
+
 	"github.com/percona/percona-toolkit/src/go/lib/pginfo"
 	"github.com/percona/percona-toolkit/src/go/pt-pg-summary/internal/tu"
-
-	"github.com/sirupsen/logrus"
 )

 type Test struct {
--- a/src/go/pt-secure-collect/collect.go
+++ b/src/go/pt-secure-collect/collect.go
@@ -16,10 +16,11 @@ import (
 	"time"

 	shellwords "github.com/mattn/go-shellwords"
-	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize"
-	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize"
+	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util"
 )

 func collectData(opts *cliOptions) error {
--- a/src/go/pt-secure-collect/main.go
+++ b/src/go/pt-secure-collect/main.go
@@ -15,8 +15,8 @@ import (
 	"github.com/alecthomas/kingpin"
 	"github.com/go-ini/ini"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
 )

@@ -86,7 +86,7 @@ var (

 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.3.1"      //nolint
+	Version   string = "3.4.0"      //nolint
 	Commit    string                //nolint
 )

--- a/src/go/pt-secure-collect/sanitize.go
+++ b/src/go/pt-secure-collect/sanitize.go
@@ -3,9 +3,10 @@ package main
 import (
 	"os"

+	"github.com/pkg/errors"
+
 	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize"
 	"github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util"
-	"github.com/pkg/errors"
 )

 func sanitizeFile(opts *cliOptions) error {
Author	SHA1	Message	Date
Carlos Salguero	b8a28a2150	Fixed merge conflicts and changelog	2022-04-20 09:40:38 -03:00
Carlos Salguero	f78e75d391	Update Changelog Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>	2022-04-20 09:16:24 -03:00
Carlos Salguero	d63e16f7d4	Update Changelog Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>	2022-04-20 09:16:06 -03:00
Carlos Salguero	cae3c7be0a	Update Changelog Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>	2022-04-20 09:01:16 -03:00
Carlos Salguero	d4dec7599b	Update Changelog Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>	2022-04-20 09:01:03 -03:00
Carlos Salguero	5cdb98b487	Update Changelog Co-authored-by: rasika-chivate <95711051+rasika-chivate@users.noreply.github.com>	2022-04-20 09:00:47 -03:00
Carlos Salguero	89f60d4a94	Updated changelog	2022-04-06 14:40:53 -03:00
Carlos Salguero	42bd1ed9d5	Updated version in all programs	2022-04-05 13:05:53 -03:00
Carlos Salguero	ed6ce6b50a	Updated Changelog	2022-04-05 12:58:30 -03:00
Carlos Salguero	a490203471	Merge branch 'PT-1978_mdb_summary_index' into release-3.4.0	2022-04-05 12:49:41 -03:00
Carlos Salguero	670e1159bf	Added system.profile to the ingored dbs	2022-04-05 12:46:06 -03:00
Carlos Salguero	3243008c59	Merge branch 'PT-1978_mdb_summary_index' into release-3.4.0	2022-04-05 12:42:23 -03:00
Carlos Salguero	9837bbdd2e	Updated required params	2022-04-05 12:42:06 -03:00
Carlos Salguero	eaa95fd0e5	Added changelog	2022-04-05 12:20:08 -03:00
Carlos Salguero	957451a707	Merge branch 'PT-1978_mdb_summary_index' into release-3.4.0	2022-04-05 12:01:56 -03:00
Carlos Salguero	e5cb95130d	Added version command	2022-04-05 12:01:33 -03:00
Carlos Salguero	70fd5a71b2	Removed unused file	2022-04-05 10:18:16 -03:00
Carlos Salguero	c669972622	Updated Go sources	2022-04-05 10:17:29 -03:00
Carlos Salguero	9c00264e24	Merge branch 'PT-1979_mdb_summary_cmdline_opts' into release-3.4.0	2022-04-05 09:47:47 -03:00
Carlos Salguero	2cb94372d5	Merge branch 'PT-1978_mdb_summary_index' into release-3.4.0	2022-04-05 09:47:23 -03:00
Carlos Salguero	0bb5d6b6fb	Upgraded version and dependencies	2022-04-05 09:46:46 -03:00
Carlos Salguero	102a3dd838	PT-1978 New tool pt-mongodb-check-index	2022-04-04 14:38:35 -03:00
Carlos Salguero	10fbe64649	PT-1978 WIP	2022-04-02 19:39:35 -03:00
Carlos Salguero	8a4acd6201	WIP	2022-03-30 15:57:50 -03:00
Carlos Salguero	a5fe94e4af	PT-1978 Implemented duplicated indexes detection	2022-03-29 15:27:55 -03:00
Carlos Salguero	a556d09895	Added new template file	2022-03-28 13:19:16 -03:00
Carlos Salguero	0d39dd1e3d	PT-1979 Improved mdb summary information Added the MongoDB instance command line options to the output. Also fixed the spacing in the replicaset section.	2022-03-28 12:35:19 -03:00