From 018694fb8420190a0d9714e3f17c4fcf7aed063d Mon Sep 17 00:00:00 2001
From: Andreas Dilger <adilger@whamcloud.com>
Date: Thu, 20 May 2021 13:20:01 -0600
Subject: [PATCH] LU-14339 jobid: add %H to complex jobid

The '%H' parameter allows printing the short hostname into the
jobid instead of the fully-qualified hostname.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I1e2735c89192f8bc3d919ae5ebdfb528783ebbe5
Reviewed-on: https://review.whamcloud.com/43757
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
---
 LustreMonitoring.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/LustreMonitoring.xml b/LustreMonitoring.xml
index 33e054f..a7cde5f 100644
--- a/LustreMonitoring.xml
+++ b/LustreMonitoring.xml
@@ -647,24 +647,27 @@ Lustre Jobstats</title>
       </para>
       <itemizedlist>
         <listitem>
-	  <para><emphasis>%e</emphasis> print executable name</para>
+          <para><emphasis>%e</emphasis> print executable name</para>
         </listitem>
         <listitem>
-	  <para><emphasis>%g</emphasis> print group ID number</para>
+          <para><emphasis>%g</emphasis> print group ID number</para>
         </listitem>
         <listitem>
-	  <para><emphasis>%h</emphasis> print hostname</para>
+          <para><emphasis>%h</emphasis> print fully-qualified hostname</para>
         </listitem>
         <listitem>
-	  <para><emphasis>%j</emphasis> print JobID from process environment
-	  variable named by the <emphasis>jobid_var</emphasis> parameter
-	  </para>
+          <para><emphasis>%H</emphasis> print short hostname</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>%j</emphasis> print JobID from process environment
+          variable named by the <emphasis>jobid_var</emphasis> parameter
+          </para>
         </listitem>
         <listitem>
-	  <para><emphasis>%p</emphasis> print numeric process ID</para>
+          <para><emphasis>%p</emphasis> print numeric process ID</para>
         </listitem>
         <listitem>
-	  <para><emphasis>%u</emphasis> print user ID number</para>
+          <para><emphasis>%u</emphasis> print user ID number</para>
         </listitem>
       </itemizedlist>
 
-- 
1.8.3.1