Backporting VMware 5 graphs from NMS-6134

Squashed commit of the following:

commit 7bd8056bce11e0b1e1b652ae618306a326be094d
Merge: 7c03a7a dca3e6e
Author: Ronny Trommer <ronny@opennms.org>
Date:   Mon May 26 10:41:37 2014 +0200

    Merge branch 'master' into vmware/graph-improvement

commit 7c03a7ae1418904576b1269743ab52b723815d48
Merge: 4df4cbd 6e34c97
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue May 13 15:14:14 2014 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 4df4cbd8ef54e2f0c9aa56ee9708dec4a9000e54
Merge: c0834ce e45afc5
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Feb 25 02:22:42 2014 +0100

    Merge branch 'master' into vmware-graph-improvement

commit c0834cedb61cb0c8fcd070cd4d50fdbf59f46666
Merge: 3c03245 9176f53
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Feb 25 02:19:49 2014 +0100

    Merge branch 'master' into vmware-graph-improvement

commit 3c032458352e2166d16218a71eb3ccdc16c327e1
Merge: 53bc437 eafaa65
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Dec 4 20:56:15 2013 +0100

    Merge branch 'master' into vmware-graph-improvement

commit 53bc437555c0f2f2c89089df22104f73e7c55067
Merge: d2f0102 95a52bd
Author: Ronny Trommer <ronny@opennms.org>
Date:   Mon Nov 11 16:53:43 2013 +0100

    Merge branch 'master' into vmware-graph-improvement

commit d2f0102a29a8c8b260d59d427e7694a38b09094d
Merge: df2ae05 0875c38
Author: Ronny Trommer <ronny@opennms.org>
Date:   Sun Nov 10 21:11:34 2013 +0100

    Merge branch 'master' into vmware-graph-improvement

commit df2ae054bc32efc02305a7f03bd3c4c68d75b5c8
Merge: 703a6fb 77d18e5
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Oct 29 08:20:53 2013 +0100

    Merge branch 'master' into vmware-graph-improvement

commit 703a6fb0d4ce2114ab5201879fbbe5c64654e271
Merge: 18e8908 0efa7e6
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Oct 22 22:17:19 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 18e89084f6f033912f8ee67d73b3bebff4bda2f9
Merge: 833505c d0efc08
Author: Ronny Trommer <ronny@opennms.org>
Date:   Mon Oct 7 11:14:06 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 833505cc970444af792bbb1d8e10059ee2bc52de
Merge: 117ceaf e18f2ea
Author: Ronny Trommer <ronny@opennms.org>
Date:   Sun Oct 6 17:41:01 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 117ceaf8743772144a4ecfe81f5b9f5bca6f45fd
Merge: 2126b38 96dc8db
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 21:17:31 2013 +0200

    Merged with master

commit 2126b38e99949d36bc2048844806a2e93a35d835
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 21:15:55 2013 +0200

    Fixed unit from millisecond to second

commit 03371afba81df712d8b0c1fb4acaf8e5c3a36686
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 20:18:59 2013 +0200

    Fixed description for Disk SCSI-bus reset graph

commit ed044f2440340d3c1e932a815951636c68f8e824
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 20:15:21 2013 +0200

    Added VMware 5 storage adapter graphs:
    - Number Of Commands
    - Number Requests
    - Read Rate
    - Storage Adapter Latency (Kernel + Device)

commit bcd0842f29a31b28fe7719b3c932041405047252
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 19:47:07 2013 +0200

    Added VMware 5 system counter graphs:
    - Maximum CPU Resource Allocation
    - Resource CPU Allocation Shares
    - CPU Statistics Resource Group
    - Resource CPU usage
    - Resource Memory
    - Resource Memory Allocation Shares
    - Resource Memory Statistics
    - Heartbeat

commit dc8ed2b72f2ae7fccaa1c6c5b5f15c5139bc48c6
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 18:38:23 2013 +0200

    - Removed duplicated graph "Disk SCSI-bus Reset Commands"
    - Finished VMware 5 disk graphs

commit df2e428f25efb7b7efad91a50d8cabfaffdde2ee
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 18:22:04 2013 +0200

    Fixed colors in disk graph for aggregated disk I/O

    VMware CPU graphs finished with adding graph for
    - CPU Idle State
    - CPU Usage
    - CPU System Processes

commit a9dcff5ca0d3622fd6ba56af6e3ccab545de2bf4
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 17:35:57 2013 +0200

    Added VMware 5 CPU utilization graph

commit 04387c9d7e66919b6ad05456ce3d491410b29a7a
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 16:05:37 2013 +0200

    Splitted vmware5 graphs

commit ba04b27e42631800cfacb1f7ac97aa6f6290f999
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 14:26:30 2013 +0200

    Normalized colors and added 0 HRULE to all graphs with negative values.

    VMware 5 graphs added:
    - Memory swap graphs with negative graph for swapped out
    - Network bandwidth graph added for Host-System and each NIC
    - Network packet statistics added
    - Network unknown protocol frames graph added
    - Storage Path Number Read/Write
    - Storage Path Commands
    - Storage Path Latency (Kernel + Device)
    - Average Read/Write Requests per Second
    - Virtual Disk Number of Read/Write Commands
    - Virtual Disk Transfer Rate
    - Virtual Disk Workload Metric
    - Virtual Disk Outstanding Requests
    - Virtual Disk Total Latency (Kernel + Device)

commit fd890e8abc96d00cffee5ba880eb03f94f5cfffc
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 14:19:21 2013 +0200

    Removed net.bytes.rx and net.bytes.tx cause doubled by metric net.received and net.transmitted

commit a928584d8dbe021a96d7fe2f32cc7c3e2522ae51
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Oct 2 09:41:42 2013 +0200

    Missing net.bytesTx.average metric for VMware5 Host-System

commit 1d395bb1226bf435a51616b8d4811bb6c1ddf0e0
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Oct 1 22:08:01 2013 +0200

    Fix NMS-6166: Added missing metrics for VMware 5 Nodes
    - net.droppedRx.summation
    - net.droppedTx.summation
    - net.errorsTx.summation
    - net.multicastTx.summation

commit 4cb40c176ffa2ccadbe8f533c7562c534f58a1c8
Merge: 98e8b1d b676bfc
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Oct 1 19:36:10 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 98e8b1d53aa076a695d75fb1f0dea23a8b7fa9e6
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Oct 1 19:32:21 2013 +0200

    Added graphs for:
    - Absolute Disk Latency
    - Physical Device Latency
    - Kernel Device Latency
    - Maximum Queue Depth
    - Disk Queue Command Latency
    - Queue Read/Write Latency
    - SCSI-bus Reset Commands
    - Disk Commands
    - Disk Read/Write Commands
    - Number of Disk Read/Writes
    - Disk Read/Write Rate
    - Datastore Total Latency (Kernel + Device)

commit b66283564a50cac9e1b700f3d48c066cbd5597b5
Author: Ronny Trommer <ronny@opennms.org>
Date:   Sun Sep 29 00:19:30 2013 +0200

    Removed MemZippedLat

commit 839755c29b68bb63631a1952b6488d757ffdd3d8
Merge: 65e5ab6 ebad204
Author: Ronny Trommer <ronny@opennms.org>
Date:   Sun Sep 29 00:15:39 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 65e5ab61d28a9bd9d2f02ef70a56346cc6764111
Author: Ronny Trommer <ronny@opennms.org>
Date:   Fri Sep 27 15:07:41 2013 +0200

    Added graphs VMware 5 for:

    - CPU Core Utilization
    - Datastore Normalized Latency
    - Datastore Read/Write Rate
    - Datastore IOPS
    - Datastore Read Write Requests per Second
    - Datastore IOPS Aggregated
    - Datastore Max Queue Depth
    - Datastore Normalized Read/Write Latency
    - Datastore Read/Write Bytes
    - Datastore Read/Write I/O Rate
    - Datastore Read/Write Workload Metric
    - Datastore Outstanding Read/Write Requests
    - Average Read/Write Requests Per Second
    - Datastore Read/Write Rate
    - Storage I/O Control Normalized Latency

commit 6327cc87f6a45716b81516d353157180eef4bf01
Merge: 0c768a4 b992d98
Author: Ronny Trommer <ronny@opennms.org>
Date:   Fri Sep 27 14:27:08 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 0c768a4d77f3fb941f173408d0bee506663a1ca3
Merge: 511be58 04ffe7f
Author: Ronny Trommer <ronny@opennms.org>
Date:   Wed Sep 25 07:53:36 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 511be58ff4fd81dd36b58daae6434884bf5864c1
Merge: 7d07f69 9ea5868
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Sep 24 11:45:10 2013 +0200

    Merge branch 'master' into vmware-graph-improvement

commit 7d07f69bdcd324c010c0b59eb62bc842248ff57c
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Sep 24 11:33:03 2013 +0200

    VMware 5 graphs added
    - Co-vCPU Scheduling Contention
    - CPU Ready for Host and VM
    - CPU wait with swap wait
    - Power usage added for VM and Host

    Fix:
    - Order for lines and areas fixed to have better graph rendering

commit 0ff3c56546bc4bf34045e24c6e845590a92173f4
Author: Ronny Trommer <ronny@opennms.org>
Date:   Tue Sep 24 11:32:02 2013 +0200

    Added graph for SensorCounter
    - Hardcoded using 0.01 as unitmodifier for -2

commit 547795c77ee045633c73b222e12790ed7524b0ab
Author: Ronny Trommer <ronny@opennms.org>
Date:   Fri Sep 20 17:04:03 2013 +0200

    Added graphs for VMware 5

    - Memory Low Threshold
    - Memory Reserved Capacity
    - Host Memory Savings
    - Memory Shared With Other VMs
    - Memory Used By Swap
    - Threshold State Level
    - Memory Used by VMKernel Core
    - Total Memory Reservation
    - Memory Unreserved
    - Power Usage: maximum allowed capacity added
    - Storage Adapter Maximum Total Latency
    - Storage Path Maximum Total Latency

commit 4c7ac1eb1c2205f0f2c097591525a11cdb0378f4
Author: Ronny Trommer <ronny@opennms.org>
Date:   Fri Sep 20 11:17:41 2013 +0200

    Replaced generated VMware 5 default graph for:

    - CPU Capacity Demand
    - CPU Capacity Reserved
    - Datastore Highest Latency
    - Highest Latency Across All Disks
    - Aggregated Disk I/O Rate
    - Host-based Replication Network Traffic
    - VM With Host-based Replication Protection
    - Memory Actively Used
    - Memory Actively Written
    - Memory Compression Rate
    - Memory Compressed
    - Memory Consumed
    - Memory Decompression Rate
    - Physical Memory Granted
    - Hostcache Memory Swapped In/Out Rate
    - Hostcache Memory Swapped In/Out
    - Hostcache Memory Swap Used
    - Memory Latency
    - Memory Overhead
    - Memory Shared
    - Memory Swapped In/Out
    - Memory Swap In/Out Rate
    - Memory Usage
    - VM Memory Controller Driver
    - Memory Zero Only
    - Energy Used
    - Power Usage
    - CPU Active Average
    - CPU Active Peak
    - CPU Over Limit Refused
    - CPU Running Average
    - CPU Running Peak
    - Group CPU Sample Count
    - Group CPU Sample Period
    - System Uptime
    - Memory Entitlement
    - Memory Swap Target
    - Total Memory Swapped
    - Memory Saved Zipping
    - Operating System Uptime

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/vmware-datacollection-config.xml
Merge branch 'origin-1.12' into myrepo/1.12