Looks like the problem is fixed in metrics. My PR is green on travis. Need peer-review and merge of: PR: https://github.com/hawkular/hawkular-agent/pull/147 JIRA: https://issues.jboss.org/browse/HWKAGENT-56 This simplifies some code and ensures when in METRIC mode we send Hawkular-Tenant header but we do NOT send it when in full HAWKULAR mode.