April Changes (#36)

* Merging latest changes from internal repository * Adjust documentation for PAS monitoring per user comments * Update install guide * Update scripts for 12.8 and 13.0 * Update instructions, properties * Update command line parameter options for metrics * Merge new config changes for monitoring scripts * Update from dev work --------- Co-authored-by: DustinGrau-PSC <[email protected]>
progress · Apr 24, 2024 · 6b1117b · 6b1117b
1 parent db8f53c
commit 6b1117b
Show file tree

Hide file tree

Showing 93 changed files with 4,326 additions and 213 deletions.
diff --git a/PAS/Management/OEManager/ABL/bin/oemanager.bat b/PAS/Management/OEManager/ABL/bin/oemanager.bat
@@ -34,7 +34,7 @@ if exist "%DLC%\bin\java_env.bat" (
 )
 
 REM Use the PowerShell utility to execute the Ant utility with all given parameters
-PowerShell.exe -executionpolicy bypass -File "oemanager.ps1" %*
+PowerShell.exe -executionpolicy bypass -File "%~dp0\oemanager.ps1" %*
 
 goto END
 

diff --git a/PAS/Management/OEManager/ABL/bin/oemanager.ps1 b/PAS/Management/OEManager/ABL/bin/oemanager.ps1
@@ -17,8 +17,7 @@ to a PAS instance to manage and monitor that instance.
 #>
 
 #---- Local Variables ----#
-[string]$script:_dlcPath=(Get-ChildItem -Path Env:DLC).Value
-[string]$script:_antPath="$script:_dlcPath\ant\bin\ant.bat"
+[string]$script:_antPath="$env:DLC\ant\bin\ant.bat"
 [string]$script:_taskFilePath="$PSScriptRoot\oemanager.xml"
 [string]$script:_taskArgs=""
 

diff --git a/PAS/Management/OEManager/ABL/bin/oemanager.sh b/PAS/Management/OEManager/ABL/bin/oemanager.sh
@@ -64,4 +64,5 @@ done
 
 # Uses the oemanager.xml as task instructions to Ant, passing all task arguments
 ANT_HOME=$DLC/ant ; export ANT_HOME
-exec $ANTSCRIPT -f oemanager.xml $TASKARGS
+SCRIPT_HOME=$(dirname "$0")
+exec $ANTSCRIPT -f $SCRIPT_HOME/oemanager.xml $TASKARGS
diff --git a/PAS/Management/OEManager/ABL/conf/oemanager.properties b/PAS/Management/OEManager/ABL/conf/oemanager.properties
@@ -1,5 +1,11 @@
 # oemanager.properties file - Modify as Needed for PAS Instance
 #
+# Set the output directory for all generated files, including logs
+# Using "BIN" will use the script executable's folder, the default.
+# Using "TMP" will use the PAS instance's temp folder.
+#
+#outdir=BIN
+#
 # Changing the scheme will affect the port
 # used when run from within a PAS instance
 #

diff --git a/PAS/Management/OEManager/ABL/conf/oemanager.xml b/PAS/Management/OEManager/ABL/conf/oemanager.xml
@@ -332,13 +332,13 @@
             <if>
                 <isset property="outdir.unset"/>
                 <then>
-                    <property name="outdir" value="PWD"/>
+                    <property name="outdir" value="BIN"/>
                 </then>
             </if>
 
             <!-- Set output based on a default or given value. -->
             <if>
-                <equals arg1="${outdir}" arg2="PWD"/>
+                <equals arg1="${outdir}" arg2="BIN"/>
                 <then>
                     <!-- Default to the current directory. -->
                     <property name="output.dir" value="${basedir}"/>
@@ -668,7 +668,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -685,7 +685,7 @@
             <Parameter name="PassWD" value="${passwd}"/>
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="BaseMem" value="${basemem}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="stacks">
@@ -702,7 +702,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -720,7 +720,7 @@
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="ProcID" value="${pid}"/>
             <Parameter name="SessionID" value="${sessid}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="flush">
@@ -737,7 +737,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -753,7 +753,7 @@
             <Parameter name="UserID" value="${userid}"/>
             <Parameter name="PassWD" value="${passwd}"/>
             <Parameter name="ABLApp" value="${ablapp}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="trimhttp">
@@ -770,7 +770,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -789,7 +789,7 @@
             <Parameter name="WebApp" value="${webapp}"/>
             <Parameter name="TerminateOpt" value="${terminateopt}"/>
             <Parameter name="SessionID" value="${sessid}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="trimidle">
@@ -806,7 +806,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -824,7 +824,7 @@
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="Idle" value="true"/>
             <Parameter name="TerminateOpt" value="${terminateopt}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="trimsingle">
@@ -841,7 +841,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -860,7 +860,7 @@
             <Parameter name="TerminateOpt" value="${terminateopt}"/>
             <Parameter name="ProcID" value="${pid}"/>
             <Parameter name="SessionID" value="${sessid}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="trimall">
@@ -877,7 +877,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -895,7 +895,7 @@
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="Idle" value="false"/>
             <Parameter name="TerminateOpt" value="${terminateopt}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="trimrand">
@@ -914,7 +914,7 @@
 
         <!-- THIS IS AN UNLISTED TARGET! -->
         <!-- This will psuedo-randomly terminate ABL Sessions and should NOT be used in any production environment. -->
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -932,7 +932,7 @@
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="TerminateOpt" value="${terminateopt}"/>
             <Parameter name="Pattern" value="${pattern}"/> <!-- Call with -Dpattern=# or -Dpattern=rand[om] -->
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="reset">
@@ -949,7 +949,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -966,7 +966,7 @@
             <Parameter name="PassWD" value="${passwd}"/>
             <Parameter name="ABLApp" value="${ablapp}"/>
             <Parameter name="Type" value="${resettype}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="refresh">
@@ -983,7 +983,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -999,7 +999,7 @@
             <Parameter name="UserID" value="${userid}"/>
             <Parameter name="PassWD" value="${passwd}"/>
             <Parameter name="ABLApp" value="${ablapp}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="add">
@@ -1016,7 +1016,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -1032,7 +1032,7 @@
             <Parameter name="UserID" value="${userid}"/>
             <Parameter name="PassWD" value="${passwd}"/>
             <Parameter name="ABLApp" value="${ablapp}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="stop">
@@ -1049,7 +1049,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -1068,7 +1068,7 @@
             <Parameter name="WaitFinish" value="${waitfinish}"/>
             <Parameter name="WaitAfter" value="${waitafter}"/>
             <Parameter name="ProcID" value="${pid}"/> <!-- Considered optional, default "" -->
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
     <target name="users">
@@ -1101,7 +1101,7 @@
            </condition>
         </fail>
 
-        <PCTRun
+        <PCTDynRun
                dlcHome="${dlcHome}"
                graphicalMode="false"
                tempDir="${output.dir}"
@@ -1119,7 +1119,7 @@
             <Parameter name="Port" value="${port}"/>
             <Parameter name="UserID" value="${userid}"/>
             <Parameter name="PassWD" value="${passwd}"/>
-        </PCTRun>
+        </PCTDynRun>
     </target>
 
 </project>
diff --git a/PAS/Management/OEManager/ABL/oemanager.README.md b/PAS/Management/OEManager/ABL/oemanager.README.md
@@ -1,6 +1,6 @@
 # OEManager CLI Tools - Usage Guide #
 
-Execute the `oemanager.[bat|sh]` command from within the utils folder to run the desired tasks from the command line. Where possible, default values will be determined automatically for HTTP/S ports, server paths, the instance's name, and the default ABL Application name. Any required or optional parameters may be overridden via the command line or by editing the `oemanager.properties` file in advance.
+Execute the `oemanager.[bat|sh]` command to run the desired tasks from the command line. Default values will be inherited automatically for HTTP/S ports, server paths, the instance's name, and the default ABL Application name. Any required or optional parameters may be overridden via the command line or by editing the `oemanager.properties` file in advance, with modified values being honored in that order.
 
 Note that each request to an OEM-API endpoint will be automatically logged to an `oemanager.log` file. No sensitive data will be included in these logged messages, only PID's and operationally-relevant information will be included in the URL or as query parameters to the API endpoint.
 
@@ -112,7 +112,7 @@ The following represents the default usage for all tasks which can be executed u
 
 Some tasks denote optional or required parameters, while all will use a set of common parameters either derived from the local PAS instance or specified via the command line or `oemanager.properties` file. When necessary to override any property values, simply pass as `name=value` on the command line or uncomment the property name and set a default value within the `oemanager.properties`.
 
-The output for any generated files from available tasks will be placed in the location referred to by the `-Doutdir` value. This may be one of 2 built-in options, `PWD` or `TMP` for the current directory (`CATALINA_BASE/bin`) or temp folder (`CATALINA_BASE/temp`), respectively. Alternately, you may specify a full path to use for all output.
+The output for any generated files from available tasks will be placed in the location referred to by the `-Doutdir` value. This may be one of 2 built-in options, `BIN` or `TMP` for the deployed utils directory (`CATALINA_BASE/utils`) or temp folder (`CATALINA_BASE/temp`), respectively. Alternately, you may specify a full path to use for all output.
 
 **Examples:**
 

diff --git a/PAS/Management/OEManager/ABL/release.txt b/PAS/Management/OEManager/ABL/release.txt
@@ -1 +1 @@
-2024-03-26T16:26:08.982
+2024-04-08T07:57:01.513
diff --git a/PAS/Management/OEManager/ABL/utils.zip b/PAS/Management/OEManager/ABL/utils.zip