Merge branch 'main' into detail-error-mssg

numaproj · Jan 8, 2025 · 1a314f5 · 1a314f5
2 parents c7164a9 + 5f5af1b
commit 1a314f5
Show file tree

Hide file tree

Showing 11 changed files with 243 additions and 42 deletions.
diff --git a/config/advanced-install/namespaced-numaflow-server.yaml b/config/advanced-install/namespaced-numaflow-server.yaml
@@ -156,6 +156,9 @@ data:
           required: false
       metrics:
         - metric_name: vertex_pending_messages
+          display_name: Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -189,6 +192,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_pending
+          display_name: Mono Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name
@@ -225,6 +231,10 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_processing_time_bucket
+          display_name: Mono Vertex Processing Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: s
           required_filters:
             - namespace
             - mvtx_name
@@ -235,6 +245,10 @@ data:
                 - name: pod
                   required: false
         - metric_name: monovtx_sink_time_bucket
+          display_name: Mono Vertex Sink Write Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: ms
           required_filters:
             - namespace
             - mvtx_name
@@ -259,6 +273,9 @@ data:
           required: false
       metrics:
         - metric_name: forwarder_data_read_total
+          display_name: Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -284,6 +301,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_read_total
+          display_name: Mono Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name

diff --git a/config/advanced-install/numaflow-server.yaml b/config/advanced-install/numaflow-server.yaml
@@ -163,6 +163,9 @@ data:
           required: false
       metrics:
         - metric_name: vertex_pending_messages
+          display_name: Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -196,6 +199,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_pending
+          display_name: Mono Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name
@@ -232,6 +238,10 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_processing_time_bucket
+          display_name: Mono Vertex Processing Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: s
           required_filters:
             - namespace
             - mvtx_name
@@ -242,6 +252,10 @@ data:
                 - name: pod
                   required: false
         - metric_name: monovtx_sink_time_bucket
+          display_name: Mono Vertex Sink Write Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: ms
           required_filters:
             - namespace
             - mvtx_name
@@ -266,6 +280,9 @@ data:
           required: false
       metrics:
         - metric_name: forwarder_data_read_total
+          display_name: Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -291,6 +308,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_read_total
+          display_name: Mono Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name

diff --git a/config/base/numaflow-server/numaflow-server-metrics-proxy-config.yaml b/config/base/numaflow-server/numaflow-server-metrics-proxy-config.yaml
@@ -22,6 +22,9 @@ data:
           required: false
       metrics:
         - metric_name: vertex_pending_messages
+          display_name: Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -55,6 +58,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_pending
+          display_name: Mono Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name
@@ -91,6 +97,10 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_processing_time_bucket
+          display_name: Mono Vertex Processing Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: s
           required_filters:
             - namespace
             - mvtx_name
@@ -101,6 +111,10 @@ data:
                 - name: pod
                   required: false
         - metric_name: monovtx_sink_time_bucket
+          display_name: Mono Vertex Sink Write Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: ms
           required_filters:
             - namespace
             - mvtx_name
@@ -125,6 +139,9 @@ data:
           required: false
       metrics:
         - metric_name: forwarder_data_read_total
+          display_name: Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -150,6 +167,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_read_total
+          display_name: Mono Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name

diff --git a/config/install.yaml b/config/install.yaml
@@ -28576,6 +28576,9 @@ data:
           required: false
       metrics:
         - metric_name: vertex_pending_messages
+          display_name: Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -28609,6 +28612,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_pending
+          display_name: Mono Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name
@@ -28645,6 +28651,10 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_processing_time_bucket
+          display_name: Mono Vertex Processing Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: s
           required_filters:
             - namespace
             - mvtx_name
@@ -28655,6 +28665,10 @@ data:
                 - name: pod
                   required: false
         - metric_name: monovtx_sink_time_bucket
+          display_name: Mono Vertex Sink Write Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: ms
           required_filters:
             - namespace
             - mvtx_name
@@ -28679,6 +28693,9 @@ data:
           required: false
       metrics:
         - metric_name: forwarder_data_read_total
+          display_name: Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -28704,6 +28721,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_read_total
+          display_name: Mono Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name

diff --git a/config/namespace-install.yaml b/config/namespace-install.yaml
@@ -28464,6 +28464,9 @@ data:
           required: false
       metrics:
         - metric_name: vertex_pending_messages
+          display_name: Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -28497,6 +28500,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_pending
+          display_name: Mono Vertex Pending Messages
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name
@@ -28533,6 +28539,10 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_processing_time_bucket
+          display_name: Mono Vertex Processing Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: s
           required_filters:
             - namespace
             - mvtx_name
@@ -28543,6 +28553,10 @@ data:
                 - name: pod
                   required: false
         - metric_name: monovtx_sink_time_bucket
+          display_name: Mono Vertex Sink Write Time Latency
+          # set "Units" or unset for default behaviour otherwise set "s" or "ms" for latency metrics
+          # Note: latency values are in μs
+          # unit: ms
           required_filters:
             - namespace
             - mvtx_name
@@ -28567,6 +28581,9 @@ data:
           required: false
       metrics:
         - metric_name: forwarder_data_read_total
+          display_name: Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - pipeline
@@ -28592,6 +28609,9 @@ data:
           required: false
       metrics:
         - metric_name: monovtx_read_total
+          display_name: Mono Vertex Read Processing Rate
+          # set "Units" or unset for default behaviour
+          # unit: Units
           required_filters:
             - namespace
             - mvtx_name

diff --git a/server/apis/v1/handler.go b/server/apis/v1/handler.go
@@ -1340,7 +1340,7 @@ func (h *handler) DiscoverMetrics(c *gin.Context) {
 					})
 				}
 
-				discoveredMetrics = append(discoveredMetrics, NewDiscoveryResponse(metric.Name, dimensionData))
+				discoveredMetrics = append(discoveredMetrics, NewDiscoveryResponse(metric.Name, metric.DisplayName, metric.Unit, dimensionData))
 			}
 		}
 	}

diff --git a/server/apis/v1/response_metrics.go b/server/apis/v1/response_metrics.go
@@ -32,7 +32,9 @@ type Dimension struct {
 }
 
 type Metric struct {
-	Name string `yaml:"metric_name"`
+	Name        string `yaml:"metric_name"`
+	DisplayName string `yaml:"display_name"`
+	Unit        string `yaml:"unit"`
 	// array of required labels.
 	Filters []string `yaml:"required_filters"`
 	//array of dimensions and their data

diff --git a/server/apis/v1/response_metrics_discovery.go b/server/apis/v1/response_metrics_discovery.go
@@ -7,17 +7,21 @@ type Dimensions struct {
 }
 
 type DiscoveryResponse struct {
-	MetricName string       `json:"metric_name"`
-	Dimensions []Dimensions `json:"dimensions"`
+	MetricName  string       `json:"metric_name"`
+	DisplayName string       `json:"display_name"`
+	Unit        string       `json:"unit"`
+	Dimensions  []Dimensions `json:"dimensions"`
 }
 
 // MetricsDiscoveryResponse is a list of DiscoveryResponse
 type MetricsDiscoveryResponse []DiscoveryResponse
 
 // NewDiscoveryResponse creates a new DiscoveryResponse object for each metric.
-func NewDiscoveryResponse(metricName string, dimensions []Dimensions) DiscoveryResponse {
+func NewDiscoveryResponse(metricName, displayName, unitName string, dimensions []Dimensions) DiscoveryResponse {
 	return DiscoveryResponse{
-		MetricName: metricName,
-		Dimensions: dimensions,
+		MetricName:  metricName,
+		DisplayName: displayName,
+		Unit:        unitName,
+		Dimensions:  dimensions,
 	}
 }
diff --git a/...ials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx b/...ials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx
-Original file line number
+Diff line change
@@ Expand Up / @@ -1340,7 +1340,7 @@ func (h *handler) DiscoverMetrics(c *gin.Context) { @@
     					})
     				}
-    				discoveredMetrics = append(discoveredMetrics, NewDiscoveryResponse(metric.Name, dimensionData))
+    				discoveredMetrics = append(discoveredMetrics, NewDiscoveryResponse(metric.Name, metric.DisplayName, metric.Unit, dimensionData))
     			}
     		}
     	}
@@ Expand Down @@