removes klusters and ids from metrics

BugRoger · BugRoger · commit 70e1503ee5af · 2017-11-27T16:24:48.000+01:00
diff --git a/pkg/controller/base/instrumenting.go b/pkg/controller/base/instrumenting.go
@@ -9,22 +9,36 @@ import (
 
 type InstrumentingReconciler struct {
 	Reconciler
-	ReconciliationCount   *prometheus.CounterVec
-	ReconciliationLatency *prometheus.SummaryVec
+
+	Latency    *prometheus.SummaryVec
+	Total      *prometheus.CounterVec
+	Successful *prometheus.CounterVec
+	Failed     *prometheus.CounterVec
 }
 
 func (ir *InstrumentingReconciler) Reconcile(kluster *v1.Kluster) (requeue bool, err error) {
 	defer func(begin time.Time) {
-		ir.ReconciliationCount.With(
-			prometheus.Labels{
-				"kluster": kluster.Spec.Name,
-				"project": kluster.Account(),
-			}).Add(1)
-		ir.ReconciliationLatency.With(
+		ir.Latency.With(
 			prometheus.Labels{
-				"kluster": kluster.Spec.Name,
-				"project": kluster.Account(),
+				"method": "Reconcile",
 			}).Observe(time.Since(begin).Seconds())
+
+		ir.Total.With(
+			prometheus.Labels{
+				"method": "Reconcile",
+			}).Add(1)
+
+		if err != nil {
+			ir.Failed.With(
+				prometheus.Labels{
+					"method": "Reconcile",
+				}).Add(1)
+		} else {
+			ir.Successful.With(
+				prometheus.Labels{
+					"method": "Reconcile",
+				}).Add(1)
+		}
 	}(time.Now())
 	return ir.Reconciler.Reconcile(kluster)
 }
diff --git a/pkg/controller/launch/controller.go b/pkg/controller/launch/controller.go
@@ -55,8 +55,10 @@ func NewController(factories config.Factories, clients config.Clients, recorder
 	reconciler = &base.EventingReconciler{reconciler}
 	reconciler = &base.InstrumentingReconciler{
 		reconciler,
-		metrics.KlusterReconcilicationCount,
-		metrics.KlusterReconciliationLatency,
+		metrics.LaunchOperationsLatency,
+		metrics.LaunchOperationsTotal,
+		metrics.LaunchSuccessfulOperationsTotal,
+		metrics.LaunchFailedOperationsTotal,
 	}
 
 	return base.NewController(factories, clients, reconciler, logger)
diff --git a/pkg/controller/launch/instrumenting.go b/pkg/controller/launch/instrumenting.go
@@ -0,0 +1,126 @@
+package launch
+
+import (
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+type InstrumentingPoolManager struct {
+	PoolManager PoolManager
+
+	Latency    *prometheus.SummaryVec
+	Total      *prometheus.CounterVec
+	Successful *prometheus.CounterVec
+	Failed     *prometheus.CounterVec
+}
+
+func (pm *InstrumentingPoolManager) GetStatus() (status *PoolStatus, err error) {
+	defer func(begin time.Time) {
+		pm.Latency.With(
+			prometheus.Labels{
+				"method": "GetStatus",
+			}).Observe(time.Since(begin).Seconds())
+
+		pm.Total.With(
+			prometheus.Labels{
+				"method": "GetStatus",
+			}).Add(1)
+
+		if err != nil {
+			pm.Failed.With(
+				prometheus.Labels{
+					"method": "GetStatus",
+				}).Add(1)
+		} else {
+			pm.Successful.With(
+				prometheus.Labels{
+					"method": "GetStatus",
+				}).Add(1)
+		}
+	}(time.Now())
+	return pm.PoolManager.GetStatus()
+}
+
+func (pm *InstrumentingPoolManager) SetStatus(status *PoolStatus) (err error) {
+	defer func(begin time.Time) {
+		pm.Latency.With(
+			prometheus.Labels{
+				"method": "SetStatus",
+			}).Observe(time.Since(begin).Seconds())
+
+		pm.Total.With(
+			prometheus.Labels{
+				"method": "SetStatus",
+			}).Add(1)
+
+		if err != nil {
+			pm.Failed.With(
+				prometheus.Labels{
+					"method": "SetStatus",
+				}).Add(1)
+		} else {
+			pm.Successful.With(
+				prometheus.Labels{
+					"method": "SetStatus",
+				}).Add(1)
+		}
+	}(time.Now())
+	return pm.PoolManager.SetStatus(status)
+}
+
+func (pm *InstrumentingPoolManager) CreateNode() (id string, err error) {
+	defer func(begin time.Time) {
+		pm.Latency.With(
+			prometheus.Labels{
+				"method": "CreateNode",
+			}).Observe(time.Since(begin).Seconds())
+
+		pm.Total.With(
+			prometheus.Labels{
+				"method": "CreateNode",
+			}).Add(1)
+
+		if err != nil {
+			pm.Failed.With(
+				prometheus.Labels{
+					"method": "CreateNode",
+				}).Add(1)
+		} else {
+			pm.Successful.With(
+				prometheus.Labels{
+					"method": "CreateNode",
+				}).Add(1)
+		}
+	}(time.Now())
+
+	return pm.PoolManager.CreateNode()
+}
+
+func (pm *InstrumentingPoolManager) DeleteNode(id string) (err error) {
+	defer func(begin time.Time) {
+		pm.Latency.With(
+			prometheus.Labels{
+				"method": "DeleteNode",
+			}).Observe(time.Since(begin).Seconds())
+
+		pm.Total.With(
+			prometheus.Labels{
+				"method": "DeleteNode",
+			}).Add(1)
+
+		if err != nil {
+			pm.Failed.With(
+				prometheus.Labels{
+					"method": "DeleteNode",
+				}).Add(1)
+		} else {
+			pm.Successful.With(
+				prometheus.Labels{
+					"method": "DeleteNode",
+				}).Add(1)
+		}
+	}(time.Now())
+
+	return pm.PoolManager.DeleteNode(id)
+}
diff --git a/pkg/controller/metrics/launch.go b/pkg/controller/metrics/launch.go
@@ -2,19 +2,35 @@ package metrics
 
 import "github.com/prometheus/client_golang/prometheus"
 
-var KlusterReconcilicationCount = prometheus.NewCounterVec(
+var LaunchOperationsLatency = prometheus.NewSummaryVec(
+	prometheus.SummaryOpts{
+		Namespace: "kubernikus",
+		Subsystem: "launch",
+		Name:      "operation_latency_microseconds",
+		Help:      "Total duration of reconciliation in microseconds.",
+	},
+	[]string{"method"})
+
+var LaunchOperationsTotal = prometheus.NewCounterVec(
 	prometheus.CounterOpts{
 		Namespace: "kubernikus",
 		Subsystem: "launch",
-		Name:      "reconciliation_count",
-		Help:      "Number of reconcilitations."},
-	[]string{"kluster", "project"})
+		Name:      "operation_total",
+		Help:      "Number of operations."},
+	[]string{"method"})
 
-var KlusterReconciliationLatency = prometheus.NewSummaryVec(
-	prometheus.SummaryOpts{
+var LaunchSuccessfulOperationsTotal = prometheus.NewCounterVec(
+	prometheus.CounterOpts{
 		Namespace: "kubernikus",
 		Subsystem: "launch",
-		Name:      "reconciliation_latency_microseconds",
-		Help:      "Total duration of reconciliation in microseconds.",
-	},
-	[]string{"kluster", "project"})
+		Name:      "successful_operation_total",
+		Help:      "Number of successful operations."},
+	[]string{"method"})
+
+var LaunchFailedOperationsTotal = prometheus.NewCounterVec(
+	prometheus.CounterOpts{
+		Namespace: "kubernikus",
+		Subsystem: "launch",
+		Name:      "failed_operation_total",
+		Help:      "Number of failed operations."},
+	[]string{"method"})
diff --git a/pkg/controller/metrics/metrics.go b/pkg/controller/metrics/metrics.go
@@ -147,8 +147,10 @@ func init() {
 		klusterStatusPhase,
 		nodePoolSize,
 		nodePoolStatus,
-		KlusterReconcilicationCount,
-		KlusterReconciliationLatency,
+		LaunchOperationsLatency,
+		LaunchOperationsTotal,
+		LaunchSuccessfulOperationsTotal,
+		LaunchFailedOperationsTotal,
 	)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,10 @@ func init() {`
`147`	`147`	`klusterStatusPhase,`
`148`	`148`	`nodePoolSize,`
`149`	`149`	`nodePoolStatus,`
`150`		`- KlusterReconcilicationCount,`
`151`		`- KlusterReconciliationLatency,`
	`150`	`+ LaunchOperationsLatency,`
	`151`	`+ LaunchOperationsTotal,`
	`152`	`+ LaunchSuccessfulOperationsTotal,`
	`153`	`+ LaunchFailedOperationsTotal,`
`152`	`154`	`)`
`153`	`155`	`}`
`154`	`156`