diff --git a/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz b/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz
index 5bd830d89c..46ed49605e 100644
Binary files a/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz and b/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz differ
diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundle.json b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundle.json
index d97acc4762..698f48aeed 100644
--- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundle.json
+++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundle.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_desired_ready"
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Bundle Desired Ready",
-         "type": "timeseries"
+         "title": "Ready Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_err_applied"
+               "expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Out of Sync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Bundle Err Applied",
-         "type": "timeseries"
+         "title": "Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,154 +146,98 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_modified"
-            }
-         ],
-         "title": "Bundle Modified",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 4,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_not_ready"
-            }
-         ],
-         "title": "Bundle Not Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 5,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_out_of_sync"
-            }
-         ],
-         "title": "Bundle Out of Sync",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 6,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_pending"
-            }
-         ],
-         "title": "Bundle Pending",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 7,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Out of Sync"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_ready"
-            }
-         ],
-         "title": "Bundle Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 8,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Err Applied"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_state"
-            }
-         ],
-         "title": "Bundle State",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 9,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Pending"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_wait_applied"
+               "expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Bundle Wait Applied",
+         "title": "Bundles",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_bundle_desired_ready, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_bundle_desired_ready{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundledeployment.json b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundledeployment.json
index e33e5cd041..c81f7a6212 100644
--- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundledeployment.json
+++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/bundledeployment.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,16 +27,190 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundledeployment_state"
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"}) / sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\"})"
+            }
+         ],
+         "title": "Ready BundleDeployments",
+         "type": "stat"
+      },
+      {
+         "datasource": {
+            "type": "datasource",
+            "uid": "-- Mixed --"
+         },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
+         "gridPos": {
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
+         },
+         "id": 2,
+         "pluginVersion": "v11.0.0",
+         "targets": [
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"WaitApplied\"})",
+               "legendFormat": "Wait Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"ErrApplied\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"OutOfSync\"})",
+               "legendFormat": "OutOfSync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Pending\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Modified\"})",
+               "legendFormat": "Modified"
             }
          ],
-         "title": "Bundledeployment State",
+         "title": "BundleDeployments",
+         "type": "stat"
+      },
+      {
+         "datasource": {
+            "type": "datasource",
+            "uid": "-- Mixed --"
+         },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
+         "gridPos": {
+            "h": 8,
+            "w": 24,
+            "x": 0,
+            "y": 8
+         },
+         "id": 3,
+         "pluginVersion": "v11.0.0",
+         "targets": [
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"WaitApplied\"})",
+               "legendFormat": "Wait Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"ErrApplied\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"OutOfSync\"})",
+               "legendFormat": "OutOfSync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Pending\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Modified\"})",
+               "legendFormat": "Modified"
+            }
+         ],
+         "title": "BundleDeployments",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_bundledeployment_state, cluster_namespace)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/cluster.json b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/cluster.json
index 00a7a5c03b..73bdea4834 100644
--- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/cluster.json
+++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/cluster.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_desired_ready_git_repos"
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Desired Ready Git Repos",
-         "type": "timeseries"
+         "title": "Ready Git Repos",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_ready_git_repos"
+               "expr": "sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Ready Git Repos",
-         "type": "timeseries"
+         "title": "Git Repos",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_desiredready"
+               "expr": "sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Resources Count DesiredReady",
+         "title": "Git Repos",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_missing"
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Count Missing",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_modified"
+               "expr": "sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resources Count Modified",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,10 +257,67 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_notready"
+               "expr": "sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resources Count NotReady",
+         "title": "Resources",
          "type": "timeseries"
       },
       {
@@ -145,9 +325,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 26
          },
          "id": 7,
          "pluginVersion": "v11.0.0",
@@ -157,20 +345,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_orphaned"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"}) / sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Count Orphaned",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 26
          },
          "id": 8,
          "pluginVersion": "v11.0.0",
@@ -180,20 +376,45 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_ready"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"WaitCheckIn\"})",
+               "legendFormat": "Wait Check In"
             }
          ],
-         "title": "Resources Count Ready",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 34
          },
          "id": 9,
          "pluginVersion": "v11.0.0",
@@ -203,62 +424,58 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_unknown"
-            }
-         ],
-         "title": "Resources Count Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_waitapplied"
-            }
-         ],
-         "title": "Resources Count WaitApplied",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 11,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_state"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"WaitCheckIn\"})",
+               "legendFormat": "Wait Check In"
             }
          ],
-         "title": "Cluster State",
+         "title": "Clusters",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_cluster_desired_ready_git_repos, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_cluster_desired_ready_git_repos{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/clustergroup.json b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/clustergroup.json
index e218af3baf..ce3df87b21 100644
--- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/clustergroup.json
+++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/clustergroup.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_bundle_desired_ready"
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Bundle - Desired Ready",
-         "type": "timeseries"
+         "title": "Ready Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_bundle_ready"
+               "expr": "sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Bundle - Ready",
-         "type": "timeseries"
+         "title": "Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_cluster_count"
+               "expr": "sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Cluster Count",
+         "title": "Bundles",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_non_ready_cluster_count"
+               "expr": "(sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"}) - sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})) / sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Non Ready Cluster Count",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_desired_ready"
+               "expr": "sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Total"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Non Ready"
             }
          ],
-         "title": "Resource Count - Desired Ready",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,10 +209,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_missing"
+               "expr": "sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Total"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Non Ready"
             }
          ],
-         "title": "Resource Count - Missing",
+         "title": "Clusters",
          "type": "timeseries"
       },
       {
@@ -145,9 +229,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 26
          },
          "id": 7,
          "pluginVersion": "v11.0.0",
@@ -157,20 +249,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_modified"
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resource Count - Modified",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 26
          },
          "id": 8,
          "pluginVersion": "v11.0.0",
@@ -180,20 +280,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_notready"
+               "expr": "sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resource Count - Not Ready",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 34
          },
          "id": 9,
          "pluginVersion": "v11.0.0",
@@ -203,108 +368,98 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_orphaned"
-            }
-         ],
-         "title": "Resource Count - Orphaned",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_ready"
-            }
-         ],
-         "title": "Resource Count - Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 11,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_unknown"
-            }
-         ],
-         "title": "Resource Count - Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 12,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_waitapplied"
-            }
-         ],
-         "title": "Resource Count - Wait Applied",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 13,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_state"
+               "expr": "sum(fleet_cluster_group_resource_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "State",
+         "title": "Resources",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_cluster_group_bundle_desired_ready, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_cluster_group_bundle_desired_ready{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/gitrepo.json b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/gitrepo.json
index a336a33fd9..1a50c2937d 100644
--- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/gitrepo.json
+++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/files/rancher/fleet/gitrepo.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_desired_ready_clusters"
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Desired Ready Clusters",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_ready_clusters"
+               "expr": "sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Ready Clusters",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_desired_ready"
+               "expr": "sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Resources Desired Ready",
+         "title": "Clusters",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_missing"
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Missing",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,69 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_modified"
+               "expr": "sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
             }
          ],
-         "title": "Resources Modified",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,108 +241,82 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_not_ready"
-            }
-         ],
-         "title": "Resources Not Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 7,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_orphaned"
-            }
-         ],
-         "title": "Resources Orphaned",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 8,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_ready"
-            }
-         ],
-         "title": "Resources Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 9,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_unknown"
-            }
-         ],
-         "title": "Resources Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_wait_applied"
+               "expr": "sum(fleet_gitrepo_resources_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
             }
          ],
-         "title": "Resources Wait Applied",
+         "title": "Resources",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_gitrepo_desired_ready_clusters, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_gitrepo_desired_ready_clusters{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/index.yaml b/index.yaml
index a38f898175..df0e0d585c 100755
--- a/index.yaml
+++ b/index.yaml
@@ -16369,7 +16369,7 @@ entries:
       catalog.cattle.io/upstream-version: 45.31.1
     apiVersion: v2
     appVersion: v0.65.1
-    created: "2024-06-10T12:37:43.31781474+05:30"
+    created: "2024-06-14T12:26:55.367402441+02:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -16463,7 +16463,7 @@ entries:
       and Prometheus rules combined with documentation and scripts to provide easy
       to operate end-to-end Kubernetes cluster monitoring with Prometheus using the
       Prometheus Operator.
-    digest: 2253fd78b306d6a60dc8d385a01c80bc581ae75e580298a44b6da85fdb9b0829
+    digest: 52a951a481140284364185f050ef67c2832b3f2eff9da2d283614a208604adaa
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: file://assets/logos/rancher-monitoring.png
     keywords:
diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundle.json b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundle.json
index d97acc4762..698f48aeed 100644
--- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundle.json
+++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundle.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_desired_ready"
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Bundle Desired Ready",
-         "type": "timeseries"
+         "title": "Ready Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_err_applied"
+               "expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Out of Sync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Bundle Err Applied",
-         "type": "timeseries"
+         "title": "Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,154 +146,98 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_modified"
-            }
-         ],
-         "title": "Bundle Modified",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 4,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_not_ready"
-            }
-         ],
-         "title": "Bundle Not Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 5,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_out_of_sync"
-            }
-         ],
-         "title": "Bundle Out of Sync",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 6,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_pending"
-            }
-         ],
-         "title": "Bundle Pending",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 7,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Out of Sync"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_ready"
-            }
-         ],
-         "title": "Bundle Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 8,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Err Applied"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_state"
-            }
-         ],
-         "title": "Bundle State",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 9,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Pending"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundle_wait_applied"
+               "expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Bundle Wait Applied",
+         "title": "Bundles",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_bundle_desired_ready, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_bundle_desired_ready{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundledeployment.json b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundledeployment.json
index e33e5cd041..c81f7a6212 100644
--- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundledeployment.json
+++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/bundledeployment.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,16 +27,190 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_bundledeployment_state"
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"}) / sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\"})"
+            }
+         ],
+         "title": "Ready BundleDeployments",
+         "type": "stat"
+      },
+      {
+         "datasource": {
+            "type": "datasource",
+            "uid": "-- Mixed --"
+         },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
+         "gridPos": {
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
+         },
+         "id": 2,
+         "pluginVersion": "v11.0.0",
+         "targets": [
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"WaitApplied\"})",
+               "legendFormat": "Wait Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"ErrApplied\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"OutOfSync\"})",
+               "legendFormat": "OutOfSync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Pending\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Modified\"})",
+               "legendFormat": "Modified"
             }
          ],
-         "title": "Bundledeployment State",
+         "title": "BundleDeployments",
+         "type": "stat"
+      },
+      {
+         "datasource": {
+            "type": "datasource",
+            "uid": "-- Mixed --"
+         },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
+         "gridPos": {
+            "h": 8,
+            "w": 24,
+            "x": 0,
+            "y": 8
+         },
+         "id": 3,
+         "pluginVersion": "v11.0.0",
+         "targets": [
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"WaitApplied\"})",
+               "legendFormat": "Wait Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"ErrApplied\"})",
+               "legendFormat": "Err Applied"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"OutOfSync\"})",
+               "legendFormat": "OutOfSync"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Pending\"})",
+               "legendFormat": "Pending"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_bundledeployment_state{cluster_namespace=~\"$namespace\",state=\"Modified\"})",
+               "legendFormat": "Modified"
+            }
+         ],
+         "title": "BundleDeployments",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_bundledeployment_state, cluster_namespace)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/cluster.json b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/cluster.json
index 00a7a5c03b..73bdea4834 100644
--- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/cluster.json
+++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/cluster.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_desired_ready_git_repos"
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Desired Ready Git Repos",
-         "type": "timeseries"
+         "title": "Ready Git Repos",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_ready_git_repos"
+               "expr": "sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Ready Git Repos",
-         "type": "timeseries"
+         "title": "Git Repos",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_desiredready"
+               "expr": "sum(fleet_cluster_desired_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_ready_git_repos{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Resources Count DesiredReady",
+         "title": "Git Repos",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_missing"
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Count Missing",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_modified"
+               "expr": "sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resources Count Modified",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,10 +257,67 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_notready"
+               "expr": "sum(fleet_cluster_resources_count_desiredready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_resources_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resources Count NotReady",
+         "title": "Resources",
          "type": "timeseries"
       },
       {
@@ -145,9 +325,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 26
          },
          "id": 7,
          "pluginVersion": "v11.0.0",
@@ -157,20 +345,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_orphaned"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"}) / sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Count Orphaned",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 26
          },
          "id": 8,
          "pluginVersion": "v11.0.0",
@@ -180,20 +376,45 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_ready"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"WaitCheckIn\"})",
+               "legendFormat": "Wait Check In"
             }
          ],
-         "title": "Resources Count Ready",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 34
          },
          "id": 9,
          "pluginVersion": "v11.0.0",
@@ -203,62 +424,58 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_unknown"
-            }
-         ],
-         "title": "Resources Count Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"Ready\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_resources_count_waitapplied"
-            }
-         ],
-         "title": "Resources Count WaitApplied",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 11,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"NotReady\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_state"
+               "expr": "sum(fleet_cluster_state{exported_namespace=\"$namespace\",name=~\"$name\",state=\"WaitCheckIn\"})",
+               "legendFormat": "Wait Check In"
             }
          ],
-         "title": "Cluster State",
+         "title": "Clusters",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_cluster_desired_ready_git_repos, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_cluster_desired_ready_git_repos{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/clustergroup.json b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/clustergroup.json
index e218af3baf..ce3df87b21 100644
--- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/clustergroup.json
+++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/clustergroup.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_bundle_desired_ready"
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Bundle - Desired Ready",
-         "type": "timeseries"
+         "title": "Ready Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_bundle_ready"
+               "expr": "sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Bundle - Ready",
-         "type": "timeseries"
+         "title": "Bundles",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_cluster_count"
+               "expr": "sum(fleet_cluster_group_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Cluster Count",
+         "title": "Bundles",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_non_ready_cluster_count"
+               "expr": "(sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"}) - sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})) / sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Non Ready Cluster Count",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_desired_ready"
+               "expr": "sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Total"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Non Ready"
             }
          ],
-         "title": "Resource Count - Desired Ready",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,10 +209,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_missing"
+               "expr": "sum(fleet_cluster_group_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Total"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_non_ready_cluster_count{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Non Ready"
             }
          ],
-         "title": "Resource Count - Missing",
+         "title": "Clusters",
          "type": "timeseries"
       },
       {
@@ -145,9 +229,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 26
          },
          "id": 7,
          "pluginVersion": "v11.0.0",
@@ -157,20 +249,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_modified"
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resource Count - Modified",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 26
          },
          "id": 8,
          "pluginVersion": "v11.0.0",
@@ -180,20 +280,85 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_notready"
+               "expr": "sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "Resource Count - Not Ready",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 34
          },
          "id": 9,
          "pluginVersion": "v11.0.0",
@@ -203,108 +368,98 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_orphaned"
-            }
-         ],
-         "title": "Resource Count - Orphaned",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_ready"
-            }
-         ],
-         "title": "Resource Count - Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 11,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_unknown"
-            }
-         ],
-         "title": "Resource Count - Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 12,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_notready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_resource_count_waitapplied"
-            }
-         ],
-         "title": "Resource Count - Wait Applied",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 13,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_cluster_group_resource_count_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_cluster_group_state"
+               "expr": "sum(fleet_cluster_group_resource_count_orphaned{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Orphaned"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_cluster_group_resource_count_waitapplied{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Wait Applied"
             }
          ],
-         "title": "State",
+         "title": "Resources",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_cluster_group_bundle_desired_ready, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_cluster_group_bundle_desired_ready{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",
diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/gitrepo.json b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/gitrepo.json
index a336a33fd9..1a50c2937d 100644
--- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/gitrepo.json
+++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/files/rancher/fleet/gitrepo.json
@@ -7,9 +7,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 0
          },
          "id": 1,
          "pluginVersion": "v11.0.0",
@@ -19,20 +27,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_desired_ready_clusters"
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Desired Ready Clusters",
-         "type": "timeseries"
+         "title": "Ready Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 0
          },
          "id": 2,
          "pluginVersion": "v11.0.0",
@@ -42,20 +58,37 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_ready_clusters"
+               "expr": "sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Ready Clusters",
-         "type": "timeseries"
+         "title": "Clusters",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 8
          },
          "id": 3,
          "pluginVersion": "v11.0.0",
@@ -65,10 +98,19 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_desired_ready"
+               "expr": "sum(fleet_gitrepo_desired_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_ready_clusters{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
             }
          ],
-         "title": "Resources Desired Ready",
+         "title": "Clusters",
          "type": "timeseries"
       },
       {
@@ -76,9 +118,17 @@
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": "percentunit"
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 7,
+            "x": 0,
+            "y": 13
          },
          "id": 4,
          "pluginVersion": "v11.0.0",
@@ -88,20 +138,28 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_missing"
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
             }
          ],
-         "title": "Resources Missing",
-         "type": "timeseries"
+         "title": "Ready Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
-            "h": 8,
-            "w": 24
+            "h": 5,
+            "w": 17,
+            "x": 7,
+            "y": 13
          },
          "id": 5,
          "pluginVersion": "v11.0.0",
@@ -111,20 +169,69 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_modified"
+               "expr": "sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
             }
          ],
-         "title": "Resources Modified",
-         "type": "timeseries"
+         "title": "Resources",
+         "type": "stat"
       },
       {
          "datasource": {
             "type": "datasource",
             "uid": "-- Mixed --"
          },
+         "fieldConfig": {
+            "defaults": {
+               "decimals": 0,
+               "unit": null
+            }
+         },
          "gridPos": {
             "h": 8,
-            "w": 24
+            "w": 24,
+            "x": 0,
+            "y": 21
          },
          "id": 6,
          "pluginVersion": "v11.0.0",
@@ -134,108 +241,82 @@
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_not_ready"
-            }
-         ],
-         "title": "Resources Not Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 7,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Desired Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_orphaned"
-            }
-         ],
-         "title": "Resources Orphaned",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 8,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_ready"
-            }
-         ],
-         "title": "Resources Ready",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 9,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Not Ready"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_unknown"
-            }
-         ],
-         "title": "Resources Unknown",
-         "type": "timeseries"
-      },
-      {
-         "datasource": {
-            "type": "datasource",
-            "uid": "-- Mixed --"
-         },
-         "gridPos": {
-            "h": 8,
-            "w": 24
-         },
-         "id": 10,
-         "pluginVersion": "v11.0.0",
-         "targets": [
+               "expr": "sum(fleet_gitrepo_resources_missing{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Missing"
+            },
             {
                "datasource": {
                   "type": "prometheus",
                   "uid": "prometheus"
                },
-               "expr": "fleet_gitrepo_resources_wait_applied"
+               "expr": "sum(fleet_gitrepo_resources_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Modified"
+            },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "prometheus"
+               },
+               "expr": "sum(fleet_gitrepo_resources_unknown{exported_namespace=\"$namespace\",name=~\"$name\"})",
+               "legendFormat": "Unknown"
             }
          ],
-         "title": "Resources Wait Applied",
+         "title": "Resources",
          "type": "timeseries"
       }
    ],
    "schemaVersion": 39,
+   "templating": {
+      "list": [
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "name": "namespace",
+            "query": "label_values(fleet_gitrepo_desired_ready_clusters, exported_namespace)",
+            "refresh": 2,
+            "type": "query"
+         },
+         {
+            "datasource": {
+               "type": "prometheus",
+               "uid": "prometheus"
+            },
+            "includeAll": true,
+            "name": "name",
+            "query": "label_values(fleet_gitrepo_desired_ready_clusters{exported_namespace=~\"$namespace\"}, name)",
+            "refresh": 2,
+            "type": "query"
+         }
+      ]
+   },
    "time": {
-      "from": "now-6h",
+      "from": "now-1h",
       "to": "now"
    },
    "timezone": "utc",