Expose Metrics Port On Lookout, Fix Units Of Ingestion Rate (#3784)

* fix lookout service monitor Signed-off-by: Chris Martin <chris@cmartinit.co.uk> * expose metrics port for lookout, fix lookout ingester message rate Signed-off-by: Chris Martin <chris@cmartinit.co.uk> --------- Signed-off-by: Chris Martin <chris@cmartinit.co.uk> Co-authored-by: Chris Martin <chris@cmartinit.co.uk>
armadaproject · Jul 12, 2024 · b28b399 · b28b399
1 parent 20b6dc3
commit b28b399
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/deployment/lookout-v2/templates/deployment.yaml b/deployment/lookout-v2/templates/deployment.yaml
@@ -53,6 +53,9 @@ spec:
               protocol: TCP
               name: pprof
             {{- end }}
+            - containerPort: {{ .Values.applicationConfig.metricsPort }}
+              protocol: TCP
+              name: metrics
           volumeMounts:
             - name: user-config
               mountPath: /config/application_config.yaml

diff --git a/internal/lookoutingesterv2/metrics/metrics.go b/internal/lookoutingesterv2/metrics/metrics.go
@@ -48,13 +48,15 @@ func Get() *Metrics {
 }
 
 func (m *Metrics) RecordAvRowChangeTime(numRows int, duration time.Duration) {
-	avRowChangeTimeHist.Observe(float64(numRows) / float64(duration.Microseconds()*1000))
+	rowsPerMilli := float64(duration.Milliseconds()) / float64(numRows)
+	avRowChangeTimeHist.Observe(rowsPerMilli)
 }
 
 func (m *Metrics) RecordAvRowChangeTimeByOperation(table string, operation metrics.DBOperation, numRows int, duration time.Duration) {
+	rowsPerMilli := float64(duration.Milliseconds()) / float64(numRows)
 	avRowChangeTimeByOperationHist.
 		With(map[string]string{"table": table, "operation": string(operation)}).
-		Observe(float64(numRows) / float64(duration.Microseconds()*1000))
+		Observe(rowsPerMilli)
 }
 
 func (m *Metrics) RecordRowsChange(table string, operation metrics.DBOperation, numRows int) {