PMM-14442 Chore minor tweaks and changes

Author: ademidoff

agent/cmd/pmm-agent-entrypoint/main.go

@@ -41,11 +41,11 @@ It is configured entirely by environment variables. Arguments or flags are not u
 The following environment variables are recognized by the Docker entrypoint:
 * PMM_AGENT_SETUP            - if true, 'pmm-agent setup' is called before 'pmm-agent run'.
 * PMM_AGENT_PRERUN_FILE      - if non-empty, runs given file with 'pmm-agent run' running in the background.
-* PMM_AGENT_PRERUN_SCRIPT    - if non-empty, runs given shell script content with 'pmm-agent run' running in the background.
-* PMM_AGENT_SIDECAR          - if true, 'pmm-agent' will be restarted in case of it's failed.
+* PMM_AGENT_PRERUN_SCRIPT    - if non-empty, runs given shell script with 'pmm-agent run' running in the background.
+* PMM_AGENT_SIDECAR          - if true, 'pmm-agent' will be restarted in case it fails.
 * PMM_AGENT_SIDECAR_SLEEP    - time to wait before restarting pmm-agent if PMM_AGENT_SIDECAR is true. 1 second by default.
 
-Additionally, the many environment variables are recognized by pmm-agent itself.
+Additionally, many environment variables are recognized by pmm-agent itself.
 The following help text shows them as [PMM_AGENT_XXX].
 `
 
@@ -61,13 +61,13 @@ var (
 	pmmAgentSetup = kingpin.Flag("pmm-agent-setup",
 		"if true, 'pmm-agent setup' is called before 'pmm-agent run'").Default("false").Envar("PMM_AGENT_SETUP").Bool()
 	pmmAgentSidecar = kingpin.Flag("pmm-agent-sidecar",
-		"if true, 'pmm-agent' will be restarted in case of it's failed").Default("false").Envar("PMM_AGENT_SIDECAR").Bool()
+		"if true, 'pmm-agent' will be restarted in case it fails").Default("false").Envar("PMM_AGENT_SIDECAR").Bool()
 	pmmAgentSidecarSleep = kingpin.Flag("pmm-agent-sidecar-sleep",
 		"time to wait before restarting pmm-agent if PMM_AGENT_SIDECAR is true. 1 second by default").Default("1").Envar("PMM_AGENT_SIDECAR_SLEEP").Int()
 	pmmAgentPrerunFile = kingpin.Flag("pmm-agent-prerun-file",
 		"if non-empty, runs given file with 'pmm-agent run' running in the background").Envar("PMM_AGENT_PRERUN_FILE").String()
 	pmmAgentPrerunScript = kingpin.Flag("pmm-agent-prerun-script",
-		"if non-empty, runs given shell script content with 'pmm-agent run' running in the background").Envar("PMM_AGENT_PRERUN_SCRIPT").String()
+		"if non-empty, runs given shell script with 'pmm-agent run' running in the background").Envar("PMM_AGENT_PRERUN_SCRIPT").String()
 )
 
 var pmmAgentProcessID = 0

agent/commands/setup.go

@@ -155,7 +155,7 @@ func register(cfg *config.Config, l *logrus.Entry) {
 			msg += ".\nPlease check pmm-managed logs."
 		}
 
-		fmt.Printf("Failed to register pmm-agent on PMM Server: %s.\n", msg)
+		l.Errorf("Failed to register pmm-agent on PMM Server: %s.", msg)
 		os.Exit(1)
 	}
 	cfg.ID = agentID
@@ -165,11 +165,11 @@ func register(cfg *config.Config, l *logrus.Entry) {
 	} else {
 		l.Info("PMM Server responded with an empty service token. Consider upgrading PMM Server to the latest version.")
 	}
-	fmt.Printf("Registered.\n")
+	l.Info("Registered.")
 }
 
 func reload(l *logrus.Entry) {
-	fmt.Printf("Reloading pmm-agent configuration...\n")
+	l.Info("Reloading pmm-agent configuration...")
 
 	// sync error handling with Reload API method
 	err := localReload()

api-tests/docker-compose.yml

@@ -82,7 +82,7 @@ services:
       mysql:
         condition: service_healthy
     environment:
-      PMM_AGENT_SERVER_ADDRESS: pmm-server
+      PMM_AGENT_SERVER_ADDRESS: pmm-server:8443
       PMM_AGENT_SERVER_USERNAME: admin
       PMM_AGENT_SERVER_PASSWORD: admin
       PMM_AGENT_SERVER_INSECURE_TLS: 1