| {{ .UserID }} |
{{ .UserStats.NumSeries }} |
+ {{ .UserStats.ActiveSeries }} |
{{ printf "%.2f" .UserStats.IngestionRate }} |
{{ printf "%.2f" .UserStats.APIIngestionRate }} |
{{ printf "%.2f" .UserStats.RuleIngestionRate }} |
diff --git a/pkg/distributor/http_server.go b/pkg/distributor/http_server.go
index ba0fb5913db..679e5879c7c 100644
--- a/pkg/distributor/http_server.go
+++ b/pkg/distributor/http_server.go
@@ -12,6 +12,7 @@ type UserStats struct {
NumSeries uint64 `json:"numSeries"`
APIIngestionRate float64 `json:"APIIngestionRate"`
RuleIngestionRate float64 `json:"RuleIngestionRate"`
+ ActiveSeries uint64 `json:"activeSeries"`
}
// UserStatsHandler handles user stats to the Distributor.
diff --git a/pkg/ingester/client/ingester.pb.go b/pkg/ingester/client/ingester.pb.go
index 2a042813f46..67ebbd01ab5 100644
--- a/pkg/ingester/client/ingester.pb.go
+++ b/pkg/ingester/client/ingester.pb.go
@@ -735,6 +735,7 @@ type UserStatsResponse struct {
NumSeries uint64 `protobuf:"varint,2,opt,name=num_series,json=numSeries,proto3" json:"num_series,omitempty"`
ApiIngestionRate float64 `protobuf:"fixed64,3,opt,name=api_ingestion_rate,json=apiIngestionRate,proto3" json:"api_ingestion_rate,omitempty"`
RuleIngestionRate float64 `protobuf:"fixed64,4,opt,name=rule_ingestion_rate,json=ruleIngestionRate,proto3" json:"rule_ingestion_rate,omitempty"`
+ ActiveSeries uint64 `protobuf:"varint,5,opt,name=active_series,json=activeSeries,proto3" json:"active_series,omitempty"`
}
func (m *UserStatsResponse) Reset() { *m = UserStatsResponse{} }
@@ -797,6 +798,13 @@ func (m *UserStatsResponse) GetRuleIngestionRate() float64 {
return 0
}
+func (m *UserStatsResponse) GetActiveSeries() uint64 {
+ if m != nil {
+ return m.ActiveSeries
+ }
+ return 0
+}
+
type UserIDStatsResponse struct {
UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
Data *UserStatsResponse `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
@@ -1444,88 +1452,89 @@ func init() {
func init() { proto.RegisterFile("ingester.proto", fileDescriptor_60f6df4f3586b478) }
var fileDescriptor_60f6df4f3586b478 = []byte{
- // 1296 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x73, 0xd3, 0xc6,
- 0x17, 0xd7, 0xc6, 0x3f, 0xb0, 0x9f, 0x1d, 0xe3, 0x6c, 0x80, 0x18, 0xf1, 0x45, 0x01, 0xcd, 0xf0,
- 0x6d, 0xa6, 0x2d, 0x0e, 0xa4, 0x3f, 0x06, 0xfa, 0x8b, 0x71, 0x20, 0x40, 0x0a, 0x21, 0x20, 0x07,
- 0xda, 0xe9, 0x4c, 0x47, 0x23, 0xdb, 0x8b, 0xa3, 0xa2, 0x5f, 0x48, 0xab, 0x0e, 0xf4, 0xd4, 0x99,
- 0xfe, 0x01, 0xed, 0xf4, 0xd4, 0x53, 0x67, 0x7a, 0xeb, 0xb9, 0x97, 0xde, 0x7a, 0xe6, 0xc8, 0x91,
- 0xe9, 0x81, 0x29, 0xe6, 0xd2, 0x23, 0xfd, 0x0f, 0x3a, 0x5a, 0xad, 0x64, 0x49, 0x91, 0x13, 0x67,
- 0x86, 0xf4, 0x66, 0xbd, 0xf7, 0x79, 0x9f, 0xfd, 0xec, 0xbe, 0xb7, 0xfb, 0x9e, 0xa1, 0xa1, 0x5b,
- 0x43, 0xe2, 0x51, 0xe2, 0xb6, 0x1d, 0xd7, 0xa6, 0x36, 0x2e, 0xf7, 0x6d, 0x97, 0x92, 0x47, 0xe2,
- 0xd9, 0xa1, 0x4e, 0xb7, 0xfd, 0x5e, 0xbb, 0x6f, 0x9b, 0xcb, 0x43, 0x7b, 0x68, 0x2f, 0x33, 0x77,
- 0xcf, 0xbf, 0xcf, 0xbe, 0xd8, 0x07, 0xfb, 0x15, 0x86, 0x89, 0x17, 0x13, 0xf0, 0x90, 0xc1, 0x71,
- 0xed, 0xaf, 0x48, 0x9f, 0xf2, 0xaf, 0x65, 0xe7, 0xc1, 0x30, 0x72, 0xf4, 0xf8, 0x8f, 0x30, 0x54,
- 0xfe, 0x18, 0x6a, 0x0a, 0xd1, 0x06, 0x0a, 0x79, 0xe8, 0x13, 0x8f, 0xe2, 0x36, 0x1c, 0x7a, 0xe8,
- 0x13, 0x57, 0x27, 0x5e, 0x0b, 0x9d, 0x2a, 0x2c, 0xd5, 0x56, 0x8e, 0xb4, 0x39, 0xfc, 0x8e, 0x4f,
- 0xdc, 0xc7, 0x1c, 0xa6, 0x44, 0x20, 0xf9, 0x12, 0xd4, 0xc3, 0x70, 0xcf, 0xb1, 0x2d, 0x8f, 0xe0,
- 0x65, 0x38, 0xe4, 0x12, 0xcf, 0x37, 0x68, 0x14, 0x7f, 0x34, 0x13, 0x1f, 0xe2, 0x94, 0x08, 0x25,
- 0xff, 0x84, 0xa0, 0x9e, 0xa4, 0xc6, 0x6f, 0x03, 0xf6, 0xa8, 0xe6, 0x52, 0x95, 0xea, 0x26, 0xf1,
- 0xa8, 0x66, 0x3a, 0xaa, 0x19, 0x90, 0xa1, 0xa5, 0x82, 0xd2, 0x64, 0x9e, 0xad, 0xc8, 0xb1, 0xe1,
- 0xe1, 0x25, 0x68, 0x12, 0x6b, 0x90, 0xc6, 0xce, 0x30, 0x6c, 0x83, 0x58, 0x83, 0x24, 0xf2, 0x1c,
- 0x54, 0x4c, 0x8d, 0xf6, 0xb7, 0x89, 0xeb, 0xb5, 0x0a, 0xe9, 0xad, 0xdd, 0xd4, 0x7a, 0xc4, 0xd8,
- 0x08, 0x9d, 0x4a, 0x8c, 0x92, 0x7f, 0x41, 0x70, 0x64, 0xed, 0x11, 0x31, 0x1d, 0x43, 0x73, 0xff,
- 0x13, 0x89, 0xe7, 0x77, 0x48, 0x3c, 0x9a, 0x27, 0xd1, 0x4b, 0x68, 0xbc, 0x01, 0xb3, 0xa9, 0x83,
- 0xc5, 0x1f, 0x00, 0xb0, 0x95, 0xf2, 0x72, 0xe8, 0xf4, 0xda, 0xc1, 0x72, 0x5d, 0xe6, 0x5b, 0x2d,
- 0x3e, 0x79, 0xbe, 0x28, 0x28, 0x09, 0xb4, 0xfc, 0x23, 0x82, 0x79, 0xc6, 0xd6, 0xa5, 0x2e, 0xd1,
- 0xcc, 0x98, 0xf3, 0x12, 0xd4, 0xfa, 0xdb, 0xbe, 0xf5, 0x20, 0x45, 0xba, 0x10, 0x49, 0x1b, 0x53,
- 0x5e, 0x0e, 0x40, 0x9c, 0x37, 0x19, 0x91, 0x11, 0x35, 0xb3, 0x2f, 0x51, 0x5d, 0x38, 0x9a, 0x49,
- 0xc2, 0x6b, 0xd8, 0xe9, 0x1f, 0x08, 0x30, 0x3b, 0xd2, 0x7b, 0x9a, 0xe1, 0x13, 0x2f, 0x4a, 0xec,
- 0x49, 0x00, 0x23, 0xb0, 0xaa, 0x96, 0x66, 0x12, 0x96, 0xd0, 0xaa, 0x52, 0x65, 0x96, 0x5b, 0x9a,
- 0x49, 0x26, 0xe4, 0x7d, 0x66, 0x1f, 0x79, 0x2f, 0xec, 0x99, 0xf7, 0xe2, 0x29, 0x34, 0x4d, 0xde,
- 0x2f, 0xc0, 0x7c, 0x4a, 0x3f, 0x3f, 0x93, 0xd3, 0x50, 0x0f, 0x37, 0xf0, 0x35, 0xb3, 0xb3, 0x53,
- 0xa9, 0x2a, 0x35, 0x63, 0x0c, 0x95, 0x3f, 0x81, 0xe3, 0x89, 0xc8, 0x4c, 0xa6, 0xa7, 0x88, 0x7f,
- 0x00, 0x73, 0x37, 0xa3, 0x13, 0xf1, 0x0e, 0xf8, 0x46, 0xc8, 0xef, 0xf1, 0x34, 0xf1, 0xc5, 0xb8,
- 0xca, 0x45, 0xa8, 0x8d, 0xd3, 0x14, 0x89, 0x84, 0x38, 0x4f, 0x9e, 0xfc, 0x21, 0xb4, 0xc6, 0x61,
- 0x99, 0x2d, 0xee, 0x19, 0x8c, 0xa1, 0x79, 0xd7, 0x23, 0x6e, 0x97, 0x6a, 0x34, 0xda, 0x9f, 0xfc,
- 0x3b, 0x82, 0xb9, 0x84, 0x91, 0x53, 0x9d, 0x89, 0xde, 0x6f, 0xdd, 0xb6, 0x54, 0x57, 0xa3, 0x61,
- 0xc9, 0x20, 0x65, 0x36, 0xb6, 0x2a, 0x1a, 0x25, 0x41, 0x55, 0x59, 0xbe, 0xa9, 0xc6, 0xd5, 0x8f,
- 0x96, 0x8a, 0x4a, 0xd5, 0xf2, 0xcd, 0xb0, 0x3a, 0x83, 0xb3, 0xd3, 0x1c, 0x5d, 0xcd, 0x30, 0x15,
- 0x18, 0x53, 0x53, 0x73, 0xf4, 0xf5, 0x14, 0x59, 0x1b, 0xe6, 0x5d, 0xdf, 0x20, 0x59, 0x78, 0x91,
- 0xc1, 0xe7, 0x02, 0x57, 0x0a, 0x2f, 0x7f, 0x09, 0xf3, 0x81, 0xf0, 0xf5, 0x2b, 0x69, 0xe9, 0x0b,
- 0x70, 0xc8, 0xf7, 0x88, 0xab, 0xea, 0x03, 0x5e, 0xe6, 0xe5, 0xe0, 0x73, 0x7d, 0x80, 0xcf, 0x42,
- 0x71, 0xa0, 0x51, 0x8d, 0xc9, 0xac, 0xad, 0x1c, 0x8f, 0xea, 0x70, 0xc7, 0xe6, 0x15, 0x06, 0x93,
- 0xaf, 0x01, 0x0e, 0x5c, 0x5e, 0x9a, 0xfd, 0x3c, 0x94, 0xbc, 0xc0, 0xc0, 0x6f, 0xe5, 0x89, 0x24,
- 0x4b, 0x46, 0x89, 0x12, 0x22, 0xe5, 0xdf, 0x10, 0x48, 0x1b, 0x84, 0xba, 0x7a, 0xdf, 0xbb, 0x6a,
- 0xbb, 0xe9, 0xb2, 0x3f, 0xe0, 0x67, 0xf7, 0x02, 0xd4, 0xa3, 0x7b, 0xa5, 0x7a, 0x84, 0xee, 0xfe,
- 0xf4, 0xd6, 0x22, 0x68, 0x97, 0x50, 0xf9, 0x06, 0x2c, 0x4e, 0xd4, 0xcc, 0x8f, 0x62, 0x09, 0xca,
- 0x26, 0x83, 0xf0, 0xb3, 0x68, 0x8e, 0x5f, 0xa8, 0x30, 0x54, 0xe1, 0x7e, 0xf9, 0x0e, 0x9c, 0x99,
- 0x40, 0x96, 0xa9, 0xe0, 0xe9, 0x29, 0x5b, 0x70, 0x8c, 0x53, 0x6e, 0x10, 0xaa, 0x05, 0x09, 0x8b,
- 0x0a, 0x7a, 0x13, 0x16, 0x76, 0x78, 0x38, 0xfd, 0xbb, 0x50, 0x31, 0xb9, 0x8d, 0x2f, 0xd0, 0xca,
- 0x2e, 0x10, 0xc7, 0xc4, 0x48, 0xf9, 0x1f, 0x04, 0x87, 0x33, 0x9d, 0x20, 0x48, 0xc1, 0x7d, 0xd7,
- 0x36, 0xd5, 0x68, 0xc8, 0x19, 0x57, 0x5b, 0x23, 0xb0, 0xaf, 0x73, 0xf3, 0xfa, 0x20, 0x59, 0x8e,
- 0x33, 0xa9, 0x72, 0xb4, 0xa0, 0xcc, 0xae, 0x66, 0xd4, 0x10, 0xe7, 0xc7, 0x52, 0xd8, 0x11, 0xdd,
- 0xd6, 0x74, 0x77, 0xb5, 0x13, 0xbc, 0xef, 0x7f, 0x3e, 0x5f, 0xdc, 0xd7, 0x18, 0x14, 0xc6, 0x77,
- 0x06, 0x9a, 0x43, 0x89, 0xab, 0xf0, 0x55, 0xf0, 0x5b, 0x50, 0x0e, 0x1b, 0x57, 0xab, 0xc8, 0xd6,
- 0x9b, 0x8d, 0xaa, 0x20, 0xd9, 0xdb, 0x38, 0x44, 0xfe, 0x1e, 0x41, 0x29, 0xdc, 0xe9, 0x41, 0x95,
- 0xa6, 0x08, 0x15, 0x62, 0xf5, 0xed, 0x81, 0x6e, 0x0d, 0xd9, 0x8b, 0x50, 0x52, 0xe2, 0x6f, 0x8c,
- 0xf9, 0x4d, 0x0d, 0xae, 0x7e, 0x9d, 0x5f, 0xc7, 0x0e, 0xcc, 0xa6, 0x2a, 0x27, 0x35, 0xf5, 0xa0,
- 0xa9, 0xa6, 0x1e, 0x15, 0xea, 0x49, 0x0f, 0x3e, 0x03, 0x45, 0xfa, 0xd8, 0x09, 0x9f, 0xb6, 0xc6,
- 0xca, 0x5c, 0x14, 0xcd, 0xdc, 0x5b, 0x8f, 0x1d, 0xa2, 0x30, 0x77, 0xa0, 0x86, 0x35, 0xcd, 0x30,
- 0x7d, 0xec, 0x37, 0x3e, 0x02, 0x25, 0xd6, 0x47, 0x98, 0xf4, 0xaa, 0x12, 0x7e, 0xc8, 0xdf, 0x21,
- 0x68, 0x8c, 0x2b, 0xe5, 0xaa, 0x6e, 0x90, 0xd7, 0x51, 0x28, 0x22, 0x54, 0xee, 0xeb, 0x06, 0x61,
- 0x1a, 0xc2, 0xe5, 0xe2, 0xef, 0xbc, 0x93, 0x7a, 0xf3, 0x53, 0xa8, 0xc6, 0x5b, 0xc0, 0x55, 0x28,
- 0xad, 0xdd, 0xb9, 0xdb, 0xb9, 0xd9, 0x14, 0xf0, 0x2c, 0x54, 0x6f, 0x6d, 0x6e, 0xa9, 0xe1, 0x27,
- 0xc2, 0x87, 0xa1, 0xa6, 0xac, 0x5d, 0x5b, 0xfb, 0x5c, 0xdd, 0xe8, 0x6c, 0x5d, 0xbe, 0xde, 0x9c,
- 0xc1, 0x18, 0x1a, 0xa1, 0xe1, 0xd6, 0x26, 0xb7, 0x15, 0x56, 0x7e, 0xae, 0x40, 0x25, 0xd2, 0x88,
- 0x2f, 0x42, 0xf1, 0xb6, 0xef, 0x6d, 0xe3, 0x63, 0xe3, 0x4a, 0xfd, 0xcc, 0xd5, 0x29, 0xe1, 0x37,
- 0x4f, 0x5c, 0xd8, 0x61, 0x0f, 0xef, 0x9d, 0x2c, 0xe0, 0xf7, 0xa1, 0xc4, 0x46, 0x1c, 0x9c, 0x3b,
- 0x74, 0x8b, 0xf9, 0xa3, 0xb4, 0x2c, 0xe0, 0x2b, 0x50, 0x4b, 0x8c, 0x6d, 0x13, 0xa2, 0x4f, 0xa4,
- 0xac, 0xe9, 0x27, 0x45, 0x16, 0xce, 0x21, 0xbc, 0x09, 0x0d, 0xe6, 0x8a, 0xa6, 0x2d, 0x0f, 0xff,
- 0x2f, 0x0a, 0xc9, 0x9b, 0x82, 0xc5, 0x93, 0x13, 0xbc, 0xb1, 0xac, 0xeb, 0x50, 0x4b, 0x4c, 0x1a,
- 0x58, 0x4c, 0x15, 0x5e, 0x6a, 0xf0, 0x1a, 0x8b, 0xcb, 0x19, 0x6a, 0x64, 0x01, 0xdf, 0xe3, 0x33,
- 0x47, 0x72, 0x66, 0xd9, 0x95, 0xef, 0x74, 0x8e, 0x2f, 0x67, 0xcb, 0x6b, 0x00, 0xe3, 0x39, 0x01,
- 0x1f, 0x4f, 0x05, 0x25, 0xe7, 0x1b, 0x51, 0xcc, 0x73, 0xc5, 0xf2, 0xba, 0xd0, 0xcc, 0x8e, 0x1b,
- 0xbb, 0x91, 0x9d, 0xda, 0xe9, 0xca, 0xd1, 0xb6, 0x0a, 0xd5, 0xb8, 0xe9, 0xe2, 0x56, 0x4e, 0x1f,
- 0x0e, 0xc9, 0x26, 0x77, 0x68, 0x59, 0xc0, 0x57, 0xa1, 0xde, 0x31, 0x8c, 0x69, 0x68, 0xc4, 0xa4,
- 0xc7, 0xcb, 0xf2, 0x18, 0x71, 0xb7, 0xc8, 0xb6, 0x26, 0xfc, 0xff, 0xf8, 0x41, 0xd8, 0xb5, 0x79,
- 0x8b, 0x6f, 0xec, 0x89, 0x8b, 0x57, 0xfb, 0x06, 0x4e, 0xee, 0xda, 0x08, 0xa7, 0x5e, 0xf3, 0xec,
- 0x1e, 0xb8, 0x9c, 0x53, 0xdf, 0x82, 0xc3, 0x99, 0xbe, 0x88, 0xa5, 0x0c, 0x4b, 0xa6, 0x95, 0x8a,
- 0x8b, 0x13, 0xfd, 0x11, 0xef, 0xea, 0x47, 0x4f, 0x5f, 0x48, 0xc2, 0xb3, 0x17, 0x92, 0xf0, 0xea,
- 0x85, 0x84, 0xbe, 0x1d, 0x49, 0xe8, 0xd7, 0x91, 0x84, 0x9e, 0x8c, 0x24, 0xf4, 0x74, 0x24, 0xa1,
- 0xbf, 0x46, 0x12, 0xfa, 0x7b, 0x24, 0x09, 0xaf, 0x46, 0x12, 0xfa, 0xe1, 0xa5, 0x24, 0x3c, 0x7d,
- 0x29, 0x09, 0xcf, 0x5e, 0x4a, 0xc2, 0x17, 0xe5, 0xbe, 0xa1, 0x13, 0x8b, 0xf6, 0xca, 0xec, 0x9f,
- 0xfa, 0x3b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x93, 0x83, 0xdf, 0x59, 0x2d, 0x10, 0x00, 0x00,
+ // 1312 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0xd4, 0xd6,
+ 0x13, 0xf7, 0x4b, 0x76, 0x97, 0xec, 0xec, 0x66, 0xd9, 0xbc, 0x00, 0x59, 0xcc, 0x17, 0x07, 0xfc,
+ 0x15, 0x6d, 0xd4, 0x96, 0x04, 0xd2, 0x1f, 0x82, 0xfe, 0x42, 0x09, 0x04, 0x48, 0x21, 0x04, 0x9c,
+ 0x40, 0xab, 0x4a, 0x95, 0xe5, 0xec, 0x3e, 0x12, 0x17, 0xff, 0xc2, 0x7e, 0x46, 0xd0, 0x53, 0xa5,
+ 0xfe, 0x01, 0xad, 0x7a, 0xea, 0xa9, 0x52, 0x6f, 0x3d, 0xf7, 0x0f, 0xe8, 0x99, 0x23, 0x47, 0x54,
+ 0x55, 0xa8, 0x2c, 0x97, 0x1e, 0xe9, 0x7f, 0x50, 0xf9, 0xfd, 0xf0, 0xda, 0x8e, 0x37, 0x09, 0x12,
+ 0xe9, 0x6d, 0x3d, 0xf3, 0x99, 0xcf, 0xcc, 0x9b, 0x99, 0xf7, 0x66, 0x16, 0x5a, 0xb6, 0xb7, 0x49,
+ 0x22, 0x4a, 0xc2, 0xd9, 0x20, 0xf4, 0xa9, 0x8f, 0x6b, 0x5d, 0x3f, 0xa4, 0xe4, 0xa1, 0x7a, 0x7a,
+ 0xd3, 0xa6, 0x5b, 0xf1, 0xc6, 0x6c, 0xd7, 0x77, 0xe7, 0x36, 0xfd, 0x4d, 0x7f, 0x8e, 0xa9, 0x37,
+ 0xe2, 0xbb, 0xec, 0x8b, 0x7d, 0xb0, 0x5f, 0xdc, 0x4c, 0x3d, 0x9f, 0x81, 0x73, 0x86, 0x20, 0xf4,
+ 0xbf, 0x26, 0x5d, 0x2a, 0xbe, 0xe6, 0x82, 0x7b, 0x9b, 0x52, 0xb1, 0x21, 0x7e, 0x70, 0x53, 0xfd,
+ 0x13, 0x68, 0x18, 0xc4, 0xea, 0x19, 0xe4, 0x7e, 0x4c, 0x22, 0x8a, 0x67, 0xe1, 0xc0, 0xfd, 0x98,
+ 0x84, 0x36, 0x89, 0x3a, 0xe8, 0xc4, 0xe8, 0x4c, 0x63, 0xfe, 0xd0, 0xac, 0x80, 0xdf, 0x8a, 0x49,
+ 0xf8, 0x48, 0xc0, 0x0c, 0x09, 0xd2, 0x2f, 0x40, 0x93, 0x9b, 0x47, 0x81, 0xef, 0x45, 0x04, 0xcf,
+ 0xc1, 0x81, 0x90, 0x44, 0xb1, 0x43, 0xa5, 0xfd, 0xe1, 0x82, 0x3d, 0xc7, 0x19, 0x12, 0xa5, 0xff,
+ 0x84, 0xa0, 0x99, 0xa5, 0xc6, 0xef, 0x00, 0x8e, 0xa8, 0x15, 0x52, 0x93, 0xda, 0x2e, 0x89, 0xa8,
+ 0xe5, 0x06, 0xa6, 0x9b, 0x90, 0xa1, 0x99, 0x51, 0xa3, 0xcd, 0x34, 0xeb, 0x52, 0xb1, 0x12, 0xe1,
+ 0x19, 0x68, 0x13, 0xaf, 0x97, 0xc7, 0x8e, 0x30, 0x6c, 0x8b, 0x78, 0xbd, 0x2c, 0xf2, 0x0c, 0x8c,
+ 0xb9, 0x16, 0xed, 0x6e, 0x91, 0x30, 0xea, 0x8c, 0xe6, 0x8f, 0x76, 0xdd, 0xda, 0x20, 0xce, 0x0a,
+ 0x57, 0x1a, 0x29, 0x4a, 0xff, 0x05, 0xc1, 0xa1, 0xa5, 0x87, 0xc4, 0x0d, 0x1c, 0x2b, 0xfc, 0x4f,
+ 0x42, 0x3c, 0xbb, 0x2d, 0xc4, 0xc3, 0x65, 0x21, 0x46, 0x99, 0x18, 0xaf, 0xc1, 0x78, 0x2e, 0xb1,
+ 0xf8, 0x43, 0x00, 0xe6, 0xa9, 0xac, 0x86, 0xc1, 0xc6, 0x6c, 0xe2, 0x6e, 0x8d, 0xe9, 0x16, 0x2b,
+ 0x8f, 0x9f, 0x4d, 0x2b, 0x46, 0x06, 0xad, 0xff, 0x88, 0x60, 0x92, 0xb1, 0xad, 0xd1, 0x90, 0x58,
+ 0x6e, 0xca, 0x79, 0x01, 0x1a, 0xdd, 0xad, 0xd8, 0xbb, 0x97, 0x23, 0x9d, 0x92, 0xa1, 0x0d, 0x28,
+ 0x2f, 0x26, 0x20, 0xc1, 0x9b, 0xb5, 0x28, 0x04, 0x35, 0xf2, 0x4a, 0x41, 0xad, 0xc1, 0xe1, 0x42,
+ 0x11, 0x5e, 0xc3, 0x49, 0x7f, 0x47, 0x80, 0x59, 0x4a, 0xef, 0x58, 0x4e, 0x4c, 0x22, 0x59, 0xd8,
+ 0xe3, 0x00, 0x4e, 0x22, 0x35, 0x3d, 0xcb, 0x25, 0xac, 0xa0, 0x75, 0xa3, 0xce, 0x24, 0x37, 0x2c,
+ 0x97, 0x0c, 0xa9, 0xfb, 0xc8, 0x2b, 0xd4, 0x7d, 0x74, 0xd7, 0xba, 0x57, 0x4e, 0xa0, 0xbd, 0xd4,
+ 0xfd, 0x1c, 0x4c, 0xe6, 0xe2, 0x17, 0x39, 0x39, 0x09, 0x4d, 0x7e, 0x80, 0x07, 0x4c, 0xce, 0xb2,
+ 0x52, 0x37, 0x1a, 0xce, 0x00, 0xaa, 0x7f, 0x0a, 0x47, 0x33, 0x96, 0x85, 0x4a, 0xef, 0xc1, 0xfe,
+ 0x1e, 0x4c, 0x5c, 0x97, 0x19, 0x89, 0xf6, 0xf9, 0x46, 0xe8, 0xef, 0x8b, 0x32, 0x09, 0x67, 0x22,
+ 0xca, 0x69, 0x68, 0x0c, 0xca, 0x24, 0x83, 0x84, 0xb4, 0x4e, 0x91, 0xfe, 0x11, 0x74, 0x06, 0x66,
+ 0x85, 0x23, 0xee, 0x6a, 0x8c, 0xa1, 0x7d, 0x3b, 0x22, 0xe1, 0x1a, 0xb5, 0xa8, 0x3c, 0x9f, 0xfe,
+ 0x27, 0x82, 0x89, 0x8c, 0x50, 0x50, 0x9d, 0x92, 0xef, 0xb7, 0xed, 0x7b, 0x66, 0x68, 0x51, 0xde,
+ 0x32, 0xc8, 0x18, 0x4f, 0xa5, 0x86, 0x45, 0x49, 0xd2, 0x55, 0x5e, 0xec, 0x9a, 0x69, 0xf7, 0xa3,
+ 0x99, 0x8a, 0x51, 0xf7, 0x62, 0x97, 0x77, 0x67, 0x92, 0x3b, 0x2b, 0xb0, 0xcd, 0x02, 0xd3, 0x28,
+ 0x63, 0x6a, 0x5b, 0x81, 0xbd, 0x9c, 0x23, 0x9b, 0x85, 0xc9, 0x30, 0x76, 0x48, 0x11, 0x5e, 0x61,
+ 0xf0, 0x89, 0x44, 0x95, 0xc7, 0xff, 0x1f, 0xc6, 0xad, 0x2e, 0xb5, 0x1f, 0x10, 0xe9, 0xbf, 0xca,
+ 0xfc, 0x37, 0xb9, 0x90, 0x87, 0xa0, 0x7f, 0x05, 0x93, 0xc9, 0xe9, 0x96, 0x2f, 0xe5, 0xcf, 0x37,
+ 0x05, 0x07, 0xe2, 0x88, 0x84, 0xa6, 0xdd, 0x13, 0x77, 0xa1, 0x96, 0x7c, 0x2e, 0xf7, 0xf0, 0x69,
+ 0xa8, 0xf4, 0x2c, 0x6a, 0xb1, 0xb3, 0x34, 0xe6, 0x8f, 0xca, 0x66, 0xdd, 0x96, 0x21, 0x83, 0xc1,
+ 0xf4, 0x2b, 0x80, 0x13, 0x55, 0x94, 0x67, 0x3f, 0x0b, 0xd5, 0x28, 0x11, 0x88, 0xab, 0x7b, 0x2c,
+ 0xcb, 0x52, 0x88, 0xc4, 0xe0, 0x48, 0xfd, 0x37, 0x04, 0xda, 0x0a, 0xa1, 0xa1, 0xdd, 0x8d, 0x2e,
+ 0xfb, 0x61, 0xfe, 0x6e, 0xec, 0xf3, 0xdb, 0x7c, 0x0e, 0x9a, 0xf2, 0xf2, 0x99, 0x11, 0xa1, 0x3b,
+ 0xbf, 0xcf, 0x0d, 0x09, 0x5d, 0x23, 0x54, 0xbf, 0x06, 0xd3, 0x43, 0x63, 0x16, 0xa9, 0x98, 0x81,
+ 0x9a, 0xcb, 0x20, 0x22, 0x17, 0xed, 0xc1, 0x33, 0xc6, 0x4d, 0x0d, 0xa1, 0xd7, 0x6f, 0xc1, 0xa9,
+ 0x21, 0x64, 0x85, 0x36, 0xdf, 0x3b, 0x65, 0x07, 0x8e, 0x08, 0xca, 0x15, 0x42, 0xad, 0xa4, 0x60,
+ 0xb2, 0xeb, 0x57, 0x61, 0x6a, 0x9b, 0x46, 0xd0, 0xbf, 0x07, 0x63, 0xae, 0x90, 0x09, 0x07, 0x9d,
+ 0xa2, 0x83, 0xd4, 0x26, 0x45, 0xea, 0xff, 0x20, 0x38, 0x58, 0x18, 0x17, 0x49, 0x09, 0xee, 0x86,
+ 0xbe, 0x6b, 0xca, 0x4d, 0x68, 0xd0, 0x6d, 0xad, 0x44, 0xbe, 0x2c, 0xc4, 0xcb, 0xbd, 0x6c, 0x3b,
+ 0x8e, 0xe4, 0xda, 0xd1, 0x83, 0x1a, 0xbb, 0xbf, 0x72, 0x6a, 0x4e, 0x0e, 0x42, 0x61, 0x29, 0xba,
+ 0x69, 0xd9, 0xe1, 0xe2, 0x42, 0x32, 0x04, 0xfe, 0x78, 0x36, 0xfd, 0x4a, 0xbb, 0x12, 0xb7, 0x5f,
+ 0xe8, 0x59, 0x01, 0x25, 0xa1, 0x21, 0xbc, 0xe0, 0xb7, 0xa1, 0xc6, 0xa7, 0x5b, 0xa7, 0xc2, 0xfc,
+ 0x8d, 0xcb, 0x2e, 0xc8, 0x0e, 0x40, 0x01, 0xd1, 0xbf, 0x47, 0x50, 0xe5, 0x27, 0xdd, 0xaf, 0xd6,
+ 0x54, 0x61, 0x8c, 0x78, 0x5d, 0xbf, 0x67, 0x7b, 0x9b, 0xec, 0xd9, 0xa8, 0x1a, 0xe9, 0x37, 0xc6,
+ 0xe2, 0xa6, 0x26, 0xef, 0x43, 0x53, 0x5c, 0xc7, 0x05, 0x18, 0xcf, 0x75, 0x4e, 0x6e, 0x35, 0x42,
+ 0x7b, 0x5a, 0x8d, 0x4c, 0x68, 0x66, 0x35, 0xf8, 0x14, 0x54, 0xe8, 0xa3, 0x80, 0xbf, 0x7f, 0xad,
+ 0xf9, 0x09, 0x69, 0xcd, 0xd4, 0xeb, 0x8f, 0x02, 0x62, 0x30, 0x75, 0x12, 0x0d, 0x9b, 0xac, 0xbc,
+ 0x7c, 0xec, 0x37, 0x3e, 0x04, 0x55, 0x36, 0x6c, 0x58, 0xe8, 0x75, 0x83, 0x7f, 0xe8, 0xdf, 0x21,
+ 0x68, 0x0d, 0x3a, 0xe5, 0xb2, 0xed, 0x90, 0xd7, 0xd1, 0x28, 0x2a, 0x8c, 0xdd, 0xb5, 0x1d, 0xc2,
+ 0x62, 0xe0, 0xee, 0xd2, 0xef, 0xb2, 0x4c, 0xbd, 0xf5, 0x19, 0xd4, 0xd3, 0x23, 0xe0, 0x3a, 0x54,
+ 0x97, 0x6e, 0xdd, 0x5e, 0xb8, 0xde, 0x56, 0xf0, 0x38, 0xd4, 0x6f, 0xac, 0xae, 0x9b, 0xfc, 0x13,
+ 0xe1, 0x83, 0xd0, 0x30, 0x96, 0xae, 0x2c, 0x7d, 0x61, 0xae, 0x2c, 0xac, 0x5f, 0xbc, 0xda, 0x1e,
+ 0xc1, 0x18, 0x5a, 0x5c, 0x70, 0x63, 0x55, 0xc8, 0x46, 0xe7, 0x7f, 0x1e, 0x83, 0x31, 0x19, 0x23,
+ 0x3e, 0x0f, 0x95, 0x9b, 0x71, 0xb4, 0x85, 0x8f, 0x0c, 0x3a, 0xf5, 0xf3, 0xd0, 0xa6, 0x44, 0xdc,
+ 0x3c, 0x75, 0x6a, 0x9b, 0x9c, 0xdf, 0x3b, 0x5d, 0xc1, 0x1f, 0x40, 0x95, 0xed, 0x41, 0xb8, 0x74,
+ 0x33, 0x57, 0xcb, 0xf7, 0x6d, 0x5d, 0xc1, 0x97, 0xa0, 0x91, 0xd9, 0xed, 0x86, 0x58, 0x1f, 0xcb,
+ 0x49, 0xf3, 0x4f, 0x8a, 0xae, 0x9c, 0x41, 0x78, 0x15, 0x5a, 0x4c, 0x25, 0x57, 0xb2, 0x08, 0xff,
+ 0x4f, 0x9a, 0x94, 0xad, 0xca, 0xea, 0xf1, 0x21, 0xda, 0x34, 0xac, 0xab, 0xd0, 0xc8, 0xac, 0x23,
+ 0x58, 0xcd, 0x35, 0x5e, 0x6e, 0x3b, 0x1b, 0x04, 0x57, 0xb2, 0xf9, 0xe8, 0x0a, 0xbe, 0x23, 0x16,
+ 0x93, 0xec, 0x62, 0xb3, 0x23, 0xdf, 0xc9, 0x12, 0x5d, 0xc9, 0x91, 0x97, 0x00, 0x06, 0xcb, 0x04,
+ 0x3e, 0x9a, 0x33, 0xca, 0x2e, 0x41, 0xaa, 0x5a, 0xa6, 0x4a, 0xc3, 0x5b, 0x83, 0x76, 0x71, 0x27,
+ 0xd9, 0x89, 0xec, 0xc4, 0x76, 0x55, 0x49, 0x6c, 0x8b, 0x50, 0x4f, 0x87, 0x2e, 0xee, 0x94, 0xcc,
+ 0x61, 0x4e, 0x36, 0x7c, 0x42, 0xeb, 0x0a, 0xbe, 0x0c, 0xcd, 0x05, 0xc7, 0xd9, 0x0b, 0x8d, 0x9a,
+ 0xd5, 0x44, 0x45, 0x1e, 0x27, 0x9d, 0x16, 0xc5, 0xd1, 0x84, 0xdf, 0x48, 0x1f, 0x84, 0x1d, 0x87,
+ 0xb7, 0xfa, 0xe6, 0xae, 0xb8, 0xd4, 0xdb, 0x37, 0x70, 0x7c, 0xc7, 0x41, 0xb8, 0x67, 0x9f, 0xa7,
+ 0x77, 0xc1, 0x95, 0x64, 0x7d, 0x1d, 0x0e, 0x16, 0xe6, 0x22, 0xd6, 0x0a, 0x2c, 0x85, 0x51, 0xaa,
+ 0x4e, 0x0f, 0xd5, 0x4b, 0xde, 0xc5, 0x8f, 0x9f, 0x3c, 0xd7, 0x94, 0xa7, 0xcf, 0x35, 0xe5, 0xe5,
+ 0x73, 0x0d, 0x7d, 0xdb, 0xd7, 0xd0, 0xaf, 0x7d, 0x0d, 0x3d, 0xee, 0x6b, 0xe8, 0x49, 0x5f, 0x43,
+ 0x7f, 0xf5, 0x35, 0xf4, 0x77, 0x5f, 0x53, 0x5e, 0xf6, 0x35, 0xf4, 0xc3, 0x0b, 0x4d, 0x79, 0xf2,
+ 0x42, 0x53, 0x9e, 0xbe, 0xd0, 0x94, 0x2f, 0x6b, 0x5d, 0xc7, 0x26, 0x1e, 0xdd, 0xa8, 0xb1, 0xbf,
+ 0xf3, 0xef, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x47, 0x07, 0x0a, 0x45, 0x52, 0x10, 0x00, 0x00,
}
func (x MatchType) String() string {
@@ -1986,6 +1995,9 @@ func (this *UserStatsResponse) Equal(that interface{}) bool {
if this.RuleIngestionRate != that1.RuleIngestionRate {
return false
}
+ if this.ActiveSeries != that1.ActiveSeries {
+ return false
+ }
return true
}
func (this *UserIDStatsResponse) Equal(that interface{}) bool {
@@ -2541,12 +2553,13 @@ func (this *UserStatsResponse) GoString() string {
if this == nil {
return "nil"
}
- s := make([]string, 0, 8)
+ s := make([]string, 0, 9)
s = append(s, "&client.UserStatsResponse{")
s = append(s, "IngestionRate: "+fmt.Sprintf("%#v", this.IngestionRate)+",\n")
s = append(s, "NumSeries: "+fmt.Sprintf("%#v", this.NumSeries)+",\n")
s = append(s, "ApiIngestionRate: "+fmt.Sprintf("%#v", this.ApiIngestionRate)+",\n")
s = append(s, "RuleIngestionRate: "+fmt.Sprintf("%#v", this.RuleIngestionRate)+",\n")
+ s = append(s, "ActiveSeries: "+fmt.Sprintf("%#v", this.ActiveSeries)+",\n")
s = append(s, "}")
return strings.Join(s, "")
}
@@ -3882,6 +3895,11 @@ func (m *UserStatsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
+ if m.ActiveSeries != 0 {
+ i = encodeVarintIngester(dAtA, i, uint64(m.ActiveSeries))
+ i--
+ dAtA[i] = 0x28
+ }
if m.RuleIngestionRate != 0 {
i -= 8
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.RuleIngestionRate))))
@@ -4667,6 +4685,9 @@ func (m *UserStatsResponse) Size() (n int) {
if m.RuleIngestionRate != 0 {
n += 9
}
+ if m.ActiveSeries != 0 {
+ n += 1 + sovIngester(uint64(m.ActiveSeries))
+ }
return n
}
@@ -5091,6 +5112,7 @@ func (this *UserStatsResponse) String() string {
`NumSeries:` + fmt.Sprintf("%v", this.NumSeries) + `,`,
`ApiIngestionRate:` + fmt.Sprintf("%v", this.ApiIngestionRate) + `,`,
`RuleIngestionRate:` + fmt.Sprintf("%v", this.RuleIngestionRate) + `,`,
+ `ActiveSeries:` + fmt.Sprintf("%v", this.ActiveSeries) + `,`,
`}`,
}, "")
return s
@@ -6714,6 +6736,25 @@ func (m *UserStatsResponse) Unmarshal(dAtA []byte) error {
v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
iNdEx += 8
m.RuleIngestionRate = float64(math.Float64frombits(v))
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field ActiveSeries", wireType)
+ }
+ m.ActiveSeries = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowIngester
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.ActiveSeries |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipIngester(dAtA[iNdEx:])
diff --git a/pkg/ingester/client/ingester.proto b/pkg/ingester/client/ingester.proto
index 982fed7e194..8e75129ed97 100644
--- a/pkg/ingester/client/ingester.proto
+++ b/pkg/ingester/client/ingester.proto
@@ -97,6 +97,7 @@ message UserStatsResponse {
uint64 num_series = 2;
double api_ingestion_rate = 3;
double rule_ingestion_rate = 4;
+ uint64 active_series = 5;
}
message UserIDStatsResponse {
diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
index d3a7d1eb5ba..8273c5117cf 100644
--- a/pkg/ingester/ingester.go
+++ b/pkg/ingester/ingester.go
@@ -1553,7 +1553,7 @@ func (i *Ingester) UserStats(ctx context.Context, req *client.UserStatsRequest)
return &client.UserStatsResponse{}, nil
}
- return createUserStats(db), nil
+ return createUserStats(db, i.cfg.ActiveSeriesMetricsEnabled), nil
}
// AllUserStats returns ingestion statistics for all users known to this ingester.
@@ -1573,20 +1573,27 @@ func (i *Ingester) AllUserStats(_ context.Context, _ *client.UserStatsRequest) (
for userID, db := range users {
response.Stats = append(response.Stats, &client.UserIDStatsResponse{
UserId: userID,
- Data: createUserStats(db),
+ Data: createUserStats(db, i.cfg.ActiveSeriesMetricsEnabled),
})
}
return response, nil
}
-func createUserStats(db *userTSDB) *client.UserStatsResponse {
+func createUserStats(db *userTSDB, activeSeriesMetricsEnabled bool) *client.UserStatsResponse {
apiRate := db.ingestedAPISamples.Rate()
ruleRate := db.ingestedRuleSamples.Rate()
+
+ var activeSeries uint64
+ if activeSeriesMetricsEnabled {
+ activeSeries = uint64(db.activeSeries.Active())
+ }
+
return &client.UserStatsResponse{
IngestionRate: apiRate + ruleRate,
ApiIngestionRate: apiRate,
RuleIngestionRate: ruleRate,
NumSeries: db.Head().NumSeries(),
+ ActiveSeries: activeSeries,
}
}
diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go
index 7559fb89ff0..748bd194c0f 100644
--- a/pkg/ingester/ingester_test.go
+++ b/pkg/ingester/ingester_test.go
@@ -3193,6 +3193,7 @@ func Test_Ingester_AllUserStats(t *testing.T) {
NumSeries: 3,
ApiIngestionRate: 0.2,
RuleIngestionRate: 0,
+ ActiveSeries: 3,
},
},
{
@@ -3202,6 +3203,7 @@ func Test_Ingester_AllUserStats(t *testing.T) {
NumSeries: 2,
ApiIngestionRate: 0.13333333333333333,
RuleIngestionRate: 0,
+ ActiveSeries: 2,
},
},
}