Merge branch 'master' into conflicting-schema

open-policy-agent · Jul 13, 2021 · 67cef0d · 67cef0d
2 parents e90c987 + 786e2db
commit 67cef0d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/pkg/webhook/stats_reporter.go b/pkg/webhook/stats_reporter.go
@@ -11,9 +11,6 @@ import (
 )
 
 const (
-	requestCountMetricName    = "request_count"
-	requestDurationMetricName = "request_duration_seconds"
-
 	validationRequestCountMetricName    = "validation_request_count"
 	validationRequestDurationMetricName = "validation_request_duration_seconds"
 
@@ -22,11 +19,6 @@ const (
 )
 
 var (
-	responseTimeInSecM = stats.Float64(
-		requestDurationMetricName,
-		"The response time in seconds",
-		stats.UnitSeconds)
-
 	validationResponseTimeInSecM = stats.Float64(
 		validationRequestDurationMetricName,
 		"The response time in seconds",
@@ -71,9 +63,6 @@ func newStatsReporter() (StatsReporter, error) {
 }
 
 func (r *reporter) ReportValidationRequest(response requestResponse, d time.Duration) error {
-	if err := r.reportRequest(response, admissionStatusKey, responseTimeInSecM.M(d.Seconds())); err != nil {
-		return err
-	}
 	return r.reportRequest(response, admissionStatusKey, validationResponseTimeInSecM.M(d.Seconds()))
 }
 
@@ -100,20 +89,6 @@ func (r *reporter) report(ctx context.Context, m stats.Measurement) error {
 
 func register() error {
 	views := []*view.View{
-		{
-			Name:        requestCountMetricName,
-			Description: "The number of requests that are routed to validation webhook",
-			Measure:     responseTimeInSecM,
-			Aggregation: view.Count(),
-			TagKeys:     []tag.Key{admissionStatusKey},
-		},
-		{
-			Name:        requestDurationMetricName,
-			Description: responseTimeInSecM.Description(),
-			Measure:     responseTimeInSecM,
-			Aggregation: view.Distribution(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.02, 0.03, 0.04, 0.05),
-			TagKeys:     []tag.Key{admissionStatusKey},
-		},
 		{
 			Name:        validationRequestCountMetricName,
 			Description: "The number of requests that are routed to validation webhook",

diff --git a/pkg/webhook/stats_reporter_test.go b/pkg/webhook/stats_reporter_test.go
@@ -31,7 +31,6 @@ func TestValidationReportRequest(t *testing.T) {
 	if err != nil {
 		t.Errorf("ReportRequest error %v", err)
 	}
-	check(t, expectedTags, requestCountMetricName, requestDurationMetricName)
 	check(t, expectedTags, validationRequestCountMetricName, validationRequestDurationMetricName)
 }
 

diff --git a/website/docs/metrics.md b/website/docs/metrics.md
@@ -53,19 +53,39 @@ Below are the list of metrics provided by Gatekeeper:
 
 ## Webhook
 
-- Name: `request_count`
+- Name: `validation_request_count`
 
-    Description: `The number of requests that are routed to webhook`
+    Description: `The number of requests that are routed to validation webhook`
 
     Tags:
 
     - `admission_status`: [`allow`, `deny`]
 
     Aggregation: `Count`
 
-- Name: `request_duration_seconds`
+- Name: `validation_request_duration_seconds`
 
-    Description: `The response time in seconds`
+    Description: `The validation webhook response time in seconds`
+
+    Tags:
+
+    - `admission_status`: [`allow`, `deny`]
+
+    Aggregation: `Distribution`
+
+- Name: `mutation_request_count`
+
+    Description: `The number of requests that are routed to mutation webhook`
+
+    Tags:
+
+    - `admission_status`: [`allow`, `deny`]
+
+    Aggregation: `Count`
+
+- Name: `mutation_request_duration_seconds`
+
+    Description: `The mutation webhook response time in seconds`
 
     Tags: