Add timestamp, split MetricName and tenantId
Add rollup type to all Rollups
Refactor from kafka to core module