From 9b4e6081996c4d1e91da73f32f5513775b39e62a Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Tue, 30 Mar 2021 00:06:56 +0300
Subject: [PATCH] app/vminsert: return back `type` label to per-tenant metric
`vm_tenant_inserted_rows_total
The `type` label has been removed in the commit 022fe4efd091ab44784a018c0afef325b10388cb
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/932
---
app/vminsert/csvimport/request_handler.go | 9 +++++----
app/vminsert/graphite/request_handler.go | 9 +++++----
app/vminsert/influx/request_handler.go | 9 +++++----
app/vminsert/native/request_handler.go | 9 +++++----
app/vminsert/opentsdb/request_handler.go | 9 +++++----
app/vminsert/opentsdbhttp/request_handler.go | 9 +++++----
app/vminsert/prometheusimport/request_handler.go | 9 +++++----
app/vminsert/promremotewrite/request_handler.go | 9 +++++----
app/vminsert/tenantmetrics/tenant.go | 8 --------
app/vminsert/vmimport/request_handler.go | 9 +++++----
10 files changed, 45 insertions(+), 44 deletions(-)
delete mode 100644 app/vminsert/tenantmetrics/tenant.go
diff --git a/app/vminsert/csvimport/request_handler.go b/app/vminsert/csvimport/request_handler.go
index ece084d81c..c28d54846c 100644
--- a/app/vminsert/csvimport/request_handler.go
+++ b/app/vminsert/csvimport/request_handler.go
@@ -5,18 +5,19 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/csvimport"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="csvimport"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="csvimport"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="csvimport"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="csvimport"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="csvimport"}`)
)
// InsertHandler processes /api/v1/import/csv requests.
@@ -62,7 +63,7 @@ func insertRows(at *auth.Token, rows []parser.Row, extraLabels []prompbmarshal.L
}
}
rowsInserted.Add(len(rows))
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(len(rows))
+ rowsTenantInserted.Get(at).Add(len(rows))
rowsPerInsert.Update(float64(len(rows)))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/graphite/request_handler.go b/app/vminsert/graphite/request_handler.go
index f577aeba31..d849131bf1 100644
--- a/app/vminsert/graphite/request_handler.go
+++ b/app/vminsert/graphite/request_handler.go
@@ -5,17 +5,18 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/graphite"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
"github.com/valyala/fastjson/fastfloat"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="graphite"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="graphite"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="graphite"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="graphite"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="graphite"}`)
)
// InsertHandler processes remote write for graphite plaintext protocol.
@@ -67,7 +68,7 @@ func insertRows(at *auth.Token, rows []parser.Row) error {
}
// Assume that all the rows for a single connection belong to the same (AccountID, ProjectID).
rowsInserted.Add(len(rows))
- tenantmetrics.RowsInsertedByTenant.Get(&atCopy).Add(len(rows))
+ rowsTenantInserted.Get(&atCopy).Add(len(rows))
rowsPerInsert.Update(float64(len(rows)))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/influx/request_handler.go b/app/vminsert/influx/request_handler.go
index b0f06013e8..98344416b5 100644
--- a/app/vminsert/influx/request_handler.go
+++ b/app/vminsert/influx/request_handler.go
@@ -8,7 +8,6 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
@@ -17,6 +16,7 @@ import (
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
"github.com/valyala/fastjson/fastfloat"
@@ -29,8 +29,9 @@ var (
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="influx"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="influx"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="influx"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="influx"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="influx"}`)
)
// InsertHandlerForReader processes remote write for influx line protocol.
@@ -163,7 +164,7 @@ func insertRows(at *auth.Token, db string, rows []parser.Row, extraLabels []prom
}
}
rowsInserted.Add(rowsTotal)
- tenantmetrics.RowsInsertedByTenant.Get(&atCopy).Add(rowsTotal)
+ rowsTenantInserted.Get(&atCopy).Add(rowsTotal)
rowsPerInsert.Update(float64(rowsTotal))
return ic.FlushBufs()
}
diff --git a/app/vminsert/native/request_handler.go b/app/vminsert/native/request_handler.go
index 12c3292cff..6f7150e549 100644
--- a/app/vminsert/native/request_handler.go
+++ b/app/vminsert/native/request_handler.go
@@ -5,20 +5,21 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/native"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="native"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="native"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="native"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="native"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="native"}`)
)
// InsertHandler processes `/api/v1/import/native` request.
@@ -42,7 +43,7 @@ func insertRows(at *auth.Token, block *parser.Block, extraLabels []prompbmarshal
// since relabeling can prevent from inserting the rows.
rowsLen := len(block.Values)
rowsInserted.Add(rowsLen)
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(rowsLen)
+ rowsTenantInserted.Get(at).Add(rowsLen)
rowsPerInsert.Update(float64(rowsLen))
ctx.Reset() // This line is required for initializing ctx internals.
diff --git a/app/vminsert/opentsdb/request_handler.go b/app/vminsert/opentsdb/request_handler.go
index 52287e88ca..fdd5a1fa3c 100644
--- a/app/vminsert/opentsdb/request_handler.go
+++ b/app/vminsert/opentsdb/request_handler.go
@@ -5,17 +5,18 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdb"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
"github.com/valyala/fastjson/fastfloat"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="opentsdb"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="opentsdb"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="opentsdb"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="opentsdb"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="opentsdb"}`)
)
// InsertHandler processes remote write for OpenTSDB put protocol.
@@ -67,7 +68,7 @@ func insertRows(at *auth.Token, rows []parser.Row) error {
}
// Assume that all the rows for a single connection belong to the same (AccountID, ProjectID).
rowsInserted.Add(len(rows))
- tenantmetrics.RowsInsertedByTenant.Get(&atCopy).Add(len(rows))
+ rowsTenantInserted.Get(&atCopy).Add(len(rows))
rowsPerInsert.Update(float64(len(rows)))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/opentsdbhttp/request_handler.go b/app/vminsert/opentsdbhttp/request_handler.go
index e823340004..32d565396f 100644
--- a/app/vminsert/opentsdbhttp/request_handler.go
+++ b/app/vminsert/opentsdbhttp/request_handler.go
@@ -6,19 +6,20 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdbhttp"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="opentsdbhttp"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="opentsdbhttp"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="opentsdbhttp"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="opentsdbhttp"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="opentsdbhttp"}`)
)
// InsertHandler processes HTTP OpenTSDB put requests.
@@ -83,7 +84,7 @@ func insertRows(at *auth.Token, rows []parser.Row, extraLabels []prompbmarshal.L
}
}
rowsInserted.Add(len(rows))
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(len(rows))
+ rowsTenantInserted.Get(at).Add(len(rows))
rowsPerInsert.Update(float64(len(rows)))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/prometheusimport/request_handler.go b/app/vminsert/prometheusimport/request_handler.go
index 75be40dbd0..a580be5861 100644
--- a/app/vminsert/prometheusimport/request_handler.go
+++ b/app/vminsert/prometheusimport/request_handler.go
@@ -5,18 +5,19 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="prometheus"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="prometheus"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="prometheus"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="prometheus"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="prometheus"}`)
)
// InsertHandler processes `/api/v1/import/prometheus` request.
@@ -67,7 +68,7 @@ func insertRows(at *auth.Token, rows []parser.Row, extraLabels []prompbmarshal.L
}
}
rowsInserted.Add(len(rows))
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(len(rows))
+ rowsTenantInserted.Get(at).Add(len(rows))
rowsPerInsert.Update(float64(len(rows)))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/promremotewrite/request_handler.go b/app/vminsert/promremotewrite/request_handler.go
index 40abf414c7..2ee0abc5b1 100644
--- a/app/vminsert/promremotewrite/request_handler.go
+++ b/app/vminsert/promremotewrite/request_handler.go
@@ -5,20 +5,21 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/promremotewrite"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="promremotewrite"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="promremotewrite"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="promremotewrite"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="promremotewrite"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="promremotewrite"}`)
)
// InsertHandler processes remote write for prometheus.
@@ -74,7 +75,7 @@ func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, extraLabels []pr
}
}
rowsInserted.Add(rowsTotal)
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(rowsTotal)
+ rowsTenantInserted.Get(at).Add(rowsTotal)
rowsPerInsert.Update(float64(rowsTotal))
return ctx.FlushBufs()
}
diff --git a/app/vminsert/tenantmetrics/tenant.go b/app/vminsert/tenantmetrics/tenant.go
deleted file mode 100644
index 6df722beb4..0000000000
--- a/app/vminsert/tenantmetrics/tenant.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package tenantmetrics
-
-import "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
-
-var (
- // RowsInsertedByTenant represents per tenant metric rows ingestion statistic.
- RowsInsertedByTenant = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total`)
-)
diff --git a/app/vminsert/vmimport/request_handler.go b/app/vminsert/vmimport/request_handler.go
index 0e8e8eb52d..a3cd4b80a4 100644
--- a/app/vminsert/vmimport/request_handler.go
+++ b/app/vminsert/vmimport/request_handler.go
@@ -5,20 +5,21 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/netstorage"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
- "github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
parserCommon "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common"
parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/vmimport"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+ "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
"github.com/VictoriaMetrics/metrics"
)
var (
- rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="vmimport"}`)
- rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="vmimport"}`)
+ rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="vmimport"}`)
+ rowsTenantInserted = tenantmetrics.NewCounterMap(`vm_tenant_inserted_rows_total{type="vmimport"}`)
+ rowsPerInsert = metrics.NewHistogram(`vm_rows_per_insert{type="vmimport"}`)
)
// InsertHandler processes `/api/v1/import` request.
@@ -77,7 +78,7 @@ func insertRows(at *auth.Token, rows []parser.Row, extraLabels []prompbmarshal.L
}
}
rowsInserted.Add(rowsTotal)
- tenantmetrics.RowsInsertedByTenant.Get(at).Add(rowsTotal)
+ rowsTenantInserted.Get(at).Add(rowsTotal)
rowsPerInsert.Update(float64(rowsTotal))
return ctx.FlushBufs()
}