Delete unncessary lines

Delete unncessary lines Signed-off-by: Yuki Tsuboi <[email protected]>
antrea-io · Jun 4, 2020 · 35651c8 · 35651c8
1 parent 8847c4f
commit 35651c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/pkg/agent/metrics/prometheus.go b/pkg/agent/metrics/prometheus.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 package metrics
 
 import (
@@ -25,18 +24,20 @@ import (
 
 var (
 
-	EgressNetworkPolicyCount = metrics.NewGauge(&metrics.GaugeOpts{
-		Name:           "antrea_agent_egress_networkpolicy_rule",
-		Help:           "Number of egress networkpolicy rules on local node which are managed by the Antrea Agent.",
-		StabilityLevel: metrics.STABLE,
-	},
+	EgressNetworkPolicyCount = metrics.NewGauge(
+		&metrics.GaugeOpts{
+			Name:           "antrea_agent_egress_networkpolicy_rule",
+			Help:           "Number of egress networkpolicy rules on local node which are managed by the Antrea Agent.",
+			StabilityLevel: metrics.STABLE,
+		},
 	)
 
-	IngressNetworkPolicyCount = metrics.NewGauge(&metrics.GaugeOpts{
-		Name:           "antrea_agent_ingress_networkpolicy_rule",
-		Help:           "Number of ingress networkpolicy rules on local node which are managed by the Antrea Agent.",
-		StabilityLevel: metrics.STABLE,
-	},
+	IngressNetworkPolicyCount = metrics.NewGauge(
+		&metrics.GaugeOpts{
+			Name:           "antrea_agent_ingress_networkpolicy_rule",
+			Help:           "Number of ingress networkpolicy rules on local node which are managed by the Antrea Agent.",
+			StabilityLevel: metrics.STABLE,
+		},
 	)
 
 	PodCount = metrics.NewGauge(
@@ -61,15 +62,6 @@ var (
 	}, []string{"table_id"})
 )
 
-func InitializePrometheusMetrics() {
-	klog.Info("Initializing prometheus metrics")
-
-	if err := legacyregistry.Register(PodCount); err != nil {
-		klog.Error("Failed to register antrea_agent_local_pod_count with Prometheus")
-	}
-
-)
-
 func InitializePrometheusMetrics() {
 	klog.Info("Initializing prometheus metrics")
 

diff --git a/pkg/agent/openflow/network_policy.go b/pkg/agent/openflow/network_policy.go
@@ -738,7 +738,6 @@ func (c *client) InstallPolicyRuleFlows(ruleID uint32, rule *types.PolicyRule, n
 	if err := c.applyConjunctiveMatchFlows(ctxChanges); err != nil {
 		return err
 	}
-
 	// Add the policyRuleConjunction into policyCache.
 	c.policyCache.Store(ruleID, conj)
 	return nil

diff --git a/test/e2e/prometheus_test.go b/test/e2e/prometheus_test.go
@@ -30,7 +30,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-
 const monitoringNamespace string = "monitoring"
 
 // Agent metrics to validate
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ import ( @@
     	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
     )
     const monitoringNamespace string = "monitoring"
     // Agent metrics to validate
@@ Expand Down @@