versoon 1.3.29

TA-nmon/bin/nmon_external_cmd/nmon_external_snap.sh

@@ -40,4 +40,5 @@ echo "UPTIME,$1,\"`uptime | sed 's/^\s//g' | sed 's/,/;/g'`\"" >>NMON_FIFO_PATH/
 DF_TABLE=`df -k -P | sed '1d' | egrep -v '\s\/proc$|\s/dev$|\s\/run$|^tmpfs.*\/dev.*$|^tmpfs.*\/run.*$|^tmpfs.*\/sys.*$|^tmpfs.*\/var.*$' | awk '{print $6}'`
 for fs in $DF_TABLE; do
     echo "DF_STORAGE,$1,`df -k -P $fs | sed '1d' | sed 's/%//g' | sed 's/,/;/g' | awk '{print $1 "," $2 "," $3 "," $4 "," $5 "," $6}'`" >>NMON_FIFO_PATH/nmon_external.dat
+    echo "DF_INODES,$1,`df -i -P $fs | sed '1d' | sed 's/%//g' | sed 's/,/;/g' | awk '{print $1 "," $2 "," $3 "," $4 "," $5 "," $6}'`" >>NMON_FIFO_PATH/nmon_external.dat
 done

TA-nmon/bin/nmon_external_cmd/nmon_external_start.sh

@@ -43,3 +43,4 @@ echo "UPTIME,Server Uptime and load,uptime_stdout" >>NMON_FIFO_PATH/nmon_externa
 
 # DF table (file systems usage)
 echo "DF_STORAGE,File system disk space usage,filesystem,blocks,Used,Available,Use_pct,mount" >>NMON_FIFO_PATH/nmon_external_header.dat
+echo "DF_INODES,File system inodes usage,filesystem,Inodes,IUsed,IFree,IUse_pct,mount" >>NMON_FIFO_PATH/nmon_external_header.dat

TA-nmon/default/eventtypes.conf

@@ -20,10 +20,10 @@ search = index=nmon*
 search = index=nmon* sourcetype=nmon_data
 
 [nmon:performance:cpu]
-search = index=nmon* sourcetype=nmon_data (type="CPU*" OR type="LPAR" OR type="WLM*CPU" OR type="POOLS")
+search = index=nmon* sourcetype=nmon_data (type="CPU*" OR type="LPAR" OR type="WLMPROJECTCPU" OR type="WLMZONECPU" OR type="WLMTASKCPU" OR type="WLMUSERCPU" OR type="WLMCPU" OR type="POOLS")
 
 [nmon:performance:memory]
-search = index=nmon* sourcetype=nmon_data (type="MEM*" OR type="WLM*MEM")
+search = index=nmon* sourcetype=nmon_data (type="MEM*" OR type="WLMPROJECTMEM" OR type="WLMZONEMEM" OR type="WLMTASKMEM" OR type="WLMUSERMEM" OR type="WLMMEM")
 
 [nmon:performance:process]
 search = index=nmon* sourcetype=nmon_data (type="TOP" OR type="UARG")
@@ -35,7 +35,7 @@ search = index=nmon* sourcetype=nmon_data (type="FILE" OR type="PROC*" OR type="
 search = index=nmon* sourcetype=nmon_data (type="IOADAPT" OR type="FC")
 
 [nmon:performance:storage]
-search = index=nmon* sourcetype=nmon_data (type="DISK*" OR type=DG* OR type="JFS*" OR type="DF_STORAGE")
+search = index=nmon* sourcetype=nmon_data (type="DISK*" OR type=DG* OR type="JFS*" OR type="DF*")
 
 [nmon:performance:network]
 search = index=nmon* sourcetype=nmon_data (type="NET*" OR type="NFS*" OR type="SEA*")
@@ -72,7 +72,7 @@ search = index=nmon* sourcetype=nmon_data type="MEM"
 
 # CIM - Performance
 [storage_metrics]
-search = index=nmon* sourcetype=nmon_data (type="DG*" OR type="JFSFILE" OR type="DF_STORAGE")
+search = index=nmon* sourcetype=nmon_data (type="DG*" OR type="JFSFILE" OR type="DF*")
 
 # CIM - Performance
 [network_metrics]

TA-nmon/default/nmonparser_config.json

@@ -11,7 +11,7 @@
 
     "dynamic_section1":["DISKBUSY", "DISKBSIZE", "DISKREAD", "DISKWRITE", "DISKXFER", "DISKRIO", "DISKWIO", "DISKREADSERV", "DISKWRITESERV"],
 
-    "dynamic_section2":["IOADAPT", "NETERROR", "NET", "NETPACKET", "JFSFILE", "JFSINODE", "FCREAD", "FCWRITE", "FCXFERIN", "FCXFEROUT"],
+    "dynamic_section2":["IOADAPT", "NETERROR", "NET", "NETPACKET", "FCREAD", "FCWRITE", "FCXFERIN", "FCXFEROUT"],
 
     "disk_extended_section":["DGBUSY", "DGREAD", "DGWRITE", "DGSIZE", "DGXFER", "DGREADS", "DGREADMERGE", "DGREADSERV", "DGWRITES", "DGWRITEMERGE", "DGWRITESERV", "DGINFLIGHT", "DGIOTIME", "DGBACKLOG"],
 
@@ -25,7 +25,7 @@
 
     "AIX_WLM":["WLMCPU", "WLMMEM", "WLMBIO"],
 
-    "nmon_external":["UPTIME", "PROCCOUNT", "DF_STORAGE"],
+    "nmon_external":["UPTIME", "PROCCOUNT", "DF_STORAGE", "DF_INODES"],
 
     "nmon_external_transposed":[""]
 

TA-nmon/default/props.conf

@@ -206,13 +206,20 @@ FIELDALIAS-process_id = PID as process_id
 EVAL-user = case(type=="TOP", if(isnotnull(username), username, "undefined"))
 
 # CIM normalization for storage metrics (JFSFILE and nmon external DF_STORAGE)
-EVAL-mount = case(type=="JFSFILE", device, type=="DF_STORAGE", mount)
+EVAL-mount = case(match(type, "JFS\w*"), device, match(type, "DF_\w*"), mount)
 EVAL-storage = case(type=="DF_STORAGE", round((blocks/1024), 2))
 EVAL-storage_free = case(type=="DF_STORAGE", round(((blocks-Used)/1024), 2))
 EVAL-storage_free_percent = case(type=="DF_STORAGE", (100-Use_pct), type=="JFSFILE", (100 - value))
 EVAL-storage_used = case(type=="DF_STORAGE", round((Used/1024), 2))
 EVAL-storage_used_percent = case(type=="DF_STORAGE", Use_pct, type=="JFSFILE", value)
 
+# For inodes, non CIM
+EVAL-storage_inodes = case(type=="DF_INODES", Inodes)
+EVAL-storage_free_inodes = case(type=="DF_INODES", IFree)
+EVAL-storage_free_inodes_percent = case(type=="DF_INODES", (100-IUse_pct))
+EVAL-storage_used_inodes = case(type=="DF_INODES", IUsed, type=="JFSINODES", value)
+EVAL-storage_used_inodes_percent = case(type=="DF_INODES", IUse_pct, type=="JFSINODES", (100-value))
+
 # Non CIM for disk extended statistics (DG*)
 EVAL-disk_backlog_time_ms = case(type=="DGBACKLOG", value)
 EVAL-disk_busy_time_pct = case(type=="DGBUSY", value)