remove unnecessary metrics

kubeguard · Jan 20, 2023 · c849ea6 · c849ea6
1 parent 9605f28
commit c849ea6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/authz/providers/azure/rbac/rbac.go b/authz/providers/azure/rbac/rbac.go
@@ -64,8 +64,10 @@ type AuthzInfo struct {
 	ARMEndPoint string
 }
 
-type void struct{}
-type correlationRequestIDKey string
+type (
+	void                    struct{}
+	correlationRequestIDKey string
+)
 
 // AccessInfo allows you to check user access from MS RBAC
 type AccessInfo struct {
@@ -318,7 +320,7 @@ func (a *AccessInfo) CheckAccess(request *authzv1.SubjectAccessReviewSpec) (*aut
 	for _, checkAccessBody := range checkAccessBodies {
 		body := checkAccessBody
 		eg.Go(func() error {
-			//create a request id for every checkaccess request
+			// create a request id for every checkaccess request
 			requestUUID := uuid.New()
 			reqContext := context.WithValue(egCtx, correlationRequestIDKey(correlationRequestIDHeader), []string{requestUUID.String()})
 			err := a.sendCheckAccessRequest(reqContext, checkAccessURL, body, ch)
@@ -383,7 +385,7 @@ func (a *AccessInfo) sendCheckAccessRequest(ctx context.Context, checkAccessURL
 	}
 
 	a.setReqHeaders(req)
-	//set x-ms-correlation-request-id for the checkaccess request
+	// set x-ms-correlation-request-id for the checkaccess request
 	correlationID := ctx.Value(correlationRequestIDKey(correlationRequestIDHeader)).([]string)
 	req.Header[correlationRequestIDHeader] = correlationID
 	internalServerCode := azureutils.ConvertIntToString(http.StatusInternalServerError)

diff --git a/server/server.go b/server/server.go
@@ -233,12 +233,11 @@ func (s Server) ListenAndServe() {
 				operationsMap, err := azureutils.DiscoverResources(settings)
 				discoverResourcesDuration := time.Since(discoverResourcesListStart).Seconds()
 				if err != nil {
-					azureutils.CounterDiscoverResources.WithLabelValues(azureutils.ConvertIntToString(http.StatusInternalServerError)).Inc()
+					azureutils.DiscoverResourcesTotalDuration.Observe(discoverResourcesDuration)
 					klog.Fatalf("Failed to create map of data actions. Error:%s", err)
 				}
 
 				azureutils.DiscoverResourcesTotalDuration.Observe(discoverResourcesDuration)
-				azureutils.CounterDiscoverResources.WithLabelValues(azureutils.ConvertIntToString(http.StatusOK)).Inc()
 				authzhandler.operationsMap = operationsMap
 			}
 		}

diff --git a/util/azure/utils.go b/util/azure/utils.go
@@ -71,22 +71,6 @@ var (
 			Help:    "A histogram of latencies for azure get operations requests.",
 			Buckets: []float64{.25, .5, 1, 2.5, 5, 10, 15, 20},
 		})
-
-	CounterDiscoverResources = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "guard_discover_requests_requests_total",
-			Help: "A counter for discover resources.",
-		},
-		[]string{"code"},
-	)
-
-	counterGetOperationsResources = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "guard_azure_get_operations_requests_total",
-			Help: "A counter for get operations call in discover resources.",
-		},
-		[]string{"code"},
-	)
 )
 
 type TokenResponse struct {
@@ -405,7 +389,6 @@ func fetchDataActionsList(settings *DiscoverResourcesSettings) ([]Operation, err
 
 	resp, err := client.Do(req)
 	if err != nil {
-		counterGetOperationsResources.WithLabelValues(ConvertIntToString(http.StatusInternalServerError)).Inc()
 		return nil, errors.Wrap(err, "Failed to send request for Get Operations call.")
 	}
 	defer resp.Body.Close()
@@ -416,12 +399,9 @@ func fetchDataActionsList(settings *DiscoverResourcesSettings) ([]Operation, err
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		counterGetOperationsResources.WithLabelValues(ConvertIntToString(resp.StatusCode)).Inc()
 		return nil, errors.Errorf("Request failed with status code: %d and response: %s", resp.StatusCode, string(data))
 	}
 
-	counterGetOperationsResources.WithLabelValues(ConvertIntToString(resp.StatusCode)).Inc()
-
 	operationsList := OperationList{}
 	err = json.Unmarshal(data, &operationsList)
 	if err != nil {
@@ -445,5 +425,5 @@ func fetchDataActionsList(settings *DiscoverResourcesSettings) ([]Operation, err
 }
 
 func init() {
-	prometheus.MustRegister(DiscoverResourcesTotalDuration, discoverResourcesAzureCallDuration, discoverResourcesApiServerCallDuration, CounterDiscoverResources)
+	prometheus.MustRegister(DiscoverResourcesTotalDuration, discoverResourcesAzureCallDuration, discoverResourcesApiServerCallDuration)
 }