Remove setup deprecation message (#4889) (#4926)

* Unmark setup as deprecated

We decided to keep `-setup` as a shorthand for setup + run

* Update `test output` help message

(cherry picked from commit 8bc9c80)

libbeat/beat/beat.go

@@ -298,10 +298,6 @@ func (b *Beat) launch(bt Creator) error {
 
 	svc.HandleSignals(beater.Stop)
 
-	// TODO Deprecate this in favor of setup subcommand (7.0)
-	if *setup {
-		cfgwarn.Deprecate("6.0", "-setup flag has been deprectad, use setup subcommand")
-	}
 	err = b.loadDashboards(false)
 	if err != nil {
 		return err

libbeat/cmd/run.go

@@ -30,11 +30,10 @@ func genRunCmd(name, version string, beatCreator beat.Creator, runFlags *pflag.F
 
 	// TODO deprecate in favor of subcommands (7.0):
 	runCmd.Flags().AddGoFlag(flag.CommandLine.Lookup("configtest"))
-	runCmd.Flags().AddGoFlag(flag.CommandLine.Lookup("setup"))
 	runCmd.Flags().AddGoFlag(flag.CommandLine.Lookup("version"))
 
 	runCmd.Flags().MarkDeprecated("version", "version flag has been deprectad, use version subcommand")
-	runCmd.Flags().MarkDeprecated("configtest", "setup flag has been deprectad, use configtest subcommand")
+	runCmd.Flags().MarkDeprecated("configtest", "configtest flag has been deprectad, use test config subcommand")
 
 	if runFlags != nil {
 		runCmd.Flags().AddFlagSet(runFlags)

libbeat/cmd/test/output.go

@@ -14,7 +14,7 @@ import (
 func GenTestOutputCmd(name, beatVersion string) *cobra.Command {
 	return &cobra.Command{
 		Use:   "output",
-		Short: "Test output works with current settings",
+		Short: "Test " + name + " can connect to the output by using the current settings",
 		Run: func(cmd *cobra.Command, args []string) {
 			b, err := beat.New(name, beatVersion)
 			if err != nil {