query updates

dashboard/src/main/home/cluster-dashboard/dashboard/Metrics.tsx

@@ -123,8 +123,11 @@ const Metrics: React.FC = () => {
   }, []);
 
   const renderMetricsSettings = () => {
-    if (showMetricsSettings && true) {
-      if (selectedMetric == "nginx:errors") {
+    if (showMetricsSettings) {
+      if (
+        selectedMetric == "nginx:errors" ||
+        selectedMetric == "nginx:latency"
+      ) {
         return (
           <>
             <DropdownOverlay onClick={() => setShowMetricsSettings(false)} />
@@ -193,11 +196,7 @@ const Metrics: React.FC = () => {
 
       let podNames = [] as string[];
 
-      if (selectedMetric == "nginx:errors") {
-        podNames = [selectedIngress?.name];
-        namespace = selectedIngress?.namespace || "default";
-        shouldsum = false;
-      }
+      podNames = [selectedIngress?.name];
 
       setIsLoading((prev) => prev + 1);
       setData([]);
@@ -207,13 +206,14 @@ const Metrics: React.FC = () => {
         {
           cluster_id: currentCluster.id,
           metric: selectedMetric,
-          shouldsum: selectedMetric == "nginx:errors",
+          shouldsum: false,
           kind: "Ingress",
-          namespace: selectedIngress.namespace,
+          namespace: selectedIngress?.namespace || "default",
           startrange: start,
           endrange: end,
           resolution: resolutions[selectedRange],
           pods: podNames,
+          name: selectedIngress?.name,
         },
         {
           id: currentProject.id,

internal/kubernetes/prometheus/metrics.go

@@ -125,8 +125,6 @@ func QueryPrometheus(
 		denom := fmt.Sprintf(`sum(rate(nginx_ingress_controller_requests{namespace="%s",ingress=~"%s"}[5m]) > 0)`, opts.Namespace, selectionRegex)
 		query = fmt.Sprintf(`%s / %s * 100 OR on() vector(0)`, num, denom)
 	} else if opts.Metric == "nginx:latency" {
-		opts.Namespace = ".*"
-		selectionRegex = ".*"
 		num := fmt.Sprintf(`sum(rate(nginx_ingress_controller_request_duration_seconds_sum{namespace=~"%s",ingress=~"%s"}[5m]) OR on() vector(0))`, opts.Namespace, selectionRegex)
 		denom := fmt.Sprintf(`sum(rate(nginx_ingress_controller_request_duration_seconds_count{namespace=~"%s",ingress=~"%s"}[5m]))`, opts.Namespace, selectionRegex)
 		query = fmt.Sprintf(`%s / %s OR on() vector(0)`, num, denom)