Update to latest versions of zapp and metric.tsdb