Unify names.

Author: arvenil

glide.lock

@@ -20,7 +20,7 @@ import:
   - src/go/mongolib/stats
 - package: github.com/percona/pmgo
 - package: github.com/percona/pmm
-  version: ea154592a8690b95ef8584b9817fc9bfcaf2a88e
+  version: 88b7a3ea548f89aa63c3ec946c5a20db949db715
   subpackages:
   - proto
   - proto/config

glide.yaml

@@ -29,9 +29,9 @@ import (
 var (
 	DefaultInterval          uint  = 60         // 1 minute
 	DefaultMaxSlowLogSize    int64 = 1073741824 // 1G
-	DefaultSlowLogsRotation        = true       // whether to rotate slow logs
+	DefaultSlowLogRotation         = true       // whether to rotate slow logs
 	DefaultRemoveOldSlowLogs       = true       // whether to remove old slow logs after rotation
-	DefaultSlowLogsToKeep          = 1          // how many slow logs to keep on filesystem
+	DefaultRetainSlowLogs          = 1          // how many slow logs to keep on filesystem
 	DefaultExampleQueries          = true
 	// internal
 	DefaultWorkerRuntime uint = 55
@@ -114,9 +114,9 @@ func ValidateConfig(setConfig pc.QAN) (pc.QAN, error) {
 		Interval:       DefaultInterval,
 		ExampleQueries: new(bool),
 		// "slowlog" specific options.
-		MaxSlowLogSize:   DefaultMaxSlowLogSize,
-		SlowLogsRotation: new(bool),
-		SlowLogsToKeep:   new(int),
+		MaxSlowLogSize:  DefaultMaxSlowLogSize,
+		SlowLogRotation: new(bool),
+		RetainSlowLogs:  new(int),
 		// internal
 		WorkerRunTime: DefaultWorkerRuntime,
 		ReportLimit:   DefaultReportLimit,
@@ -129,13 +129,13 @@ func ValidateConfig(setConfig pc.QAN) (pc.QAN, error) {
 	if setConfig.ExampleQueries != nil {
 		runConfig.ExampleQueries = setConfig.ExampleQueries
 	}
-	*runConfig.SlowLogsRotation = DefaultSlowLogsRotation
-	if setConfig.SlowLogsRotation != nil {
-		runConfig.SlowLogsRotation = setConfig.SlowLogsRotation
+	*runConfig.SlowLogRotation = DefaultSlowLogRotation
+	if setConfig.SlowLogRotation != nil {
+		runConfig.SlowLogRotation = setConfig.SlowLogRotation
 	}
-	*runConfig.SlowLogsToKeep = DefaultSlowLogsToKeep
-	if setConfig.SlowLogsToKeep != nil {
-		runConfig.SlowLogsToKeep = setConfig.SlowLogsToKeep
+	*runConfig.RetainSlowLogs = DefaultRetainSlowLogs
+	if setConfig.RetainSlowLogs != nil {
+		runConfig.RetainSlowLogs = setConfig.RetainSlowLogs
 	}
 
 	// Strings

qan/analyzer/mysql/config/config.go

@@ -188,14 +188,14 @@ func (m *MySQLAnalyzer) Stop() error {
 func (m *MySQLAnalyzer) GetDefaults(uuid string) map[string]interface{} {
 	// Configuration
 	cfg := map[string]interface{}{
-		"CollectFrom":      m.config.CollectFrom,
-		"Interval":         m.config.Interval,
-		"MaxSlowLogSize":   config.DefaultMaxSlowLogSize,
-		"SlowLogsToKeep":   m.config.SlowLogsToKeep,
-		"SlowLogsRotation": m.config.SlowLogsRotation,
-		"ExampleQueries":   m.config.ExampleQueries,
-		"WorkerRunTime":    config.DefaultWorkerRuntime,
-		"ReportLimit":      config.DefaultReportLimit,
+		"CollectFrom":     m.config.CollectFrom,
+		"Interval":        m.config.Interval,
+		"MaxSlowLogSize":  config.DefaultMaxSlowLogSize,
+		"RetainSlowLogs":  m.config.RetainSlowLogs,
+		"SlowLogRotation": m.config.SlowLogRotation,
+		"ExampleQueries":  m.config.ExampleQueries,
+		"WorkerRunTime":   config.DefaultWorkerRuntime,
+		"ReportLimit":     config.DefaultReportLimit,
 	}
 
 	// Info from SHOW GLOBAL STATUS

qan/analyzer/mysql/mysql.go

@@ -288,13 +288,13 @@ func (s *WorkerTestSuite) TestRotateAndRemoveSlowLog(t *C) {
 	slowLogsRotation := true
 	slowLogsToKeep := 1
 	config := pc.QAN{
-		UUID:             s.mysqlInstance.UUID,
-		Interval:         300,
-		MaxSlowLogSize:   1000, // <-- HERE
-		ExampleQueries:   &exampleQueries,
-		SlowLogsRotation: &slowLogsRotation,
-		SlowLogsToKeep:   &slowLogsToKeep,
-		WorkerRunTime:    600,
+		UUID:            s.mysqlInstance.UUID,
+		Interval:        300,
+		MaxSlowLogSize:  1000, // <-- HERE
+		ExampleQueries:  &exampleQueries,
+		SlowLogRotation: &slowLogsRotation,
+		RetainSlowLogs:  &slowLogsToKeep,
+		WorkerRunTime:   600,
 		Start: []string{
 			"-- start",
 		},
@@ -391,13 +391,13 @@ func (s *WorkerTestSuite) TestRotateSlowLog(t *C) {
 	slowLogsRotation := true
 	slowLogsToKeep := 1
 	config := pc.QAN{
-		UUID:             s.mysqlInstance.UUID,
-		Interval:         300,
-		MaxSlowLogSize:   1000,
-		ExampleQueries:   &exampleQueries,
-		SlowLogsRotation: &slowLogsRotation,
-		SlowLogsToKeep:   &slowLogsToKeep,
-		WorkerRunTime:    600,
+		UUID:            s.mysqlInstance.UUID,
+		Interval:        300,
+		MaxSlowLogSize:  1000,
+		ExampleQueries:  &exampleQueries,
+		SlowLogRotation: &slowLogsRotation,
+		RetainSlowLogs:  &slowLogsToKeep,
+		WorkerRunTime:   600,
 		Start: []string{
 			"-- start",
 		},

qan/analyzer/mysql/worker/slowlog/slowlog_test.go

@@ -65,7 +65,7 @@ type Job struct {
 	StartOffset    int64
 	EndOffset      int64
 	ExampleQueries bool
-	SlowLogsToKeep int
+	RetainSlowLogs int
 }
 
 func (j *Job) String() string {
@@ -142,7 +142,7 @@ func (w *Worker) Setup(interval *iter.Interval) error {
 	w.logger.Debug("Setup:", interval)
 
 	// Check if slow log rotation is enabled.
-	if boolValue(w.config.SlowLogsRotation) {
+	if boolValue(w.config.SlowLogRotation) {
 		// Check if max slow log size was reached.
 		if interval.EndOffset >= w.config.MaxSlowLogSize {
 			w.logger.Info(fmt.Sprintf("Rotating slow log: %s >= %s",
@@ -163,7 +163,7 @@ func (w *Worker) Setup(interval *iter.Interval) error {
 		EndOffset:      interval.EndOffset,
 		RunTime:        time.Duration(w.config.WorkerRunTime) * time.Second,
 		ExampleQueries: boolValue(w.config.ExampleQueries),
-		SlowLogsToKeep: intValue(w.config.SlowLogsToKeep),
+		RetainSlowLogs: intValue(w.config.RetainSlowLogs),
 	}
 	w.logger.Debug("Setup:", w.job)
 
@@ -446,11 +446,11 @@ func (w *Worker) rotateSlowLog(interval *iter.Interval) error {
 	if err != nil {
 		return err
 	}
-	if len(filesFound) <= intValue(w.config.SlowLogsToKeep) {
+	if len(filesFound) <= intValue(w.config.RetainSlowLogs) {
 		return nil
 	}
 	sort.Strings(filesFound)
-	for _, f := range filesFound[:len(filesFound)-intValue(w.config.SlowLogsToKeep)] {
+	for _, f := range filesFound[:len(filesFound)-intValue(w.config.RetainSlowLogs)] {
 		w.status.Update(w.name, "Removing slow log "+f)
 		if err := os.Remove(f); err != nil {
 			w.logger.Warn(err)