diamond::generic manifest and updates to match

Based on included config and package defaults this
results in the following metrics:

cpu, diskspace, iostat, loadavg, memory, network vmstat

Used like:

    include diamond::generic

or:

    sudo puppet apply --modulepath=modules \
        manifests/site.pp \
        --execute="include diamond::generic"

Change-Id: I7b5788cbcec7944f9bb72a031ce50d6a175d0d9c
Merge "diamond::generic manifest and updates to match" into production