Cleanup and added CPU statistics and number of CPUs

opennms-config-modules · May 28, 2018 · b295855 · b295855
1 parent 5a8fa5b
commit b295855
Show file tree

Hide file tree

Showing 4 changed files with 180 additions and 129 deletions.
diff --git a/datacollection/netsnmp.disk.dc.xml b/datacollection/netsnmp.disk.dc.xml
@@ -24,69 +24,61 @@
         </storageStrategy>
     </resourceType>
 
-    <!-- Disk I/O is not included by default. To enable add "ucd-diskio" in system definition -->
     <group name="ucd-diskio" ifType="all">
+        <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.9" instance="diskIOIndex" alias="diskIOLA1" type="integer"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.10" instance="diskIOIndex" alias="diskIOLA5" type="integer"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.11" instance="diskIOIndex" alias="diskIOLA15" type="integer"/>
         <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.2" instance="diskIOIndex" alias="diskIODevice" type="string"/>
         <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.3" instance="diskIOIndex" alias="diskIONRead" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.4" instance="diskIOIndex" alias="diskIONWritten" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.5" instance="diskIOIndex" alias="diskIOReads" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.6" instance="diskIOIndex" alias="diskIOWrites" type="counter"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.12" instance="diskIOIndex" alias="diskIONReadX" type="Counter64"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.13.15.1.1.13" instance="diskIOIndex" alias="diskIONWrittenX" type="Counter64"/>
     </group>
 
     <group name="net-snmp-disk" ifType="all">
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.2" instance="dskIndex" alias="ns-dskPath" type="string"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.9.1.3" instance="dskIndex" alias="ns-dskDevice" type="string"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.6" instance="dskIndex" alias="ns-dskTotal" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.7" instance="dskIndex" alias="ns-dskAvail" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.8" instance="dskIndex" alias="ns-dskUsed" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.9" instance="dskIndex" alias="ns-dskPercent" type="gauge"/>
-    </group>
-
-    <group name="net-snmp-disk-more" ifType="all">
-        <mibObj oid=".1.3.6.1.4.1.2021.9.1.3" instance="dskIndex" alias="ns-dskDevice" type="string"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.10" instance="dskIndex" alias="ns-dskPercentNode" type="gauge"/>
-    </group>
-
-    <group name="net-snmp-disk-highlow" ifType="all">
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.11" instance="dskIndex" alias="ns-dskTotalLow" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.12" instance="dskIndex" alias="ns-dskTotalHigh" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.13" instance="dskIndex" alias="ns-dskAvailLow" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.14" instance="dskIndex" alias="ns-dskAvailHigh" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.15" instance="dskIndex" alias="ns-dskUsedLow" type="gauge"/>
         <mibObj oid=".1.3.6.1.4.1.2021.9.1.16" instance="dskIndex" alias="ns-dskUsedHigh" type="gauge"/>
     </group>
+
     <systemDef name="Net-SNMP (UCD) disk">
         <sysoidMask>.1.3.6.1.4.1.2021.250.</sysoidMask>
         <collect>
             <includeGroup>net-snmp-disk</includeGroup>
-            <includeGroup>net-snmp-disk-more</includeGroup>
-            <includeGroup>net-snmp-disk-highlow</includeGroup>
         </collect>
     </systemDef>
 
     <systemDef name="Net-SNMP disk">
         <sysoidMask>.1.3.6.1.4.1.8072.3.</sysoidMask>
         <collect>
+            <includeGroup>ucd-diskio</includeGroup>
             <includeGroup>net-snmp-disk</includeGroup>
-            <includeGroup>net-snmp-disk-more</includeGroup>
-            <includeGroup>net-snmp-disk-highlow</includeGroup>
         </collect>
     </systemDef>
 
     <systemDef name="Net-SNMP 5.5 with sysObjectID bug on i386 disk">
         <sysoid>.1.3</sysoid>
         <collect>
             <includeGroup>net-snmp-disk</includeGroup>
-            <includeGroup>net-snmp-disk-more</includeGroup>
-            <includeGroup>net-snmp-disk-highlow</includeGroup>
         </collect>
     </systemDef>
 
     <systemDef name="Net-SNMP 5.5 with sysObjectID bug on x86_64 disk">
         <sysoid>.0.1</sysoid>
         <collect>
             <includeGroup>net-snmp-disk</includeGroup>
-            <includeGroup>net-snmp-disk-more</includeGroup>
-            <includeGroup>net-snmp-disk-highlow</includeGroup>
         </collect>
     </systemDef>
 </datacollection-group>
diff --git a/datacollection/netsnmp.system.dc.xml b/datacollection/netsnmp.system.dc.xml
@@ -6,7 +6,6 @@
     </group>
 
     <group name="ucd-memory" ifType="ignore">
-        <!-- Total Swap Size configured for the host. -->
         <mibObj oid=".1.3.6.1.4.1.2021.4.3" instance="0" alias="memTotalSwap" type="integer"/>
         <mibObj oid=".1.3.6.1.4.1.2021.4.4" instance="0" alias="memAvailSwap" type="integer"/>
         <mibObj oid=".1.3.6.1.4.1.2021.4.5" instance="0" alias="memTotalReal" type="integer"/>
@@ -33,17 +32,15 @@
         <mibObj oid=".1.3.6.1.4.1.2021.11.56" instance="0" alias="CpuRawInterrupt" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.11.57" instance="0" alias="IORawSent" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.11.58" instance="0" alias="IORawReceived" type="counter"/>
-    </group>
-
-    <group name="ucd-sysstat-raw" ifType="ignore">
         <mibObj oid=".1.3.6.1.4.1.2021.11.59" instance="0" alias="SysRawInterrupts" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.11.60" instance="0" alias="SysRawContext" type="counter"/>
-    </group>
-
-    <group name="ucd-sysstat-raw-more" ifType="ignore">
         <mibObj oid=".1.3.6.1.4.1.2021.11.61" instance="0" alias="CpuRawSoftIRQ" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.11.62" instance="0" alias="RawBlksSwapIn" type="counter"/>
         <mibObj oid=".1.3.6.1.4.1.2021.11.63" instance="0" alias="RawBlksSwapOut" type="counter"/>
+        <mibObj oid=".1.3.6.1.4.1.2021.11.64" instance="0" alias="CpuRawSteal" type="counter" />
+        <mibObj oid=".1.3.6.1.4.1.2021.11.65" instance="0" alias="CpuRawGuest" type="counter" />
+        <mibObj oid=".1.3.6.1.4.1.2021.11.66" instance="0" alias="CpuRawGuestNice" type="counter" />
+        <mibObj oid=".1.3.6.1.4.1.2021.11.67" instance="0" alias="CpuNumCpus" type="integer" />
     </group>
 
     <systemDef name="Net-SNMP (UCD) System">
@@ -52,8 +49,6 @@
             <includeGroup>ucd-loadavg</includeGroup>
             <includeGroup>ucd-memory</includeGroup>
             <includeGroup>ucd-sysstat</includeGroup>
-            <includeGroup>ucd-sysstat-raw</includeGroup>
-            <includeGroup>ucd-sysstat-raw-more</includeGroup>
         </collect>
     </systemDef>
 
@@ -63,8 +58,6 @@
             <includeGroup>ucd-loadavg</includeGroup>
             <includeGroup>ucd-memory</includeGroup>
             <includeGroup>ucd-sysstat</includeGroup>
-            <includeGroup>ucd-sysstat-raw</includeGroup>
-            <includeGroup>ucd-sysstat-raw-more</includeGroup>
         </collect>
     </systemDef>
 
@@ -74,8 +67,6 @@
             <includeGroup>ucd-loadavg</includeGroup>
             <includeGroup>ucd-memory</includeGroup>
             <includeGroup>ucd-sysstat</includeGroup>
-            <includeGroup>ucd-sysstat-raw</includeGroup>
-            <includeGroup>ucd-sysstat-raw-more</includeGroup>
         </collect>
     </systemDef>
 
@@ -85,8 +76,6 @@
             <includeGroup>ucd-loadavg</includeGroup>
             <includeGroup>ucd-memory</includeGroup>
             <includeGroup>ucd-sysstat</includeGroup>
-            <includeGroup>ucd-sysstat-raw</includeGroup>
-            <includeGroup>ucd-sysstat-raw-more</includeGroup>
         </collect>
     </systemDef>
 </datacollection-group>
diff --git a/graphs/netsnmp.disk.graph.properties b/graphs/netsnmp.disk.graph.properties
@@ -11,7 +11,11 @@ netsnmp.diskpercent, \
 netsnmp.diskpercentinode, \
 netsnmp.diskio.bytes, \
 netsnmp.diskio.ops, \
-netsnmp.diskio.opsize
+netsnmp.diskio.opsize, \
+netsnmp.diskio.load1, \
+netsnmp.diskio.load5, \
+netsnmp.diskio.load15, \
+netsnmp.diskio.load.stats
 
 report.netsnmp.disk.name=Net-SNMP Disk Space
 report.netsnmp.disk.columns=ns-dskTotal, ns-dskUsed
@@ -199,3 +203,137 @@ report.netsnmp.diskio.opsize.command=--title="Disk IO Size" \
  GPRINT:writesize:MIN:"Min \\: %10.2lf %s" \
  GPRINT:writesize:MAX:"Max \\: %10.2lf %s\\n"
 
+report.netsnmp.diskio.load1.name="Disk IO Load Average 1 minute"
+report.netsnmp.diskio.load1.columns=diskIOLA1
+report.netsnmp.diskio.load1.type=diskIOIndex
+report.netsnmp.diskio.load1.command=--title="Disk IO Load Average 1 minute" \
+ --vertical-label="percent" \
+ --lower-limit 0 \
+ --upper-limit 105 \
+ DEF:usage={rrd1}:diskIOLA1:AVERAGE \
+ CDEF:usage10=0,usage,GE,0,usage,IF \
+ CDEF:usage20=10,usage,GT,0,usage,IF \
+ CDEF:usage30=20,usage,GT,0,usage,IF \
+ CDEF:usage40=30,usage,GT,0,usage,IF \
+ CDEF:usage50=40,usage,GT,0,usage,IF \
+ CDEF:usage60=50,usage,GT,0,usage,IF \
+ CDEF:usage70=60,usage,GT,0,usage,IF \
+ CDEF:usage80=70,usage,GT,0,usage,IF \
+ CDEF:usage90=80,usage,GT,0,usage,IF \
+ CDEF:usage100=90,usage,GT,0,usage,IF \
+ COMMENT:"\\n" \
+ AREA:usage10#5ca53f:" 0-10%" \
+ AREA:usage20#75b731:"11-20%" \
+ AREA:usage30#90c22f:"21-30%" \
+ AREA:usage40#b8d029:"31-40%" \
+ AREA:usage50#e4e11e:"41-50%" \
+ COMMENT:"\\n" \
+ AREA:usage60#fee610:"51-60%" \
+ AREA:usage70#f4bd1b:"61-70%" \
+ AREA:usage80#eaa322:"71-80%" \
+ AREA:usage90#de6822:"81-90%" \
+ AREA:usage100#d94c20:"91-100%" \
+ COMMENT:"\\n" \
+ COMMENT:" " \
+ COMMENT:"\\n" \
+ LINE1:usage#2e3436:"Disk IO Load in %\\:" \
+ GPRINT:usage:AVERAGE:"Avg\\: %6.2lf %s " \
+ GPRINT:usage:MIN:"Min\\: %6.2lf %s " \
+ GPRINT:usage:MAX:"Max\\: %6.2lf %s \\n"
+
+report.netsnmp.diskio.load5.name="Disk IO Load Average 5 minutes"
+report.netsnmp.diskio.load5.columns=diskIOLA5
+report.netsnmp.diskio.load5.type=diskIOIndex
+report.netsnmp.diskio.load5.command=--title="Disk IO Load Average 5 minutes" \
+ --vertical-label="percent" \
+ --lower-limit 0 \
+ --upper-limit 105 \
+ DEF:usage={rrd1}:diskIOLA5:AVERAGE \
+ CDEF:usage10=0,usage,GE,0,usage,IF \
+ CDEF:usage20=10,usage,GT,0,usage,IF \
+ CDEF:usage30=20,usage,GT,0,usage,IF \
+ CDEF:usage40=30,usage,GT,0,usage,IF \
+ CDEF:usage50=40,usage,GT,0,usage,IF \
+ CDEF:usage60=50,usage,GT,0,usage,IF \
+ CDEF:usage70=60,usage,GT,0,usage,IF \
+ CDEF:usage80=70,usage,GT,0,usage,IF \
+ CDEF:usage90=80,usage,GT,0,usage,IF \
+ CDEF:usage100=90,usage,GT,0,usage,IF \
+ COMMENT:"\\n" \
+ AREA:usage10#5ca53f:" 0-10%" \
+ AREA:usage20#75b731:"11-20%" \
+ AREA:usage30#90c22f:"21-30%" \
+ AREA:usage40#b8d029:"31-40%" \
+ AREA:usage50#e4e11e:"41-50%" \
+ COMMENT:"\\n" \
+ AREA:usage60#fee610:"51-60%" \
+ AREA:usage70#f4bd1b:"61-70%" \
+ AREA:usage80#eaa322:"71-80%" \
+ AREA:usage90#de6822:"81-90%" \
+ AREA:usage100#d94c20:"91-100%" \
+ COMMENT:"\\n" \
+ COMMENT:" " \
+ COMMENT:"\\n" \
+ LINE1:usage#2e3436:"Disk IO Load in %\\:" \
+ GPRINT:usage:AVERAGE:"Avg\\: %6.2lf %s " \
+ GPRINT:usage:MIN:"Min\\: %6.2lf %s " \
+ GPRINT:usage:MAX:"Max\\: %6.2lf %s \\n"
+
+report.netsnmp.diskio.load15.name="Disk IO Load Average 15 minutes"
+report.netsnmp.diskio.load15.columns=diskIOLA15
+report.netsnmp.diskio.load15.type=diskIOIndex
+report.netsnmp.diskio.load15.command=--title="Disk IO Load Average 15 minutes" \
+ --vertical-label="percent" \
+ --lower-limit 0 \
+ --upper-limit 105 \
+ DEF:usage={rrd1}:diskIOLA15:AVERAGE \
+ CDEF:usage10=0,usage,GE,0,usage,IF \
+ CDEF:usage20=10,usage,GT,0,usage,IF \
+ CDEF:usage30=20,usage,GT,0,usage,IF \
+ CDEF:usage40=30,usage,GT,0,usage,IF \
+ CDEF:usage50=40,usage,GT,0,usage,IF \
+ CDEF:usage60=50,usage,GT,0,usage,IF \
+ CDEF:usage70=60,usage,GT,0,usage,IF \
+ CDEF:usage80=70,usage,GT,0,usage,IF \
+ CDEF:usage90=80,usage,GT,0,usage,IF \
+ CDEF:usage100=90,usage,GT,0,usage,IF \
+ COMMENT:"\\n" \
+ AREA:usage10#5ca53f:" 0-10%" \
+ AREA:usage20#75b731:"11-20%" \
+ AREA:usage30#90c22f:"21-30%" \
+ AREA:usage40#b8d029:"31-40%" \
+ AREA:usage50#e4e11e:"41-50%" \
+ COMMENT:"\\n" \
+ AREA:usage60#fee610:"51-60%" \
+ AREA:usage70#f4bd1b:"61-70%" \
+ AREA:usage80#eaa322:"71-80%" \
+ AREA:usage90#de6822:"81-90%" \
+ AREA:usage100#d94c20:"91-100%" \
+ COMMENT:"\\n" \
+ COMMENT:" " \
+ COMMENT:"\\n" \
+ LINE1:usage#2e3436:"Disk IO Load in %\\:" \
+ GPRINT:usage:AVERAGE:"Avg\\: %6.2lf %s " \
+ GPRINT:usage:MIN:"Min\\: %6.2lf %s " \
+ GPRINT:usage:MAX:"Max\\: %6.2lf %s \\n"
+
+report.netsnmp.diskio.load.stats.name=Disk IO Load Average
+report.netsnmp.diskio.load.stats.columns=diskIOLA1, diskIOLA5, diskIOLA15
+report.netsnmp.diskio.load.stats.type=diskIOIndex
+report.netsnmp.diskio.load.stats.command=--title="Disk IO Load Average" \
+ --units-exponent=0 \
+ DEF:avg1={rrd1}:diskIOLA1:AVERAGE \
+ DEF:avg5={rrd2}:diskIOLA5:AVERAGE \
+ DEF:avg15={rrd3}:diskIOLA15:AVERAGE \
+ AREA:avg1#babdb6:"1  minute" \
+ GPRINT:avg1:AVERAGE:"Avg \\: %10.2lf" \
+ GPRINT:avg1:MIN:"Min \\: %10.2lf" \
+ GPRINT:avg1:MAX:"Max \\: %10.2lf\\n" \
+ AREA:avg5#888a85:"5  minute" \
+ GPRINT:avg5:AVERAGE:"Avg \\: %10.2lf" \
+ GPRINT:avg5:MIN:"Min \\: %10.2lf" \
+ GPRINT:avg5:MAX:"Max \\: %10.2lf\\n" \
+ LINE2:avg15#a40000:"15 minute" \
+ GPRINT:avg15:AVERAGE:"Avg \\: %10.2lf" \
+ GPRINT:avg15:MIN:"Min \\: %10.2lf" \
+ GPRINT:avg15:MAX:"Max \\: %10.2lf\\n"