ensure that metric id is set by mt-gateway

grafana · Feb 26, 2020 · 1971826 · 1971826
1 parent be61fff
commit 1971826
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/cmd/mt-gateway/ingest/metrics.go b/cmd/mt-gateway/ingest/metrics.go
@@ -89,6 +89,7 @@ func prepareIngest(in []*schema.MetricData, toPublish []*schema.MetricData) ([]*
 			promDiscards.Add(m.OrgId, err.Error())
 			continue
 		}
+		m.SetId()
 		metricTimestamp = getMetricsTimestampStat(m.OrgId)
 		metricTimestamp.ValueUint32(uint32(m.Time))
 		toPublish = append(toPublish, m)

diff --git a/publish/kafka/publish.go b/publish/kafka/publish.go
@@ -279,7 +279,6 @@ func (m *mtPublisher) Publish(metrics []*schema.MetricData) error {
 			if m.autoInterval {
 				_, s := m.schemas.Match(metric.Name, 0)
 				metric.Interval = s.Retentions.Rets[0].SecondsPerPoint
-				metric.SetId()
 			} else {
 				log.Error("interval is 0 but can't deduce interval automatically. this should never happen")
 				return errors.New("need to deduce interval but cannot")