source field should default to hostname
Merge branch 'master' of github.com:canaryio/canary