diff --git a/assets/promscale/alerts.yaml b/assets/promscale/alerts.yaml
index 4fa93c1..a499a29 100644
--- a/assets/promscale/alerts.yaml
+++ b/assets/promscale/alerts.yaml
@@ -291,7 +291,7 @@ groups:
     expr: |
       (
           (
-            min_over_time(promscale_sql_database_chunks_metrics_uncompressed_count[1h]) > 10
+            min_over_time(promscale_sql_database_chunks_metrics_uncompressed_count[1h]) > promscale_sql_database_metric_count
           )
         and
           (
@@ -301,7 +301,7 @@ groups:
       or
       (
           (
-            min_over_time(promscale_sql_database_chunks_metrics_expired_count[1h]) > 10
+            min_over_time(promscale_sql_database_chunks_metrics_expired_count[1h]) > promscale_sql_database_metric_count
           )
         and
           (
@@ -311,7 +311,7 @@ groups:
       or
       (
           (
-            min_over_time(promscale_sql_database_chunks_traces_uncompressed_count[1h]) > 10
+            min_over_time(promscale_sql_database_chunks_traces_uncompressed_count[1h]) > promscale_sql_database_metric_count
           )
         and
           (
@@ -321,7 +321,7 @@ groups:
       or
       (
           (
-            min_over_time(promscale_sql_database_chunks_traces_expired_count[1h]) > 10
+            min_over_time(promscale_sql_database_chunks_traces_expired_count[1h]) > promscale_sql_database_metric_count
           )
         and
           (
diff --git a/assets/promscale/dashboards/promscale.json b/assets/promscale/dashboards/promscale.json
index d5f84cc..31137e8 100644
--- a/assets/promscale/dashboards/promscale.json
+++ b/assets/promscale/dashboards/promscale.json
@@ -440,7 +440,7 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
+                  "w": 12,
                   "x": 0,
                   "y": 10
                },
@@ -475,6 +475,86 @@
                "title": "Requests",
                "type": "timeseries"
             },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "${datasource}"
+               },
+               "fieldConfig": {
+                  "defaults": {
+                     "custom": {
+                        "hideFrom": {
+                           "legend": false,
+                           "tooltip": false,
+                           "viz": false
+                        },
+                        "scaleDistribution": {
+                           "type": "linear"
+                        }
+                     }
+                  },
+                  "overrides": [ ]
+               },
+               "gridPos": {
+                  "h": 9,
+                  "w": 12,
+                  "x": 12,
+                  "y": 10
+               },
+               "id": 71,
+               "options": {
+                  "calculate": false,
+                  "cellGap": 1,
+                  "color": {
+                     "exponent": 0.5,
+                     "fill": "dark-orange",
+                     "mode": "scheme",
+                     "reverse": false,
+                     "scale": "exponential",
+                     "scheme": "Oranges",
+                     "steps": 64
+                  },
+                  "exemplars": {
+                     "color": "rgba(255,0,255,0.7)"
+                  },
+                  "filterValues": {
+                     "le": 1.0000000000000001e-09
+                  },
+                  "legend": {
+                     "show": true
+                  },
+                  "rowsFrame": {
+                     "layout": "auto"
+                  },
+                  "tooltip": {
+                     "show": true,
+                     "yHistogram": false
+                  },
+                  "yAxis": {
+                     "axisPlacement": "left",
+                     "reverse": false,
+                     "unit": "none"
+                  }
+               },
+               "pluginVersion": "9.2.3",
+               "targets": [
+                  {
+                     "datasource": {
+                        "type": "prometheus",
+                        "uid": "${datasource}"
+                     },
+                     "editorMode": "code",
+                     "expr": "sum(rate(promscale_ingest_items_received_bucket{kind=\"sample\", namespace=~\"$namespace\"}[$__rate_interval])) by (le)",
+                     "format": "heatmap",
+                     "hide": false,
+                     "legendFormat": "__auto",
+                     "range": true,
+                     "refId": "D"
+                  }
+               ],
+               "title": "Samples per request",
+               "type": "heatmap"
+            },
             {
                "datasource": {
                   "type": "prometheus",
@@ -535,9 +615,9 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
-                  "x": 8,
-                  "y": 10
+                  "w": 12,
+                  "x": 0,
+                  "y": 19
                },
                "id": 10,
                "interval": "2m",
@@ -632,9 +712,9 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
-                  "x": 16,
-                  "y": 10
+                  "w": 12,
+                  "x": 12,
+                  "y": 19
                },
                "id": 8,
                "interval": "2m",
@@ -768,9 +848,9 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
+                  "w": 12,
                   "x": 0,
-                  "y": 11
+                  "y": 29
                },
                "id": 9,
                "interval": "2m",
@@ -804,6 +884,86 @@
                "title": "Requests",
                "type": "timeseries"
             },
+            {
+               "datasource": {
+                  "type": "prometheus",
+                  "uid": "${datasource}"
+               },
+               "fieldConfig": {
+                  "defaults": {
+                     "custom": {
+                        "hideFrom": {
+                           "legend": false,
+                           "tooltip": false,
+                           "viz": false
+                        },
+                        "scaleDistribution": {
+                           "type": "linear"
+                        }
+                     }
+                  },
+                  "overrides": [ ]
+               },
+               "gridPos": {
+                  "h": 9,
+                  "w": 12,
+                  "x": 12,
+                  "y": 29
+               },
+               "id": 73,
+               "options": {
+                  "calculate": false,
+                  "cellGap": 1,
+                  "color": {
+                     "exponent": 0.5,
+                     "fill": "dark-orange",
+                     "mode": "scheme",
+                     "reverse": false,
+                     "scale": "exponential",
+                     "scheme": "Oranges",
+                     "steps": 64
+                  },
+                  "exemplars": {
+                     "color": "rgba(255,0,255,0.7)"
+                  },
+                  "filterValues": {
+                     "le": 1.0000000000000001e-09
+                  },
+                  "legend": {
+                     "show": true
+                  },
+                  "rowsFrame": {
+                     "layout": "auto"
+                  },
+                  "tooltip": {
+                     "show": true,
+                     "yHistogram": false
+                  },
+                  "yAxis": {
+                     "axisPlacement": "left",
+                     "reverse": false,
+                     "unit": "none"
+                  }
+               },
+               "pluginVersion": "9.2.3",
+               "targets": [
+                  {
+                     "datasource": {
+                        "type": "prometheus",
+                        "uid": "${datasource}"
+                     },
+                     "editorMode": "code",
+                     "expr": "sum(rate(promscale_ingest_items_received_bucket{kind=\"span\", namespace=~\"$namespace\"}[$__rate_interval])) by (le)",
+                     "format": "heatmap",
+                     "hide": false,
+                     "legendFormat": "__auto",
+                     "range": true,
+                     "refId": "D"
+                  }
+               ],
+               "title": "Spans per request",
+               "type": "heatmap"
+            },
             {
                "datasource": {
                   "type": "prometheus",
@@ -865,9 +1025,9 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
-                  "x": 8,
-                  "y": 11
+                  "w": 12,
+                  "x": 0,
+                  "y": 38
                },
                "id": 7,
                "interval": "2m",
@@ -961,9 +1121,9 @@
                },
                "gridPos": {
                   "h": 9,
-                  "w": 8,
-                  "x": 16,
-                  "y": 11
+                  "w": 12,
+                  "x": 12,
+                  "y": 38
                },
                "id": 11,
                "interval": "2m",
diff --git a/site/content/promscale/_index.md b/site/content/promscale/_index.md
index 5e043e9..76d3d6c 100644
--- a/site/content/promscale/_index.md
+++ b/site/content/promscale/_index.md
@@ -385,7 +385,7 @@ annotations:
 expr: |
   (
       (
-        min_over_time(promscale_sql_database_chunks_metrics_uncompressed_count[1h]) > 10
+        min_over_time(promscale_sql_database_chunks_metrics_uncompressed_count[1h]) > promscale_sql_database_metric_count
       )
     and
       (
@@ -395,7 +395,7 @@ expr: |
   or
   (
       (
-        min_over_time(promscale_sql_database_chunks_metrics_expired_count[1h]) > 10
+        min_over_time(promscale_sql_database_chunks_metrics_expired_count[1h]) > promscale_sql_database_metric_count
       )
     and
       (
@@ -405,7 +405,7 @@ expr: |
   or
   (
       (
-        min_over_time(promscale_sql_database_chunks_traces_uncompressed_count[1h]) > 10
+        min_over_time(promscale_sql_database_chunks_traces_uncompressed_count[1h]) > promscale_sql_database_metric_count
       )
     and
       (
@@ -415,7 +415,7 @@ expr: |
   or
   (
       (
-        min_over_time(promscale_sql_database_chunks_traces_expired_count[1h]) > 10
+        min_over_time(promscale_sql_database_chunks_traces_expired_count[1h]) > promscale_sql_database_metric_count
       )
     and
       (