Rename M3PS var to PSGetProcessIds to free it for the upcoming m3 lp requirement

Author: andy-tier1app

internal/capture/executils/const_aix.go

@@ -4,7 +4,7 @@ var (
 	NetState            = Command{"netstat", "-a"}
 	PS                  = Command{"ps", "-ef"}
 	PS2                 = Command{"ps", "-ef"}
-	M3PS                = Command{"ps", "-ef"}
+	PSGetProcessIds     = Command{"ps", "-ef"}
 	Disk                = Command{"df"}
 	Top                 = Command{"topas", "-P"}
 	Top2                = Command{"topas", "-P"}

internal/capture/executils/const_darwin.go

@@ -4,7 +4,7 @@ var (
 	NetState            = Command{"netstat", "-an"}
 	PS                  = Command{"ps", "-ef"}
 	PS2                 = Command{"ps", "-ef"}
-	M3PS                = Command{"ps", "-ef"}
+	PSGetProcessIds     = Command{"ps", "-ef"}
 	Disk                = Command{"df", "-hk"}
 	Top                 = Command{WaitCommand, "/bin/sh", "-c", "for i in {1..3}; do top -l 5 ; sleep 10; done"}
 	Top2                = NopCommand

internal/capture/executils/const_linux.go

@@ -4,7 +4,6 @@ var (
 	NetState = Command{"netstat", "-pan"}
 	PS       = Command{"ps", "-eLf"}
 	PS2      = Command{"ps", "-eTf"}
-	M3PS     = Command{"ps", "-eLf"}
 	Disk     = Command{"df", "-hk"}
 	Top      = Command{WaitCommand, "top", "-bc",
 		"-d", "10",
@@ -30,6 +29,7 @@ var (
 	OSVersion           = Command{WaitCommand, "uname", "-a"}
 	KernelParam         = Command{WaitCommand, "sysctl", "-a"}
 	Ping                = Command{WaitCommand, "ping", "-c", "6"}
+	PSGetProcessIds     = Command{"ps", "-eLf"}
 
 	SHELL = Command{"/bin/sh", "-c"}
 

internal/capture/executils/const_solaris.go

@@ -8,7 +8,6 @@ var (
 	NetState = Command{"netstat", "-pan"}
 	PS       = Command{"ps", "-eLf"}
 	PS2      = Command{"ps", "-eLf"}
-	M3PS     = Command{"ps", "-eLf"}
 	Disk     = Command{"df", "-hk"}
 	Top      = Command{WaitCommand, "top", "-bc",
 		"-d", strconv.Itoa(TOP_INTERVAL),
@@ -34,6 +33,7 @@ var (
 	OSVersion           = Command{WaitCommand, "uname", "-a"}
 	KernelParam         = Command{WaitCommand, "sysctl", "-a"}
 	JavaVersionCommand  = Command{"java", "-XshowSettings:java", "-version"}
+	PSGetProcessIds     = Command{"ps", "-eLf"}
 
 	SHELL = Command{"/bin/sh", "-c"}
 )

internal/capture/executils/const_windows.go

@@ -12,7 +12,6 @@ var (
 	NetState = Command{"netstat", "-an"}
 	PS       = Command{"tasklist"}
 	PS2      = Command{"tasklist"}
-	M3PS     = Command{WaitCommand, "PowerShell.exe", "-Command", "Get-CimInstance -Class Win32_Process | ConvertTo-Json"}
 
 	Disk                = Command{"wmic", "logicaldisk", "get", "size,freespace,caption"}
 	Top                 = NopCommand
@@ -32,6 +31,7 @@ var (
 	KernelParam         = NopCommand
 	Ping                = Command{WaitCommand, "ping", "-n", "6"}
 	JavaVersionCommand  = Command{"java.exe", "-XshowSettings:java", "-version"}
+	PSGetProcessIds     = Command{WaitCommand, "PowerShell.exe", "-Command", "Get-CimInstance -Class Win32_Process | ConvertTo-Json"}
 
 	SHELL = Command{"cmd.exe", "/c"}
 )

internal/capture/proc_others.go

@@ -92,7 +92,7 @@ Next:
 }
 
 func GetProcessIds(tokens config.ProcessTokens, excludes config.ProcessTokens) (pids map[int]string, err error) {
-	output, err := executils.CommandCombinedOutput(executils.M3PS)
+	output, err := executils.CommandCombinedOutput(executils.PSGetProcessIds)
 	if err != nil {
 		return
 	}

internal/capture/proc_windows.go

@@ -109,7 +109,7 @@ type CIMProcess struct {
 type CIMProcessList []CIMProcess
 
 func GetProcessIds(tokens config.ProcessTokens, excludes config.ProcessTokens) (pids map[int]string, err error) {
-	output, err := executils.CommandCombinedOutput(executils.M3PS)
+	output, err := executils.CommandCombinedOutput(executils.PSGetProcessIds)
 	if err != nil {
 		return
 	}