working in progress

guilhemmarchand · Sep 24, 2017 · 2c2fba7 · 2c2fba7
1 parent 08a19c0
commit 2c2fba7
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 18 deletions.
diff --git a/nmon-performance-monitor-for-unix-and-linux-systems_1911.tgz b/nmon-performance-monitor-for-unix-and-linux-systems_1911.tgz
diff --git a/nmon/default/data/ui/views/UI_Nmon_compare.xml b/nmon/default/data/ui/views/UI_Nmon_compare.xml
@@ -267,8 +267,8 @@
                     <earliest>$TimeRange1.earliest$</earliest>
                     <latest>$TimeRange1.latest$</latest>
                 </search>
-                <prefix>$metric_device_field$="</prefix>
-                <suffix>"</suffix>
+                <choice value="*">Any</choice>
+                <default>*</default>
                 <fieldForLabel>$metric_device_field$</fieldForLabel>
                 <fieldForValue>$metric_device_field$</fieldForValue>
             </input>
@@ -342,10 +342,10 @@
                     <earliest>$TimeRange1.earliest$</earliest>
                     <latest>$TimeRange1.latest$</latest>
                 </search>
-                <prefix>$metric_device_field$="</prefix>
-                <suffix>"</suffix>
                 <fieldForLabel>$metric_device_field$</fieldForLabel>
                 <fieldForValue>$metric_device_field$</fieldForValue>
+                <choice value="*">Any</choice>
+                <default>*</default>
             </input>
 
         </panel>
@@ -405,7 +405,7 @@
     </search>
 
     <search id="KPIs_server_A_device" depends="$show_device$">
-        <query>eventtype=nmon:performance $host-prefilter1$ $osfilter1$ host=$host1$ $metric_dimension_filter$ $device1$ | search $frameID1$
+        <query>eventtype=nmon:performance $host-prefilter1$ $osfilter1$ host=$host1$ $metric_dimension_filter$ $metric_device_field$="$device1$" | search $frameID1$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)
@@ -415,7 +415,7 @@
     </search>
 
     <search id="KPIs_server_B_device" depends="$show_device$">
-        <query>eventtype=nmon:performance $host-prefilter2$ $osfilter2$ host=$host2$ $metric_dimension_filter$ $device2$ | search $frameID2$
+        <query>eventtype=nmon:performance $host-prefilter2$ $osfilter2$ host=$host2$ $metric_dimension_filter$ $metric_device_field$="$device2$" | search $frameID2$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)
@@ -688,7 +688,7 @@
 
             <chart depends="$show_device$">
                 <search depends="$show_device$">
-                    <query>eventtype=nmon:performance earliest="$TimeRange1.earliest$" latest="$TimeRange1.latest$" $host-prefilter1$ host=$host1$ $osfilter1$ $metric_dimension_filter$ $device1$
+                    <query>eventtype=nmon:performance earliest="$TimeRange1.earliest$" latest="$TimeRange1.latest$" $host-prefilter1$ host=$host1$ $osfilter1$ $metric_dimension_filter$ $metric_device_field$="$device1$"
 | search $frameID1$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
@@ -697,7 +697,7 @@
 | timechart $span$ limit=0 useother=f $statsmode$($metric_value_field$) As $TimeRange1_name$, $statsmode$(fake) As fake by key
 | fields _time,$TimeRange1_name$*
 | appendcols
-[ search eventtype=nmon:performance earliest="$TimeRange2.earliest$" latest="$TimeRange2.latest$" $host-prefilter2$ host=$host2$ $osfilter2$ $metric_dimension_filter$ $device1$
+[ search eventtype=nmon:performance earliest="$TimeRange2.earliest$" latest="$TimeRange2.latest$" $host-prefilter2$ host=$host2$ $osfilter2$ $metric_dimension_filter$ $metric_device_field$="$device2$"
 | search $frameID2$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
@@ -791,7 +791,7 @@
 
             <chart depends="$show_device$">
                 <search depends="$show_device$">
-                    <query>eventtype=nmon:performance $host-prefilter1$ host=$host1$ $osfilter1$ $metric_dimension_filter$ $device1$ | search $frameID1$
+                    <query>eventtype=nmon:performance $host-prefilter1$ host=$host1$ $osfilter1$ $metric_dimension_filter$ $metric_device_field$="$device1$" | search $frameID1$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)
@@ -879,7 +879,7 @@
 
             <chart depends="$show_device$">
                 <search depends="$show_device$">
-                    <query>eventtype=nmon:performance $host-prefilter2$ host=$host2$ $osfilter2$ $metric_dimension_filter$ $device2$ | search $frameID2$
+                    <query>eventtype=nmon:performance $host-prefilter2$ host=$host2$ $osfilter2$ $metric_dimension_filter$ $metric_device_field$="$device2$" | search $frameID2$
 | `$TimeFilter$`
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)

diff --git a/nmon/default/data/ui/views/UI_Nmon_predict.xml b/nmon/default/data/ui/views/UI_Nmon_predict.xml
@@ -329,8 +329,8 @@
                     <earliest>$timerange.earliest$</earliest>
                     <latest>$timerange.latest$</latest>
                 </search>
-                <prefix>$metric_device_field$="</prefix>
-                <suffix>"</suffix>
+                <choice value="*">Any</choice>
+                <default>*</default>
                 <fieldForLabel>$metric_device_field$</fieldForLabel>
                 <fieldForValue>$metric_device_field$</fieldForValue>
                 <change>
@@ -496,7 +496,7 @@
     </row>
 
     <search id="predicted_storage_saturation">
-        <query>eventtype=nmon:performance $metric_dimension_filter$ (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($device$)
+        <query>eventtype=nmon:performance $metric_dimension_filter$ (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($metric_device_field$="$device$")
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)
 | eval storage=case(storage_metric_unit=="MB", storage, storage_metric_unit=="GB", storage/1024, storage_metric_unit=="TB", storage/1024/1024)
@@ -625,7 +625,7 @@
             <chart depends="$show_device$">
                 <title></title>
                 <search depends="$show_device$">
-                    <query>eventtype=nmon:performance $metric_dimension_filter$ (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($device$)
+                    <query>eventtype=nmon:performance $metric_dimension_filter$ (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($metric_device_field$="$device$")
 | eval storage_metric_unit="$storage_metric_unit$"
 | eval $metric_value_field$=case(storage_metric_unit=="MB", $metric_value_field$, storage_metric_unit=="GB", $metric_value_field$/1024, storage_metric_unit=="TB", $metric_value_field$/1024/1024)
 | eval storage=case(storage_metric_unit=="MB", storage, storage_metric_unit=="GB", storage/1024, storage_metric_unit=="TB", storage/1024/1024)

diff --git a/nmon/lookups/nmon_metric_catalog.csv b/nmon/lookups/nmon_metric_catalog.csv
@@ -1,18 +1,44 @@
 metric_name,metric_label,is_AIX,is_Linux,is_Solaris,metric_category,metric_has_device,metric_device_field,metric_unit,metric_volume_unit_choice,metric_dimension_filter,metric_value_field,metric_dm,metric_dm_node,metric_dm_prefix
 cpu.cpu_all.cpu_load_percent,CPU_ALL (% cpu usage),TRUE,TRUE,TRUE,cpu,FALSE,,pct,FALSE,type=CPU_ALL,cpu_load_percent,,,
+cpu.cpu_all.cpu_user_percent,CPU_ALL (% user usage),TRUE,TRUE,TRUE,cpu,FALSE,,pct,FALSE,type=CPU_ALL,cpu_user_percent,,,
+cpu.cpu_all.cpu_wait_percent,CPU_ALL (% wait usage),TRUE,TRUE,TRUE,cpu,FALSE,,pct,FALSE,type=CPU_ALL,cpu_wait_percent,,,
+cpu.cpu_all.cpu_sys_percent,CPU_ALL (% sys usage),TRUE,TRUE,TRUE,cpu,FALSE,,pct,FALSE,type=CPU_ALL,cpu_sys_percent,,,
+,,,,,,,,,,,,,,
 cpu.lpar.lpar_vp_usage,LPAR (partition vCPUs usage),TRUE,FALSE,FALSE,cpu,FALSE,,cores,FALSE,type=LPAR,lpar_vp_usage,,,
 cpu.lpar.lpar_pool_vp_usage,LPAR (pool vCPUs usage),TRUE,FALSE,FALSE,cpu,FALSE,,cores,FALSE,type=LPAR,lpar_pool_vp_usage,,,
+,,,,,,,,,,,,,,
 cpu.pools.pool_vp_usage,POOLS (pool vCPUs usage),TRUE,FALSE,FALSE,cpu,FALSE,,cores,FALSE,type=POOLS,pool_vp_usage,,,
+,,,,,,,,,,,,,,
 cpu.uptime.load_average_1min,Load average (1 minute),TRUE,TRUE,TRUE,cpu,FALSE,,cores,FALSE,type=UPTIME,load_average_1min,,,
 cpu.uptime.load_average_5min,Load average (5 minutes),TRUE,TRUE,TRUE,cpu,FALSE,,cores,FALSE,type=UPTIME,load_average_5min,,,
 cpu.uptime.load_average_15min,Load average (15 minutes),TRUE,TRUE,TRUE,cpu,FALSE,,cores,FALSE,type=UPTIME,load_average_15min,,,
+,,,,,,,,,,,,,,
 memory.mem.mem_used_effective_percent,MEM (% physical memory usage),TRUE,TRUE,TRUE,memory,FALSE,,pct,FALSE,type=MEM,mem_used_effective_PCT,,,
 memory.mem.mem_used_effective_MB,MEM (MB physical memory usage),TRUE,TRUE,TRUE,memory,FALSE,,MB,FALSE,type=MEM,mem_used_effective,,,
 memory.mem.swap_used_effective_percent,MEM swap (% virtual memory usage),TRUE,TRUE,TRUE,memory,FALSE,,pct,FALSE,type=MEM,swap_used_effective_PCT,,,
 memory.mem.swap_used_effective_MB,MEM swap (MB virtual memory usage),TRUE,TRUE,TRUE,memory,FALSE,,MB,FALSE,type=MEM,swap_used_effective,,,
+,,,,,,,,,,,,,,
 storage.df_storage.storage_used,DF_STORAGE (per file system volume used),TRUE,TRUE,TRUE,storage,TRUE,mount,MB,TRUE,type=DF_STORAGE,storage_used,NMON_Data_JFS,JFS.DF_STORAGE,JFS
 storage.df_inodes.storage_used_inodes_percent,DF_INODES (per file system inodes used),TRUE,TRUE,FALSE,storage,TRUE,mount,pct,FALSE,type=DF_INODES,storage_used_inodes_percent,NMON_Data_JFS,JFS.DF_INODES,JFS
-storage.dgxfer.iops,DGXFER (IO per sec),FALSE,TRUE,FALSE,storage,FALSE,,IOPS,FALSE,type=DGXFER,total_ops,,,
-storage.diskxfer.iops,DISKXFER (IO per sec at device),TRUE,TRUE,TRUE,storage,FALSE,,IOPS,FALSE,type=DISKXFER,value,,,
-network.inbound.Kbsec,NETWORK (Inbound traffic KB/sec),TRUE,TRUE,TRUE,network,FALSE,,Kbs,FALSE,type=NET direction=inbound,value,,,
-network.outbound.Kbsec,NETWORK (Outbound traffic KB/sec),TRUE,TRUE,TRUE,network,FALSE,,Kbs,FALSE,type=NET direction=outbound,value,,,
+storage.dgbacklog.disk_backlog_time_ms,Disk Group Backlog time (ms),FALSE,TRUE,FALSE,storage,TRUE,device,ms,FALSE,type=DGBACKLOG,disk_backlog_time_ms,,,
+storage.dgbusy.disk_busy_time_pct,Disk Group Busy (% of time),FALSE,TRUE,FALSE,storage,TRUE,device,pct,FALSE,type=DGBUSY,disk_busy_time_pct,,,
+storage.dginflight.disk_in_flight_io,Disk Group in flight IO (I/O per sec),FALSE,TRUE,FALSE,storage,TRUE,device,IOPS,FALSE,type=DGINFLIGHT,disk_in_flight_io,,,
+storage.dgiotime.disk_time_spent_for_io_ms,Disk Group time spent for IO (ms),FALSE,TRUE,FALSE,storage,TRUE,device,ms,FALSE,type=DGIOTIME,disk_time_spent_for_io_ms,,,
+storage.dgread.disk_read_KB_per_sec,Disk Group Read KB/s,FALSE,TRUE,FALSE,storage,TRUE,device,KB/s,FALSE,type=DGREAD,disk_read_KB_per_sec,,,
+storage.dgreadmerge.disk_merge_read_sec,Disk Group merged read/s,FALSE,TRUE,FALSE,storage,TRUE,device,read_per_sec,FALSE,type=DGREADMERGE,disk_merge_read_sec,,,
+storage.dgreads.disk_read_sec,Disk Group read/s,FALSE,TRUE,FALSE,storage,TRUE,device,read_per_sec,FALSE,type=DGREADS,disk_read_sec,,,
+storage.dgreadserv.disk_read_service_time_ms,Disk Group read service time (SUM ms,FALSE,TRUE,FALSE,storage,TRUE,device,ms,FALSE,type=DGREADSERV,disk_read_service_time_ms,,,
+storage.dgsize.disk_block_size_KB,Disk Group Block Size KB,FALSE,TRUE,FALSE,storage,TRUE,device,KB,FALSE,type=DGSIZE,disk_block_size_KB,,,
+storage.dgwrite.disk_write_KB_per_sec,Disk Group Write KB/s,FALSE,TRUE,FALSE,storage,TRUE,device,KB/s,FALSE,type=DGWRITE,disk_write_KB_per_sec,,,
+storage.dgwritemerge.disk_merge_write_sec,Disk Group merged write/s,FALSE,TRUE,FALSE,storage,TRUE,device,write_per_sec,FALSE,type=DGWRITEMERGE,disk_merge_write_sec,,,
+storage.dgwrites.disk_write_sec,Disk Group write/s,FALSE,TRUE,FALSE,storage,TRUE,device,write_per_sec,FALSE,type=DGWRITES,disk_write_sec,,,
+storage.dgwriteserv.disk_write_service_time_ms,Disk Group write service time (SUM ms),FALSE,TRUE,FALSE,storage,TRUE,device,ms,FALSE,type=DGWRITESERV,disk_write_service_time_ms,,,
+storage.dgxfer.disk_total_iops,Disk Group Transfers/s,FALSE,TRUE,FALSE,storage,TRUE,device,IOPS,FALSE,type=DGXFER,disk_total_iops,,,
+,,,,,,,,,,,,,,
+storage.diskxfer.iops,"Disk I/O Operations per second (IOPS, iostat tps)",TRUE,TRUE,TRUE,storage,TRUE,device,IOPS,FALSE,type=DISKXFER,value,,,
+storage.diskbsize.value,Average data transfer size (block size) for read/write operations,TRUE,TRUE,TRUE,storage,TRUE,device,Kbytes / transfer,FALSE,type=DISKBSIZE,value,,,
+storage.diskbusy.value,Average percentage of busy for the disk,TRUE,TRUE,TRUE,storage,TRUE,device,pct,FALSE,type=DISKBUSY,value,,,
+storage.diskread.value,Data transfer rate of read data in kilobytes per second in the interval,TRUE,TRUE,TRUE,storage,TRUE,device,Kbytes/sec,FALSE,type=DISKREAD,value,,,
+storage.diskwrite.value,Data transfer rate of written data in kilobytes per second in the interval,TRUE,TRUE,TRUE,storage,TRUE,device,Kbytes/sec,FALSE,type=DISKWRITE,value,,,
+,,,,,,,,,,,,,,
+network.traffic.Kbsec,NETWORK (Inbound/Outbound traffic KB/sec),TRUE,TRUE,TRUE,network,TRUE,device,Kbs,FALSE,type=NET,value,NMON_Data_NET,NET_Data_types,NET_Data_types