diff --git a/config/advanced-install/namespaced-numaflow-server.yaml b/config/advanced-install/namespaced-numaflow-server.yaml index 7cb350b07..ec15a8f30 100644 --- a/config/advanced-install/namespaced-numaflow-server.yaml +++ b/config/advanced-install/namespaced-numaflow-server.yaml @@ -156,6 +156,7 @@ data: required: false metrics: - metric_name: vertex_pending_messages + display_name: Vertex Pending Messages required_filters: - namespace - pipeline @@ -189,6 +190,7 @@ data: required: false metrics: - metric_name: monovtx_pending + display_name: Mono Vertex Pending Messages required_filters: - namespace - mvtx_name @@ -225,6 +227,7 @@ data: required: false metrics: - metric_name: monovtx_processing_time_bucket + display_name: Mono Vertex Processing Time Latency required_filters: - namespace - mvtx_name @@ -235,6 +238,7 @@ data: - name: pod required: false - metric_name: monovtx_sink_time_bucket + display_name: Mono Vertex Sink Write Time Latency required_filters: - namespace - mvtx_name @@ -259,6 +263,7 @@ data: required: false metrics: - metric_name: forwarder_data_read_total + display_name: Vertex Read Processing Rate required_filters: - namespace - pipeline @@ -284,6 +289,7 @@ data: required: false metrics: - metric_name: monovtx_read_total + display_name: Mono Vertex Read Processing Rate required_filters: - namespace - mvtx_name diff --git a/config/advanced-install/numaflow-server.yaml b/config/advanced-install/numaflow-server.yaml index fcb283f11..7d7cb1db3 100644 --- a/config/advanced-install/numaflow-server.yaml +++ b/config/advanced-install/numaflow-server.yaml @@ -163,6 +163,7 @@ data: required: false metrics: - metric_name: vertex_pending_messages + display_name: Vertex Pending Messages required_filters: - namespace - pipeline @@ -196,6 +197,7 @@ data: required: false metrics: - metric_name: monovtx_pending + display_name: Mono Vertex Pending Messages required_filters: - namespace - mvtx_name @@ -232,6 +234,7 @@ data: required: false metrics: - metric_name: monovtx_processing_time_bucket + display_name: Mono Vertex Processing Time Latency required_filters: - namespace - mvtx_name @@ -242,6 +245,7 @@ data: - name: pod required: false - metric_name: monovtx_sink_time_bucket + display_name: Mono Vertex Sink Write Time Latency required_filters: - namespace - mvtx_name @@ -266,6 +270,7 @@ data: required: false metrics: - metric_name: forwarder_data_read_total + display_name: Vertex Read Processing Rate required_filters: - namespace - pipeline @@ -291,6 +296,7 @@ data: required: false metrics: - metric_name: monovtx_read_total + display_name: Mono Vertex Read Processing Rate 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 index fe634f5f1..607fcfc19 100644 --- 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,7 @@ data: required: false metrics: - metric_name: vertex_pending_messages + display_name: Vertex Pending Messages required_filters: - namespace - pipeline @@ -55,6 +56,7 @@ data: required: false metrics: - metric_name: monovtx_pending + display_name: Mono Vertex Pending Messages required_filters: - namespace - mvtx_name @@ -91,6 +93,7 @@ data: required: false metrics: - metric_name: monovtx_processing_time_bucket + display_name: Mono Vertex Processing Time Latency required_filters: - namespace - mvtx_name @@ -101,6 +104,7 @@ data: - name: pod required: false - metric_name: monovtx_sink_time_bucket + display_name: Mono Vertex Sink Write Time Latency required_filters: - namespace - mvtx_name @@ -125,6 +129,7 @@ data: required: false metrics: - metric_name: forwarder_data_read_total + display_name: Vertex Read Processing Rate required_filters: - namespace - pipeline @@ -150,6 +155,7 @@ data: required: false metrics: - metric_name: monovtx_read_total + display_name: Mono Vertex Read Processing Rate required_filters: - namespace - mvtx_name diff --git a/config/install.yaml b/config/install.yaml index 69fbd4ca4..a239b78d0 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -28576,6 +28576,7 @@ data: required: false metrics: - metric_name: vertex_pending_messages + display_name: Vertex Pending Messages required_filters: - namespace - pipeline @@ -28609,6 +28610,7 @@ data: required: false metrics: - metric_name: monovtx_pending + display_name: Mono Vertex Pending Messages required_filters: - namespace - mvtx_name @@ -28645,6 +28647,7 @@ data: required: false metrics: - metric_name: monovtx_processing_time_bucket + display_name: Mono Vertex Processing Time Latency required_filters: - namespace - mvtx_name @@ -28655,6 +28658,7 @@ data: - name: pod required: false - metric_name: monovtx_sink_time_bucket + display_name: Mono Vertex Sink Write Time Latency required_filters: - namespace - mvtx_name @@ -28679,6 +28683,7 @@ data: required: false metrics: - metric_name: forwarder_data_read_total + display_name: Vertex Read Processing Rate required_filters: - namespace - pipeline @@ -28704,6 +28709,7 @@ data: required: false metrics: - metric_name: monovtx_read_total + display_name: Mono Vertex Read Processing Rate required_filters: - namespace - mvtx_name diff --git a/config/namespace-install.yaml b/config/namespace-install.yaml index 810422a7c..ddce9f233 100644 --- a/config/namespace-install.yaml +++ b/config/namespace-install.yaml @@ -28464,6 +28464,7 @@ data: required: false metrics: - metric_name: vertex_pending_messages + display_name: Vertex Pending Messages required_filters: - namespace - pipeline @@ -28497,6 +28498,7 @@ data: required: false metrics: - metric_name: monovtx_pending + display_name: Mono Vertex Pending Messages required_filters: - namespace - mvtx_name @@ -28533,6 +28535,7 @@ data: required: false metrics: - metric_name: monovtx_processing_time_bucket + display_name: Mono Vertex Processing Time Latency required_filters: - namespace - mvtx_name @@ -28543,6 +28546,7 @@ data: - name: pod required: false - metric_name: monovtx_sink_time_bucket + display_name: Mono Vertex Sink Write Time Latency required_filters: - namespace - mvtx_name @@ -28567,6 +28571,7 @@ data: required: false metrics: - metric_name: forwarder_data_read_total + display_name: Vertex Read Processing Rate required_filters: - namespace - pipeline @@ -28592,6 +28597,7 @@ data: required: false metrics: - metric_name: monovtx_read_total + display_name: Mono Vertex Read Processing Rate required_filters: - namespace - mvtx_name diff --git a/server/apis/v1/handler.go b/server/apis/v1/handler.go index 17f0322c2..40199630b 100644 --- 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, dimensionData)) } } } diff --git a/server/apis/v1/response_metrics.go b/server/apis/v1/response_metrics.go index 3b4a26507..ddd33f024 100644 --- a/server/apis/v1/response_metrics.go +++ b/server/apis/v1/response_metrics.go @@ -32,7 +32,8 @@ type Dimension struct { } type Metric struct { - Name string `yaml:"metric_name"` + Name string `yaml:"metric_name"` + DisplayName string `yaml:"display_name"` // 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 index ef2a160e1..2ae765614 100644 --- a/server/apis/v1/response_metrics_discovery.go +++ b/server/apis/v1/response_metrics_discovery.go @@ -7,17 +7,19 @@ 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"` + 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 string, dimensions []Dimensions) DiscoveryResponse { return DiscoveryResponse{ - MetricName: metricName, - Dimensions: dimensions, + MetricName: metricName, + DisplayName: displayName, + Dimensions: dimensions, } } diff --git a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx index 71f5ee862..6c4c2e957 100644 --- a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx +++ b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/index.tsx @@ -6,7 +6,7 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import LineChartComponent from "./partials/LineChart"; import { useMetricsDiscoveryDataFetch } from "../../../../../../../../../../../../../utils/fetchWrappers/metricsDiscoveryDataFetch"; -import { dimensionReverseMap, metricNameMap } from "./utils/constants"; +import { dimensionReverseMap } from "./utils/constants"; import "./style.css"; @@ -83,7 +83,7 @@ export function Metrics({ namespaceId, pipelineId, type, vertexId }: MetricsProp id={`${metric?.metric_name}-header`} > - {metricNameMap[metric?.metric_name] || metric?.metric_name} + {metric?.display_name || metric?.metric_name} diff --git a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/utils/constants.ts b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/utils/constants.ts index 46d6b6175..0ab1711e6 100644 --- a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/utils/constants.ts +++ b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/PodDetails/partials/Metrics/utils/constants.ts @@ -30,17 +30,3 @@ export const dimensionReverseMap: { [p: string]: string } = { pipeline: "pipeline", pod: "pod", }; - -export const metricNameMap: { [p: string]: string } = { - monovtx_ack_time_bucket: "Mono Vertex Ack Time Latency", - monovtx_read_time_bucket: "Mono Vertex Read Time Latency", - monovtx_processing_time_bucket: - "Mono Vertex Processing Time Latency", - monovtx_sink_time_bucket: - "Mono Vertex Sink Write Time Latency", - forwarder_data_read_total: - "Vertex Read Processing Rate (messages per second)", - monovtx_read_total: "Mono Vertex Read Processing Rate (messages per second)", - monovtx_pending: "Mono Vertex Pending Messages", - vertex_pending_messages: "Vertex Pending Messages", -};