Merge pull request #22 from wish/mjudsr

add metrics

Author: yinwang-wish

pkg/mongoproxy/plugins/schema/schema.go

@@ -28,11 +28,15 @@ var (
 		Name: "mongoproxy_plugins_schema_config_hash",
 		Help: "The current hash of the schema config file loaded",
 	})
-
 	schemaDeny = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "mongoproxy_plugins_schema_deny_total",
 		Help: "The total deny returns of a command",
 	}, []string{"db", "collection", "command"})
+
+	schemaDenyLogOnly = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "mongoproxy_plugins_schema_deny_logonly_total",
+		Help: "The total deny returns of a command",
+	}, []string{"collection", "command"})
 )
 
 const (
@@ -132,13 +136,11 @@ func (p *SchemaPlugin) Process(ctx context.Context, r *plugins.Request, next plu
 		for _, document := range cmd.Documents {
 			if err := schema.ValidateInsert(ctx, cmd.Database, cmd.Collection, document); err != nil {
 				schemaDeny.WithLabelValues(cmd.Database, cmd.Collection, r.CommandName).Inc()
+				logrus.Warningf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
+					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 				if !p.conf.EnforceSchemaLogOnly {
-					logrus.Errorf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
-						err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 					return mongoerror.DocumentValidationFailure.ErrMessage(err.Error()), nil
 				}
-				logrus.Warningf("ENFORCE SCHEMA LOGONLY: %s, in db: %s, collection: %s, with cmd: %s",
-					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 			}
 		}
 
@@ -148,13 +150,11 @@ func (p *SchemaPlugin) Process(ctx context.Context, r *plugins.Request, next plu
 			logrus.Debugf("command findAndModify: %s", cmd.Update)
 			if err := schema.ValidateUpdate(ctx, cmd.Database, cmd.Collection, cmd.Update, bsonutil.GetBoolDefault(cmd.Upsert, false)); err != nil {
 				schemaDeny.WithLabelValues(cmd.Database, cmd.Collection, r.CommandName).Inc()
+				logrus.Warningf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
+					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 				if !p.conf.EnforceSchemaLogOnly {
-					logrus.Errorf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
-						err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 					return mongoerror.DocumentValidationFailure.ErrMessage(err.Error()), nil
 				}
-				logrus.Warningf("ENFORCE SCHEMA LOGONLY: %s, in db: %s, collection: %s, with cmd: %s",
-					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 			}
 		}
 
@@ -164,13 +164,11 @@ func (p *SchemaPlugin) Process(ctx context.Context, r *plugins.Request, next plu
 			logrus.Debugf("command Update wiht doc: %v", updateDoc)
 			if err := schema.ValidateUpdate(ctx, cmd.Database, cmd.Collection, updateDoc.U, bsonutil.GetBoolDefault(updateDoc.Upsert, false)); err != nil {
 				schemaDeny.WithLabelValues(cmd.Database, cmd.Collection, r.CommandName).Inc()
+				logrus.Warningf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
+					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 				if !p.conf.EnforceSchemaLogOnly {
-					logrus.Errorf("ENFORCE SCHEMA ERROR: %s, in db: %s, collection: %s, with cmd: %s",
-						err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 					return mongoerror.DocumentValidationFailure.ErrMessage(err.Error()), nil
 				}
-				logrus.Warningf("ENFORCE SCHEMA LOGONLY: %s, in db: %s, collection: %s, with cmd: %s",
-					err.Error(), cmd.Database, cmd.Collection, r.CommandName)
 			}
 		}
 	}

pkg/mongoproxy/plugins/schema/types.go

@@ -7,9 +7,6 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-
 	"github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -45,10 +42,6 @@ const (
 )
 
 var OpMap = BuildUpdateOpSet()
-var collectionSchemaLogOnlyDeny = promauto.NewCounterVec(prometheus.CounterOpts{
-	Name: "mongoproxy_plugins_collection_level_logonly_schema_deny_total",
-	Help: "The total deny returns of a command",
-}, []string{"collection", "command"})
 
 type ClusterSchema struct {
 	MongosEndpoint       string              `json:"mongosEndpoint"`
@@ -164,7 +157,7 @@ func (d *Database) ValidateInsert(ctx context.Context, collection string, obj bs
 	}
 	if c.EnforceSchemaByCollectionLogOnly {
 		if err := c.ValidateInsert(ctx, obj); err != nil {
-			collectionSchemaLogOnlyDeny.WithLabelValues(collection, "insert").Inc()
+			schemaDenyLogOnly.WithLabelValues(collection, "insert").Inc()
 			logrus.Errorf("COLLECTION ENFORCE LOG ONLY: %s", err.Error())
 			return nil
 		}
@@ -184,7 +177,7 @@ func (d *Database) ValidateUpdate(ctx context.Context, collection string, obj bs
 	}
 	if c.EnforceSchemaByCollectionLogOnly {
 		if err := c.ValidateUpdate(ctx, obj, upsert); err != nil {
-			collectionSchemaLogOnlyDeny.WithLabelValues(collection, "update").Inc()
+			schemaDenyLogOnly.WithLabelValues(collection, "update").Inc()
 			logrus.Errorf("COLLECTION ENFORCE LOG ONLY: %s", err.Error())
 			return nil
 		}