version 1.9.12

- fix: DF_STORAGE vs JFSFILE compatibility for STORAGE UI and Dark monitoring
guilhemmarchand · Sep 26, 2017 · 45036cd · 45036cd
1 parent ce83b47
commit 45036cd
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 10 deletions.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -30,6 +30,7 @@ Migration from 1.8.x: http://nmon-for-splunk.readthedocs.io/en/latest/upgrade.ht
 
 - fix: Splunk certification requirements update, avoid global default parameter in ui-prefs.conf (config file has been removed) #98
 - fix: Splunk certification requirements update, default activation of data model acceleration is now prohibited #98
+- fix: DF_STORAGE vs JFSFILE compatibility for STORAGE UI and Dark monitoring
 
 ========
 V1.9.11:

diff --git a/nmon-performance-monitor-for-unix-and-linux-systems_1912.tgz b/nmon-performance-monitor-for-unix-and-linux-systems_1912.tgz
diff --git a/nmon/default/data/models/NMON_Data_JFS.json b/nmon/default/data/models/NMON_Data_JFS.json
@@ -1,7 +1,7 @@
 {
     "modelName": "NMON_Data_JFS",
-    "displayName": "NMON Data - JFS, Statistics of File Systems",
-    "description": "File Systems Statistics: JFSFILE, JFSINODE",
+    "displayName": "NMON Data - STORAGE - File systems utilisation statistics",
+    "description": "File Systems Statistics: DF_STORAGE, DF_INODES, JFSFILE, JFSINODE",
     "objectSummary": {
         "Event-Based": 5,
         "Transaction-Based": 0,
@@ -224,7 +224,7 @@
                     "fieldSearch": "",
                     "required": false,
                     "multivalue": false,
-                    "hidden": true,
+                    "hidden": false,
                     "editable": true,
                     "displayName": "host",
                     "comment": ""
@@ -568,7 +568,7 @@
                     "fieldSearch": "",
                     "required": false,
                     "multivalue": false,
-                    "hidden": true,
+                    "hidden": false,
                     "editable": true,
                     "displayName": "host",
                     "comment": ""
@@ -823,7 +823,7 @@
                     "fieldSearch": "",
                     "required": false,
                     "multivalue": false,
-                    "hidden": true,
+                    "hidden": false,
                     "editable": true,
                     "displayName": "host",
                     "comment": ""

diff --git a/nmon/default/data/ui/views/Nmon_Dark.xml b/nmon/default/data/ui/views/Nmon_Dark.xml
@@ -55,6 +55,24 @@
         </progress>
     </search>
 
+    <!-- DF_STORAGE data availability -->
+
+    <search>
+        <query>eventtype=nmon:performance type=DF_STORAGE $host$ | head 100 | stats count | where count&gt;0</query>
+        <earliest>$time.earliest$</earliest>
+        <latest>$time.latest$</latest>
+        <progress>
+            <condition match="$job.resultCount$ == 0">
+                    <set token="start_jfs_storage_search">true</set>
+                    <unset token="start_df_storage_search"></unset>
+            </condition>
+            <condition>
+                    <set token="start_df_storage_search">true</set>
+                    <unset token="start_jfs_storage_search"></unset>
+            </condition>
+        </progress>
+    </search>
+
     <row>
         <panel>
             <single>
@@ -341,7 +359,7 @@ groupby _time, host, "NET_Data_types.device" prestats=true span=1m
     <row>
         <panel>
             <title>File-system usage</title>
-            <chart>
+            <chart depends="$start_df_storage_search$">
                 <search>
                     <query>| tstats latest(JFS.storage_used_percent) AS value from datamodel=NMON_Data_JFS
 where (nodename = JFS.DF_STORAGE) (JFS.storage_used_percent>0) (JFS.mount!="/tmp") (JFS.mount!="/run*") ($host$) groupby _time, host, JFS.mount prestats=true `nmon_span`
@@ -371,6 +389,35 @@ where (nodename = JFS.DF_STORAGE) (JFS.storage_used_percent>0) (JFS.mount!="/tmp
                 <option name="height">280</option>
                 <option name="refresh.display">none</option>
             </chart>
+            <chart depends="$start_jfsfile_storage_search$">
+                <search>
+                    <query>| tstats max("JFS.value") AS JFS.value from datamodel=NMON_Data_JFS
+where (nodename = JFS.JFSFILE) (JFS.value&gt;=0) (JFS.device!="/tmp") (JFS.device!="/run*") ($host$) groupby _time, host, "JFS.device" prestats=true span=1m
+| stats dedup_splitvals=t max("JFS.value") AS JFS.value by _time, host, "JFS.device"
+| rename "JFS.*" AS *
+| timechart limit=0 useother=f `nmon_span` latest(value) As storage_used_percent by device</query>
+                    <earliest>$time.earliest$</earliest>
+                    <latest>$time.latest$</latest>
+                    <refresh>$refresh$</refresh>
+                    <refreshType>delay</refreshType>
+                </search>
+                <option name="charting.axisLabelsY.majorUnit">25</option>
+                <option name="charting.axisY.maximumNumber">101</option>
+                <option name="charting.axisY.minimumNumber">0</option>
+                <option name="charting.axisTitleX.visibility">collapsed</option>
+                <option name="charting.axisTitleY.text">Percent</option>
+                <option name="charting.axisY.maximumNumber">101</option>
+                <!-- Set background color -->
+                <option name="charting.backgroundColor">#292C33</option>
+                <!-- Set foreground color -->
+                <option name="charting.foregroundColor">#EBF5FF</option>
+                <!-- Set font color (axis labels, legends) -->
+                <option name="charting.fontColor">#BFBFBF</option>
+                <option name="charting.chart">line</option>
+                <option name="charting.legend.placement">bottom</option>
+                <option name="height">280</option>
+                <option name="refresh.display">none</option>
+            </chart>
         </panel>
         <panel>
             <title>Disks IOPS</title>

diff --git a/nmon/default/data/ui/views/UI_Nmon_STORAGE.xml b/nmon/default/data/ui/views/UI_Nmon_STORAGE.xml
@@ -24,18 +24,26 @@
         </input>
 
         <input type="dropdown" token="datasource" searchWhenChanged="true">
-            <label>Source of data:</label>
+            <label>Metric collection:</label>
             <default>DF_STORAGE</default>
             <choice value="DF_STORAGE">DF_STORAGE (volume usage statistics)</choice>
+            <choice value="JFSFILE">JFSFILE (volume pct only usage statistics)</choice>
             <choice value="DF_INODES">DF_INODES (volume inodes usage statistics)</choice>
             <change>
                 <condition value="DF_STORAGE">
                         <set token="start_df_storage_search">true</set>
+                        <unset token="start_jfsfile_storage_search"></unset>
+                        <unset token="start_df_inodes_search"></unset>
+                </condition>
+                <condition value="JFSFILE">
+                        <set token="start_jfsfile_storage_search">true</set>
+                        <unset token="start_df_storage_search"></unset>
                         <unset token="start_df_inodes_search"></unset>
                 </condition>
                 <condition value="DF_INODES">
                         <set token="start_df_inodes_search">true</set>
                         <unset token="start_df_storage_search"></unset>
+                        <unset token="start_jfsfile_storage_search"></unset>
                 </condition>
             </change>
         </input>
@@ -86,7 +94,7 @@
             <fieldForValue>host</fieldForValue>
         </input>
 
-        <input type="multiselect" token="mount" searchWhenChanged="true">
+        <input type="multiselect" token="mount" searchWhenChanged="true" rejects="$start_jfsfile_storage_search$">
             <label>FS Selection:</label>
             <!-- Populating Data Model Search -->
             <search>
@@ -107,6 +115,27 @@
             <fieldForValue>JFS.mount</fieldForValue>
         </input>
 
+        <input type="multiselect" token="device" searchWhenChanged="true" depends="$start_jfsfile_storage_search$">
+            <label>FS Selection:</label>
+            <!-- Populating Data Model Search -->
+            <search id="DisksbaseSearch">
+                <query>| tstats count AS Count from datamodel=NMON_Data_JFS where (nodename = JFS.JFSFILE) (JFS.value&gt;=0) (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) groupby host, "JFS.device" prestats=true
+| stats dedup_splitvals=t count AS Count by host, "JFS.device"
+| sort limit=0 host
+| fields - _span
+| fillnull Count | fields JFS.device | dedup JFS.device | sort JFS.device</query>
+                <earliest>$timerange.earliest$</earliest>
+                <latest>$timerange.latest$</latest>
+            </search>
+            <valuePrefix>JFS.device="</valuePrefix>
+            <valueSuffix>"</valueSuffix>
+            <delimiter> OR </delimiter>
+            <choice value="*">ALL FS</choice>
+            <default>*</default>
+            <fieldForLabel>JFS.device</fieldForLabel>
+            <fieldForValue>JFS.device</fieldForValue>
+        </input>
+
         <input type="text" token="fsfilter" searchWhenChanged="true">
             <label>Filter FileSystems by pattern:</label>
             <default>*</default>
@@ -363,7 +392,44 @@ where (nodename = JFS.DF_STORAGE) (host=$host-prefilter$) ($frameID$) ($osfilter
                 </format>
             </table>
 
-            <table id="tablebar1" depends="$start_df_inodes_search$">
+            <table id="tablebar1" depends="$start_jfsfile_storage_search$">
+                <title></title>
+                <search depends="$start_jfsfile_storage_search$">
+                    <query>| tstats max("JFS.value") AS JFS.value from datamodel=NMON_Data_JFS
+where (nodename = JFS.JFSFILE) (JFS.value&gt;=0) (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($device$) (JFS.device=$fsfilter$) groupby _time, host, "JFS.device" prestats=true
+| stats dedup_splitvals=t max("JFS.value") AS JFS.value by _time, host, "JFS.device"
+| rename "JFS.device" AS device, "JFS.value" AS value
+| stats max(value) AS max_value, avg(value) AS avg_value, min(value) AS min_value, latest(value) AS UsedPct by  host, "device"
+| sort limit=0 host
+| eval value=round(value,2)
+| fields host,device,max_value, avg_value, min_value, UsedPct | eval avg_value=round(avg_value,2)</query>
+                    <earliest>$timerange.earliest$</earliest>
+                    <latest>$timerange.latest$</latest>
+                    <refresh>$refresh$</refresh>
+                    <refreshType>delay</refreshType>
+                </search>
+                <option name="wrap">true</option>
+                <option name="rowNumbers">false</option>
+                <option name="dataOverlayMode">none</option>
+                <option name="drilldown">cell</option>
+                <option name="count">$table_count$</option>
+                <option name="refresh.display">none</option>
+                <option name="percentagesRow">false</option>
+                <format type="color" field="max_value">
+                    <colorPalette type="minMidMax" maxColor="#31A35F" minColor="#FFFFFF"></colorPalette>
+                    <scale type="minMidMax"></scale>
+                </format>
+                <format type="color" field="avg_value">
+                    <colorPalette type="minMidMax" maxColor="#31A35F" minColor="#FFFFFF"></colorPalette>
+                    <scale type="minMidMax"></scale>
+                </format>
+                <format type="color" field="min_value">
+                    <colorPalette type="minMidMax" maxColor="#31A35F" minColor="#FFFFFF"></colorPalette>
+                    <scale type="minMidMax"></scale>
+                </format>
+            </table>
+
+            <table id="tablebar2" depends="$start_df_inodes_search$">
                 <title>Latest known values within the period for the following file systems:</title>
                 <search depends="$start_df_inodes_search$">
                     <query>| tstats latest(JFS.storage_inodes) AS storage_inodes, latest(JFS.storage_free_inodes) AS storage_free_inodes, latest(JFS.storage_used_inodes) AS storage_used_inodes, latest(JFS.storage_free_inodes_percent) AS storage_free_inodes_percent, latest(JFS.storage_used_inodes_percent) AS storage_used_inodes_percent from datamodel=NMON_Data_JFS
@@ -578,7 +644,56 @@ where (nodename = JFS.DF_STORAGE) (host=$host-prefilter$) ($frameID$) ($osfilter
 
         </panel>
 
-        <panel id="fs2" depends="$start_df_inodes_search$">
+        <panel id="fs2" depends="$start_jfsfile_storage_search$">
+            <title>File systems utilization evolution over time</title>
+
+            <input type="dropdown" token="df_statsmode" searchWhenChanged="true">
+                <label>calculation mode:</label>
+                <default>latest</default>
+                <choice value="latest">Latest value by time bucket</choice>
+                <choice value="max">Max</choice>
+                <choice value="avg">Avg</choice>
+                <choice value="min">Min</choice>
+                <choice value="median">Median</choice>
+                <choice value="mode">Mode</choice>
+                <choice value="range">Range</choice>
+            </input>
+
+            <chart>
+                <search depends="$start_jfsfile_storage_search$ $charting$">
+                    <query>| tstats max("JFS.value") AS JFS.value from datamodel=NMON_Data_JFS
+where (nodename = JFS.JFSFILE) (JFS.value&gt;=0) (host=$host-prefilter$) ($frameID$) ($osfilter$) ($host$) ($device$) (JFS.device=$fsfilter$) groupby _time, host, "JFS.device" prestats=true span=1m
+| stats dedup_splitvals=t max("JFS.value") AS JFS.value by _time, host, "JFS.device"
+| rename "JFS.*" AS *
+| eval key=host+":"+device
+| timechart $span$ limit=0 useother=f $df_statsmode$(value) As value by key</query>
+                    <earliest>$timerange.earliest$</earliest>
+                    <latest>$timerange.latest$</latest>
+                    <refresh>$refresh$</refresh>
+                    <refreshType>delay</refreshType>
+                </search>
+                <option name="charting.axisTitleX.visibility">visible</option>
+                <option name="charting.axisTitleY.visibility">visible</option>
+                <option name="charting.axisX.scale">linear</option>
+                <option name="charting.axisY.scale">linear</option>
+                <option name="charting.chart">$chart$</option>
+                <option name="charting.chart.nullValueMode">$charting.chart.nullValueMode$</option>
+                <option name="charting.chart.sliceCollapsingThreshold">0.01</option>
+                <option name="charting.chart.stackMode">$chart.stackingmode$</option>
+                <option name="charting.chart.style">shiny</option>
+                <option name="charting.drilldown">all</option>
+                <option name="charting.layout.splitSeries">0</option>
+                <option name="charting.legend.labelStyle.overflowMode">ellipsisMiddle</option>
+                <option name="charting.legend.placement">$charting.legend.placement$</option>
+                <option name="height">680</option>
+                <option name="charting.axisTitleX.text">Time</option>
+                <option name="charting.axisTitleY.text">% Used</option>
+                <option name="charting.axisY.minimumNumber">0</option>
+                <option name="charting.axisY.maximumNumber">100</option>
+            </chart>
+        </panel>
+
+        <panel id="fs3" depends="$start_df_inodes_search$">
             <title>File systems inodes utilization evolution over time</title>
 
             <input type="dropdown" token="df_statsmode" searchWhenChanged="true">