edit send queue metric

agoda-com · Apr 20, 2020 · a74a737 · a74a737
1 parent 0dab2fc
commit a74a737
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/internal/desiredcomponent/controller.go b/internal/desiredcomponent/controller.go
@@ -6,6 +6,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	crctrl "sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -18,6 +19,7 @@ import (
 	s2herrors "github.com/agoda-com/samsahai/internal/errors"
 	s2hlog "github.com/agoda-com/samsahai/internal/log"
 	"github.com/agoda-com/samsahai/internal/queue"
+	"github.com/agoda-com/samsahai/internal/samsahai/exporter"
 )
 
 const (
@@ -108,6 +110,15 @@ func (c *controller) Reconcile(req reconcile.Request) (reconcile.Result, error)
 		return reconcile.Result{}, err
 	}
 
+	queue := &s2hv1beta1.Queue{}
+	if err = c.client.Get(ctx, types.NamespacedName{
+		Name:      q.Name,
+		Namespace: req.Namespace}, queue); err != nil {
+		logger.Error(err, "cannot get the queue")
+	} else {
+		exporter.SetQueueMetric(queue)
+	}
+
 	comp.Status.UpdatedAt = &now
 	if err := c.client.Update(context.TODO(), comp); err != nil {
 		return reconcile.Result{}, err

diff --git a/internal/samsahai/exporter/metric.go b/internal/samsahai/exporter/metric.go
@@ -36,7 +36,7 @@ var HealthStatusMetric = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 var QueueMetric = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 	Name: "samsahai_queue",
 	Help: "Show components in queue",
-}, []string{ "teamName", "component", "version", "state","order", "no_of_processed"})
+}, []string{"teamName", "component", "version", "state", "order", "no_of_processed"})
 
 var ActivePromotionMetric = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 	Name: "samsahai_active_promotion",

diff --git a/internal/samsahai/internal_process.go b/internal/samsahai/internal_process.go
@@ -260,14 +260,14 @@ func (c *controller) updateTeamDesiredComponent(updateInfo updateTeamDesiredComp
 	}
 
 	// Add metric updateQueueMetric
-	queue := &s2hv1beta1.Queue{}
-	if err = c.client.Get(ctx, types.NamespacedName{
-		Name:      compName,
-		Namespace: compNs}, queue); err != nil {
-		logger.Error(err, "cannot get the queue")
-	} else {
-		exporter.SetQueueMetric(queue)
-	}
+	//queue := &s2hv1beta1.Queue{}
+	//if err = c.client.Get(ctx, types.NamespacedName{
+	//	Name:      compName,
+	//	Namespace: compNs}, queue); err != nil {
+	//	logger.Error(err, "cannot get the queue")
+	//} else {
+	//	exporter.SetQueueMetric(queue)
+	//}
 
 	return nil
 }