[bamboo] Automated branch merge (from foundation-2016:3ee24c1631ae631…

…6f22015d8e39d1e4058432de8)

opennms-base-assembly/src/main/filtered/etc/log4j2.xml

@@ -144,6 +144,9 @@
     <logger name="com.datastax.driver" additivity="false" level="INFO">
       <appender-ref ref="RoutingAppender"/>
     </logger>
+    <logger name="org.snmp4j.transport" additivity="false" level="ERROR">
+      <appender-ref ref="RoutingAppender"/>
+    </logger>
 
     <!-- Allow any message to pass through the root logger -->
     <root level="DEBUG">

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/akcp-graph.properties

@@ -328,7 +328,7 @@ report.akcp.securityProbe.airflow.command=--title="(Index: {secAirflowIdx}) Airf
  DEF:hcrit={rrd3}:secAirflowHCrit:AVERAGE \
  DEF:lwarn={rrd4}:secAirflowLWarn:AVERAGE \
  DEF:lcrit={rrd5}:secAirflowLCrit:AVERAGE \
- CDEF:lowCrit=0,airflow,GE,0,dcvolt,IF \
+ CDEF:lowCrit=0,airflow,GE,0,airflow,IF \
  CDEF:lowWarn=lcrit,airflow,GE,0,airflow,IF \
  CDEF:normal=lwarn,airflow,GE,0,airflow,IF \
  CDEF:highWarn=hwarn,airflow,GE,0,airflow,IF \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/checkpoint-graph.properties

@@ -24,12 +24,10 @@ report.checkpoint.connections.type=nodeSnmp
 report.checkpoint.connections.command=--title="Connections " \
  DEF:conn={rrd1}:fwNumConn:AVERAGE \
  DEF:peakconn={rrd2}:fwPeakNumConn:AVERAGE \
- DEF:maxPeakconn={rrd2}:fwPeakNumConn:MAX \
  LINE2:conn#000000:"Conn." \
  GPRINT:conn:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:conn:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:conn:MAX:"Max  \\: %8.2lf %s\\n" \
- GPRINT:maxPeakconn:MAX:"Peak  \\: %8.2lf %s\\n"
+ GPRINT:conn:MAX:"Max  \\: %8.2lf %s\\n"
 
 report.checkpoint.pktsAccepted.name=Packets Accepted (CheckPoint)
 report.checkpoint.pktsAccepted.columns=pktsAccepted

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/cisco-graph.properties

@@ -136,7 +136,7 @@ report.cisco.aironet2.authentication.command=--title="Cisco AP Authentication" \
  --vertical-label="Clients" \
  DEF:authen={rrd1}:ciscoApAuthen:AVERAGE \
  DEF:deauthen={rrd2}:ciscoApDeauthen:AVERAGE \
- CDEF:deauthenInv=disassoc,-1,* \
+ CDEF:deauthenInv=deauthen,-1,* \
  AREA:authen#00ff00:"Authenticated  " \
  GPRINT:authen:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:authen:MIN:"Min  \\: %8.2lf %s" \
@@ -856,8 +856,6 @@ report.cisco.memory.command=--title="Cisco Memory Pool" \
  DEF:memUsed={rrd2}:ciscoMemoryPoolUsed:AVERAGE \
  DEF:memFree={rrd3}:ciscoMemoryPoolFree:AVERAGE \
  CDEF:totalMem=memFree,memUsed,+ \
- CDEF:minTotalMem=minMemFree,minMemUsed,+ \
- CDEF:maxTotalMem=maxMemFree,maxMemUsed,+ \
  AREA:memUsed#204a87:"Used    " \
  GPRINT:memUsed:AVERAGE:"Avg  \\: %8.2lf %s" \
  GPRINT:memUsed:MIN:"Min  \\: %8.2lf %s" \
@@ -1137,8 +1135,6 @@ report.cisco.rttmon.jitter.owmax.command=--title="Max One-Way Time (Cisco IP SLA
  DEF:maxSDRaw={rrd2}:jitterOWMaxSD:AVERAGE \
  DEF:numOW={rrd3}:jitterNumOW:AVERAGE \
  CDEF:maxSD=maxSDRaw,-1,* \
- CDEF:minMaxSD=minMaxSDRaw,-1,* \
- CDEF:maxMaxSD=maxMaxSDRaw,-1,* \
  AREA:maxDS#00ff00:"In  " \
  GPRINT:maxDS:AVERAGE:"Avg  \\: %8.2lf %s" \
  GPRINT:maxDS:MIN:"Min  \\: %8.2lf %s" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/dell-openmanage-graph.properties

@@ -58,11 +58,11 @@ report.openmanage.powerusage.type=powerUsageIndex
 report.openmanage.powerusage.propertiesValues=powerUsageEntityName
 report.openmanage.powerusage.command=--title="{powerUsageEntityName}" \
  --vertical-label="Wh" \
- DEF:powerUsageWattage={rrd1}:powerUsageWattage:AVERAGE:3600 \
+ DEF:powerUsageWattage={rrd1}:powerUsageWattage:AVERAGE \
  DEF:powerUsagePeakWatts={rrd2}:powerUsagePeakWatts:AVERAGE \
  AREA:powerUsageWattage#ff00ff:"Wattage" \
  GPRINT:powerUsageWattage:AVERAGE:"Avg  \\: %6.3lf%S" \
  GPRINT:powerUsageWattage:MIN:"Min  \\: %6.3lf%S" \
  GPRINT:powerUsageWattage:MAX:"Max  \\: %6.3lf%S\\n" \
  LINE1:powerUsagePeakWatts#ff0000:"Peak Watts" \
- GPRINT:powerUsagePeakWatts:MAX:"  \\: %3.0lf%s"
+ GPRINT:powerUsagePeakWatts:MAX:"  \\: %3.0lf%s"

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/ericsson-graph.properties

@@ -23,8 +23,6 @@ report.ipworks.dns.uptime.command=--title="IPWorks DNS Service Uptime" \
  --units-exponent 0 \
  DEF:time={rrd1}:ipwksDnsSrvCnfUpTim:AVERAGE \
  CDEF:days=time,86400,/ \
- CDEF:minDays=minTime,86400,/ \
- CDEF:maxDays=maxTime,86400,/ \
  LINE2:days#0000ff:"DNS Uptime (Days)" \
  GPRINT:days:AVERAGE:"Avg  \\: %8.1lf " \
  GPRINT:days:MIN:"Min  \\: %8.1lf " \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/fortinet-fortigate-explicitProxy-v5.2-graph.properties

@@ -53,7 +53,7 @@ report.fortinet.fgExProRequests.columns=fgExProRequests
 report.fortinet.fgExProRequests.type=nodeSnmp
 report.fortinet.fgExProRequests.command=--title="Fortigate Explicit Proxy Requests" \
  --vertical-label="number" \
- DEF:val1={rrd1}:fgExProMemUsage:AVERAGE \
+ DEF:val1={rrd1}:fgExProRequests:AVERAGE \
  LINE1:val1#cc0000:"Requests" \
  GPRINT:val1:AVERAGE:" Avg \\: %8.2lf %s" \
  GPRINT:val1:MIN:"Min \\: %8.2lf %s" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/foundry-graph.properties

@@ -21,8 +21,6 @@ report.foundry.actualTemp.command=--title="Temperature (Celcius)" \
  DEF:fdrwtemp={rrd2}:snChWarnTemp:AVERAGE \
  DEF:fdrstemp={rrd3}:snChShutTemp:AVERAGE \
  CDEF:fdrtmp=fdrtemp,2,/ \
- CDEF:minFdrtmp=minFdrtemp,2,/ \
- CDEF:maxFdrtmp=maxFdrtemp,2,/ \
  CDEF:fdrwtmp=fdrwtemp,2,/ \
  CDEF:fdrstmp=fdrstemp,2,/ \
  LINE2:fdrtmp#00ff00:"Current" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/ipunity-graph.properties

@@ -823,7 +823,7 @@ report.ipunity.um.callsInProgress.command=--title="Calls In Progress (Unified Me
  GPRINT:aaMode:MAX:" Max  \\: %8.2lf %s\\n" \
  COMMENT:"Maximum Concurrent Calls Supported\\n" \
  LINE1:maxCalls#ff0000:"MaxCalls" \
- GPRINT:maxcalls:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:maxCalls:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:maxCalls:MIN:" Min  \\: %8.2lf %s" \
  GPRINT:maxCalls:MAX:" Max  \\: %8.2lf %s\\n"
 

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/jboss-graph.properties

@@ -51,18 +51,18 @@ report.jboss.servletstatus.time.columns=SS_processTime, SS_minTime, SS_maxTime
 report.jboss.servletstatus.time.type=interfaceSnmp
 report.jboss.servletstatus.time.command=--title="Servlet Status - Time" \
  DEF:process={rrd1}:SS_processTime:AVERAGE \
- DEF:mintime={rrd2}:SS_minTIME:AVERAGE \
+ DEF:minTime={rrd2}:SS_minTime:AVERAGE \
  DEF:maxTime={rrd3}:SS_maxTime:AVERAGE \
  LINE2:process#0000ff:"ProcessTime" \
  GPRINT:process:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:process:MIN:"Min  \\: %8.2lf %s" \
  GPRINT:process:MAX:"Max  \\: %8.2lf %s\\n" \
  LINE2:minTime#000ff0:"MinTime    " \
- GPRINT:time:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:minTime:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:minTime:MIN:"Min  \\: %8.2lf %s" \
  GPRINT:minTime:MAX:"Max  \\: %8.2lf %s\\n" \
  LINE2:maxTime#000ff0:"MaxTime    " \
- GPRINT:time:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:maxTime:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:maxTime:MIN:"Min  \\: %8.2lf %s" \
  GPRINT:maxTime:MAX:"Max  \\: %8.2lf %s\\n"
 
@@ -71,15 +71,15 @@ report.jboss.servletstatus.cnt.columns=SS_requests, SS_errors
 report.jboss.servletstatus.cnt.type=interfaceSnmp
 report.jboss.servletstatus.cnt.command=--title="Servlet Status - Counts" \
  DEF:errors={rrd1}:SS_errors:AVERAGE \
- DEF:process={rrd2}:SS_processTime:AVERAGE \
- LINE2:error#0000ff:"Errors     " \
- GPRINT:error:AVERAGE:" Avg  \\: %8.2lf %s" \
- GPRINT:error:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:error:MAX:"Max  \\: %8.2lf %s\\n" \
- LINE2:process#00ff00:"ProcessTime" \
- GPRINT:process:AVERAGE:" Avg  \\: %8.2lf %s" \
- GPRINT:process:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:process:MAX:"Max  \\: %8.2lf %s\\n"
+ DEF:requests={rrd2}:SS_requests:AVERAGE \
+ LINE2:errors#0000ff:"Errors   " \
+ GPRINT:errors:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:errors:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:errors:MAX:"Max  \\: %8.2lf %s\\n" \
+ LINE2:requests#00ff00:"Requests " \
+ GPRINT:requests:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:requests:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:requests:MAX:"Max  \\: %8.2lf %s\\n"
 
 report.jboss.grp.tp.name=GRP_throughput
 report.jboss.grp.tp.columns=GRP_bytesSent, GRP_bytesRec

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/juniper-graph.properties

@@ -180,6 +180,7 @@ report.srx.spuFlowMonitor.propertiesValues=juniSPUMonNodeDescr
 report.srx.spuFlowMonitor.command=--title="Sessions used on node {juniSPUMonNodeDescr}" \
  --vertical-label="Sessions" \
  DEF:currentSessions={rrd1}:juniSPUMonCurrFlow:AVERAGE \
+ DEF:maxSessions={rrd2}:juniSPUMonMaxFlow:AVERAGE \
  CDEF:percentSessions=currentSessions,maxSessions,/,100,* \
  LINE2:currentSessions#0000ff:"Sessions" \
  COMMENT:"\\n" \
@@ -273,9 +274,9 @@ report.erx.temp.command=--title="Temperature" \
  --vertical-label="Celsius" \
  DEF:juniSTValue={rrd1}:juniSTValue:AVERAGE \
  LINE2:juniSTValue#000000:"Temperature" \
- GPRINT:juniSTValue:AVERAGE:"Avg  \\: %3.0f%s" \
- GPRINT:juniSTValue:MIN:"Min  \\: %3.0lf%s" \
- GPRINT:juniSTValue:MAX:"Max  \\: %3.0lf%s\\n"
+ GPRINT:juniSTValue:AVERAGE:"Avg  \\: %3.0lf %s" \
+ GPRINT:juniSTValue:MIN:"Min  \\: %3.0lf %s" \
+ GPRINT:juniSTValue:MAX:"Max  \\: %3.0lf %s\\n"
 
 #####
 ##### Juniper J-Router reports
@@ -295,7 +296,7 @@ report.juniperj.mem.command=--title="Memory Usage (Juniper)" \
  AREA:um#0000ff:"Used Memory" \
  GPRINT:um:AVERAGE:" Avg  \\: %8.0lf" \
  GPRINT:um:MIN:"Min  \\: %8.0lf" \
- GPRINT:um:MAX:"Max  \\: %8.0f\\n" \
+ GPRINT:um:MAX:"Max  \\: %8.0lf\\n" \
  STACK:fm#00ff00:"Total Memory" \
  GPRINT:val1:AVERAGE:"Avg  \\: %8.0lf" \
  GPRINT:val1:MIN:"Min  \\: %8.0lf" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/liebert-graph.properties

@@ -142,7 +142,7 @@ report.liebert.powerPctLoad.type=lgpPwrMeasurementPtIndex
 report.liebert.powerPctLoad.command=--title="Liebert Power - Load" \
  --vertical-label="Percent" \
  --lower-limit=0 --upper-limit=150 \
- DEF:load={rrd1}:lgpPwrPwrFactor:AVERAGE \
+ DEF:load={rrd1}:lgpPwrPctLoad:AVERAGE \
  LINE2:load#0000AA:"Load" \
  GPRINT:load:AVERAGE:"Avg  \\: %3.2lf %s" \
  GPRINT:load:MIN:"Min  \\: %3.2lf %s" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/mcast-graph.properties

@@ -548,7 +548,7 @@ report.mcast.cisco.igmpsnoop.leaves.command=--title="IGMP Snoop - Leave Messages
  --vertical-label="Leave Messages" \
  DEF:rxLeave={rrd1}:cisRxLeaves:AVERAGE \
  DEF:txLeave={rrd2}:cisTxLeaves:AVERAGE \
- CDEF:txLeaveInv=txRpt,-1,* \
+ CDEF:txLeaveInv=txLeave,-1,* \
  AREA:rxLeave#0000ff:"In " \
  GPRINT:rxLeave:AVERAGE:"Avg \\: %8.2lf %s" \
  GPRINT:rxLeave:MIN:"Min \\: %8.2lf %s" \
@@ -827,7 +827,7 @@ report.mcast.juniper.igmp.queries.command=--title="IGMP Proxy Interface Messages
  DEF:v1rptTx={rrd5}:juniIgmpPxIfV1JRpTx:AVERAGE \
  CDEF:v1rptTxInv=v1rptTx,-1,* \
  DEF:v2rptTx={rrd6}:juniIgmpPxIfV2JRpTx:AVERAGE \
- CDEF:v2rptTxInv=v2rtpTx,-1,* \
+ CDEF:v2rptTxInv=v2rptTx,-1,* \
  DEF:leave={rrd7}:juniIgmpPxIfLvRpTx:AVERAGE \
  CDEF:leaveInv=leave,-1,* \
  COMMENT:"Received on {juniIgmpPxIfIpAddr}\\n\\n" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/microsoft-wmi-graph.properties

@@ -245,7 +245,7 @@ report.wmi.net.packets.command=--title="Windows TCP/IP Network Interface - Packe
  GPRINT:wmiIpNetPktsSec:MIN:"Min  \\: %3.2lf %s\\n"
 
 report.wmi.termsvc.sessions.name=Windows Terminal Services Sessions (WMI)
-report.wmi.termsvc.sessions.columns=wmiTSSessActive,wmiTSSessInactive,wmiTSSessTotal,wmiTSSessActive
+report.wmi.termsvc.sessions.columns=wmiTSSessActive,wmiTSSessInactive,wmiTSSessTotal
 report.wmi.termsvc.sessions.type=nodeSnmp
 report.wmi.termsvc.sessions.command=--title="Windows Terminal Services Sessions (WMI)" \
  --lower-limit 0 \
@@ -399,11 +399,11 @@ report.wmi.logdisk.time.command=--title="Percent Logical Disk {wmiLDName} Time (
  AREA:pctread#00ff00:"Read " \
  GPRINT:pctread:AVERAGE:"Avg \\: %10.2lf" \
  GPRINT:pctread:MIN:"Min \\: %10.2lf" \
- GPRINT:maxPctread:MAX:"Max \\: %10.2lf\\n" \
+ GPRINT:pctread:MAX:"Max \\: %10.2lf\\n" \
  STACK:pctwrite#0000ff:"Write" \
  GPRINT:pctwrite:AVERAGE:"Avg \\: %10.2lf" \
  GPRINT:pctwrite:MIN:"Min \\: %10.2lf" \
- GPRINT:maxPctwrite:MAX:"Max \\: %10.2lf\\n"
+ GPRINT:pctwrite:MAX:"Max \\: %10.2lf\\n"
 
 report.wmi.logdisk.splitios.name=Logical Disk Split I/Os (WMI)
 report.wmi.logdisk.splitios.columns=wmiLDSplitIOsPerSec
@@ -483,8 +483,8 @@ report.wmi.w3.requests.command=--title="Windows W3SVC Requests/sec (WMI)" \
  DEF:Put={rrd4}:wmiW3PutReq:AVERAGE \
  AREA:Get#00ff00:"GET" \
  GPRINT:Get:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:get:MIN:"Min \\: %10.2lf %s" \
- GPRINT:get:MAX:"Max \\: %10.2lf %s\\n" \
+ GPRINT:Get:MIN:"Min \\: %10.2lf %s" \
+ GPRINT:Get:MAX:"Max \\: %10.2lf %s\\n" \
  STACK:Head#0000ff:"HEAD" \
  GPRINT:Head:AVERAGE:"Avg \\: %10.2lf %s" \
  GPRINT:Head:MIN:"Min \\: %10.2lf %s" \
@@ -496,4 +496,4 @@ report.wmi.w3.requests.command=--title="Windows W3SVC Requests/sec (WMI)" \
  STACK:Put#ff00ff:"PUT" \
  GPRINT:Put:AVERAGE:"Avg \\: %10.2lf %s" \
  GPRINT:Put:MIN:"Min \\: %10.2lf %s" \
- GPRINT:maxPut:MAX:"Max \\: %10.2lf %s\\n"
+ GPRINT:Put:MAX:"Max \\: %10.2lf %s\\n"

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/nortel-graph.properties

@@ -18,14 +18,14 @@ report.nortel.kernelmem.type=nodeSnmp
 report.nortel.kernelmem.command=--title="Kernel Memory" \
  DEF:buffers={rrd1}:wfkernelBuffersFree:AVERAGE \
  DEF:memory={rrd2}:wfkernelMemoryFree:AVERAGE \
- LINE2:total#0000ff:"Buffers Free" \
- GPRINT:total:AVERAGE:" Avg  \\: %8.2lf %s" \
- GPRINT:total:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:total:MAX:"Max  \\: %8.2lf %s\\n" \
- LINE2:inQueue#ff0000:"Memory Free" \
- GPRINT:inQueue:AVERAGE:"Avg  \\: %8.2lf %s" \
- GPRINT:inQueue:MIN:"Min  \\: %8.2lf %s" \
- GPRINT:inQueue:MAX:"Max  \\: %8.2lf %s\\n"
+ LINE2:buffers#0000ff:"Buffers Free" \
+ GPRINT:buffers:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:buffers:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:buffers:MAX:"Max  \\: %8.2lf %s\\n" \
+ LINE2:memory#ff0000:"Memory Free" \
+ GPRINT:memory:AVERAGE:"Avg  \\: %8.2lf %s" \
+ GPRINT:memory:MIN:"Min  \\: %8.2lf %s" \
+ GPRINT:memory:MAX:"Max  \\: %8.2lf %s\\n"
 
 report.nortel.kerneltasks.name=Kernel Tasks (NORTEL)
 report.nortel.kerneltasks.columns=wfkernelTasksTotal,wfkernelTasksInQue

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/novell-graph.properties

@@ -133,9 +133,9 @@ report.novell.fs.openfiles.command=--title="Open Files (NetWare)" \
  GPRINT:open:MIN:"Min \\: %8.2lf %s" \
  GPRINT:open:MAX:"Max \\: %8.2lf %s\\n" \
  LINE2:max#ff0000:"Max Open" \
- GPRINT::AVERAGE:"Avg \\: %8.2lf %s" \
- GPRINT::MIN:"Min \\: %8.2lf %s" \
- GPRINT::MAX:"Max \\: %8.2lf %s"
+ GPRINT:max:AVERAGE:"Avg \\: %8.2lf %s" \
+ GPRINT:max:MIN:"Min \\: %8.2lf %s" \
+ GPRINT:max:MAX:"Max \\: %8.2lf %s"
 
 report.novell.fs.openfilespct.name=Open Files Utilization (NetWare)
 report.novell.fs.openfilespct.columns=nwFSOpenFiles, nwFSMaxOpenFiles
@@ -163,9 +163,9 @@ report.novell.fs.recordlocks.command=--title="Record Locks (NetWare)" \
  GPRINT:locks:MIN:"Min \\: %8.2lf %s" \
  GPRINT:locks:MAX:"Max \\: %8.2lf %s\\n" \
  LINE2:max#ff0000:"Maximum    " \
- GPRINT::AVERAGE:"Avg \\: %8.2lf %s" \
- GPRINT::MIN:"Min \\: %8.2lf %s" \
- GPRINT::MAX:"Max \\: %8.2lf %s"
+ GPRINT:max:AVERAGE:"Avg \\: %8.2lf %s" \
+ GPRINT:max:MIN:"Min \\: %8.2lf %s" \
+ GPRINT:max:MAX:"Max \\: %8.2lf %s"
 
 report.novell.fs.recordlockspct.name=Record Locks Utilization (NetWare)
 report.novell.fs.recordlockspct.columns=nwFSRecordLocks, nwFSMaxRecordLocks

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/sofaware-embeddedngx-graph.properties

@@ -86,7 +86,7 @@ report.sofaware.embeddedngx.storageCF.type=nodeSnmp
 report.sofaware.embeddedngx.storageCF.command=--title="SofaWare Embedded NGX CF Storage" \
  --vertical-label="Bytes" \
  DEF:cfTotMB={rrd1}:swStorageCFTot:AVERAGE \
- CDEF:cfTot=cfTotMB,1024,*,1024,,* \
+ CDEF:cfTot=cfTotMB,1024,*,1024,* \
  DEF:cfFreeMB={rrd2}:swStorageCFFree:AVERAGE \
  CDEF:cfFree=cfFreeMB,1000000,* \
  LINE2:cfFree#00ff00:"Free " \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/sun-graph.properties

@@ -128,15 +128,15 @@ report.sun.procs.name=System Performance (sun)
 report.sun.procs.columns=sunProcsInRunQueue, sunProcsBlocked, sunProcsInSwap
 report.sun.procs.type=nodeSnmp
 report.sun.procs.command=--title="System Performance" \
- DEF:inQueue={rrd1}:unProcsInRunQueue:AVERAGE \
+ DEF:inQueue={rrd1}:sunProcsInRunQueue:AVERAGE \
  DEF:blocked={rrd2}:sunProcsBlocked:AVERAGE \
  DEF:inSwap={rrd3}:sunProcsInSwap:AVERAGE \
  LINE2:inQueue#0000ff:"Procs in Run Queue" \
  GPRINT:inQueue:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:inQueue:MIN:"Min  \\: %8.2lf %s" \
  GPRINT:inQueue:MAX:"Max  \\: %8.2lf %s\\n" \
  LINE2:blocked#ff0000:"Procs Blocked" \
- GPRINT:blockd:AVERAGE:" Avg  \\: %8.2lf %s" \
+ GPRINT:blocked:AVERAGE:" Avg  \\: %8.2lf %s" \
  GPRINT:blocked:MIN:"Min  \\: %8.2lf %s" \
  GPRINT:blocked:MAX:"Max  \\: %8.2lf %s\\n" \
  LINE2:inSwap#00ff00:"Procs In Swap" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/vmware5-cpu-graph.properties

@@ -64,7 +64,7 @@ report.vmware5.CpuDemandAvg.columns=CpuDemandAvg
 report.vmware5.CpuDemandAvg.type=nodeSnmp
 report.vmware5.CpuDemandAvg.command=--title="CPU Capacity Demand" \
 --vertical-label="Hertz (Hz)" \
---lower-limit="0" \
+--lower-limit=0 \
 DEF:xxx1={rrd1}:CpuDemandAvg:AVERAGE \
 CDEF:xxx=xxx1,1000000,* \
 AREA:xxx#73d216 \
@@ -79,7 +79,7 @@ report.vmware5.CpuLyAvg.columns=CpuLyAvg
 report.vmware5.CpuLyAvg.type=nodeSnmp
 report.vmware5.CpuLyAvg.command=--title="CPU Latency" \
 --vertical-label="percent (%)" \
---lower-limit="0" \
+--lower-limit=0 \
 DEF:xxx={rrd1}:CpuLyAvg:AVERAGE \
 AREA:xxx#ad7fa8 \
 LINE1:xxx#5c3566:"Latency in percent (%)" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/vmware5-datastore-graph.properties

@@ -245,13 +245,13 @@ CDEF:xxx=xxx1,1000,/ \
 CDEF:yyy=yyy1,1000,/ \
 CDEF:negyyy=yyy,-1,* \
 AREA:xxx#8ae234 \
-LINE1:xxx#73d216:"Total read latency in seconds:" \
+LINE1:xxx#73d216:"Total read latency in seconds\\:" \
 COMMENT:"\\n" \
 GPRINT:xxx:AVERAGE:"Avg  \\: %8.2lf %s" \
 GPRINT:xxx:MIN:"Min  \\: %8.2lf %s" \
 GPRINT:xxx:MAX:"Max  \\: %8.2lf %s\\n" \
 AREA:negyyy#729fcf \
-LINE1:negyyy#3465a4:"Total write latency in seconds:" \
+LINE1:negyyy#3465a4:"Total write latency in seconds\\:" \
 COMMENT:"\\n" \
 GPRINT:yyy:AVERAGE:"Avg  \\: %8.2lf %s" \
 GPRINT:yyy:MIN:"Min  \\: %8.2lf %s" \

opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/vmware5-disk-graph.properties

@@ -108,15 +108,15 @@ GPRINT:zzz:AVERAGE:"Avg  \\: %8.2lf %s" \
 GPRINT:zzz:MIN:"Min  \\: %8.2lf %s" \
 GPRINT:zzz:MAX:"Max  \\: %8.2lf %s\\n" \
 COMMENT:"\\n" \
-COMMENT:"Total read latency :" \
+COMMENT:"Total read latency \\:" \
 GPRINT:totRd:AVERAGE:"Avg  \\: %8.2lf %s" \
-GPRINT:totRd:Min:"Avg  \\: %8.2lf %s" \
-GPRINT:totRd:Max:"Avg  \\: %8.2lf %s" \
+GPRINT:totRd:MIN:"Min  \\: %8.2lf %s" \
+GPRINT:totRd:MAX:"Max  \\: %8.2lf %s" \
 COMMENT:"\\n" \
-COMMENT:"Total write latency:" \
+COMMENT:"Total write latency\\:" \
 GPRINT:totWr:AVERAGE:"Avg  \\: %8.2lf %s" \
-GPRINT:totWr:Min:"Avg  \\: %8.2lf %s" \
-GPRINT:totWr:Max:"Avg  \\: %8.2lf %s" \
+GPRINT:totWr:MIN:"Min  \\: %8.2lf %s" \
+GPRINT:totWr:MAX:"Max  \\: %8.2lf %s" \
 HRULE:0#424242
 
 report.vmware5.DiskTotLyAvg.name=DiskTotLyAvg