Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(metrics): allow red metrics to be more generic (#17678)

pull/17660/head^2
Lyon Hill 2020-04-08 12:58:36 -06:00 committed by GitHub
parent 179adb0e9b
commit 4728e36e1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kit/metric/client.go
View File

@ -5,7 +5,6 @@ import (
"time"
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
@ -18,7 +17,7 @@ type REDClient struct {
}
// New creates a new REDClient.
func New(reg *prom.Registry, service string) *REDClient {
func New(reg prometheus.Registerer, service string) *REDClient {
// MiddlewareMetrics is a metrics service middleware for the notification endpoint service.
const namespace = "service"

5
tenant/middleware_bucket_metrics.go
View File

@ -2,9 +2,10 @@ package tenant
import (
"context"
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/metric"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
type BucketMetrics struct {
@ -17,7 +18,7 @@ type BucketMetrics struct {
var _ influxdb.BucketService = (*BucketMetrics)(nil)
// NewBucketMetrics returns a metrics service middleware for the Bucket Service.
func NewBucketMetrics(reg *prom.Registry, s influxdb.BucketService, opts ...MetricsOption) *BucketMetrics {
func NewBucketMetrics(reg prometheus.Registerer, s influxdb.BucketService, opts ...MetricsOption) *BucketMetrics {
o := applyOpts(opts...)
return &BucketMetrics{
rec: metric.New(reg, o.applySuffix("bucket")),

4
tenant/middleware_onboarding_metrics.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/metric"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
var _ influxdb.OnboardingService = (*OnboardingMetrics)(nil)
@ -18,7 +18,7 @@ type OnboardingMetrics struct {
}
// NewOnboardingMetrics returns a metrics service middleware for the User Service.
func NewOnboardingMetrics(reg *prom.Registry, s influxdb.OnboardingService, opts ...MetricsOption) *OnboardingMetrics {
func NewOnboardingMetrics(reg prometheus.Registerer, s influxdb.OnboardingService, opts ...MetricsOption) *OnboardingMetrics {
o := applyOpts(opts...)
return &OnboardingMetrics{
rec: metric.New(reg, o.applySuffix("onboard")),

4
tenant/middleware_org_metrics.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/metric"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
type OrgMetrics struct {
@ -18,7 +18,7 @@ type OrgMetrics struct {
var _ influxdb.OrganizationService = (*OrgMetrics)(nil)
// NewOrgMetrics returns a metrics service middleware for the Organization Service.
func NewOrgMetrics(reg *prom.Registry, s influxdb.OrganizationService, opts ...MetricsOption) *OrgMetrics {
func NewOrgMetrics(reg prometheus.Registerer, s influxdb.OrganizationService, opts ...MetricsOption) *OrgMetrics {
o := applyOpts(opts...)
return &OrgMetrics{
rec: metric.New(reg, o.applySuffix("org")),

4
tenant/middleware_urm_metrics.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/metric"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
type UrmMetrics struct {
@ -18,7 +18,7 @@ type UrmMetrics struct {
var _ influxdb.UserResourceMappingService = (*UrmMetrics)(nil)
// NewUrmMetrics returns a metrics service middleware for the User Resource Mapping Service.
func NewUrmMetrics(reg *prom.Registry, s influxdb.UserResourceMappingService, opts ...MetricsOption) *UrmMetrics {
func NewUrmMetrics(reg prometheus.Registerer, s influxdb.UserResourceMappingService, opts ...MetricsOption) *UrmMetrics {
o := applyOpts(opts...)
return &UrmMetrics{
rec: metric.New(reg, o.applySuffix("urm")),

6
tenant/middleware_user_metrics.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/kit/metric"
"github.com/influxdata/influxdb/v2/kit/prom"
"github.com/prometheus/client_golang/prometheus"
)
var _ influxdb.UserService = (*UserMetrics)(nil)
@ -19,7 +19,7 @@ type UserMetrics struct {
}
// NewUserMetrics returns a metrics service middleware for the User Service.
func NewUserMetrics(reg *prom.Registry, s influxdb.UserService, opts ...MetricsOption) *UserMetrics {
func NewUserMetrics(reg prometheus.Registerer, s influxdb.UserService, opts ...MetricsOption) *UserMetrics {
o := applyOpts(opts...)
return &UserMetrics{
rec: metric.New(reg, o.applySuffix("user")),
@ -71,7 +71,7 @@ type PasswordMetrics struct {
}
// NewPasswordMetrics returns a metrics service middleware for the Password Service.
func NewPasswordMetrics(reg *prom.Registry, s influxdb.PasswordsService, opts ...MetricsOption) *PasswordMetrics {
func NewPasswordMetrics(reg prometheus.Registerer, s influxdb.PasswordsService, opts ...MetricsOption) *PasswordMetrics {
o := applyOpts(opts...)
return &PasswordMetrics{
rec: metric.New(reg, o.applySuffix("password")),