diff --git a/docs/developer-guide/useful-commands-and-queries.md b/docs/developer-guide/useful-commands-and-queries.md
index 5b55f3a..e6c7ded 100644
--- a/docs/developer-guide/useful-commands-and-queries.md
+++ b/docs/developer-guide/useful-commands-and-queries.md
@@ -41,8 +41,10 @@ docker cp <PROJECT_NAME>_postgresql_1:/deployment/datapoints.csv ./
 ### Backup/Restore OpenRemote DB
 
 * Create backup: `docker exec or-postgresql-1 pg_dump -Fc openremote -f /tmp/db.bak`
+* Optional: Exclude datapoint records from the backup using the following command: `docker exec or-postgresql-1 pg_dump -Fc openremote -f /tmp/db.bak --exclude-table-data='_timescaledb_internal._hyper_*'`
 * Copy to the Docker host: `docker cp or-postgresql-1:/tmp/db.bak ~/`
-* SCP the backup off the source server onto the destination server
+* Remove the backup from within the container: `docker exec or-postgresql-1 rm /tmp/db.bak`
+* SCP the backup off the source server onto the destination server: e.g. `scp <HOST>:~/db.bak .`
 * On the destination server stop the manager and Keycloak containers and any project specific containers that are using the DB: `docker stop or-manager-1 or-keycloak-1`
 * Copy backup into the postgresql container: `docker cp db.bak or-postgresql-1:/tmp/`
 * Drop existing DB: `docker exec or-postgresql-1 dropdb openremote`
@@ -139,6 +141,13 @@ mv -v data/old/* $PGDATA
 rm -r data/new data/old
 ```
 
+## Bash
+### SSH tunnel for proxy stats
+HAProxy stats web page is only accessible on localhost in our default config, this can be tunnelled to your local machine to allow access at http://localhost:8404/stats:
+```shell
+ssh -L 8404:localhost:8404 <HOST>
+```
+
 ## Queries
 
 ### Get DB table size info
diff --git a/docs/user-guide/metrics.md b/docs/user-guide/metrics.md
new file mode 100644
index 0000000..de31448
--- /dev/null
+++ b/docs/user-guide/metrics.md
@@ -0,0 +1,431 @@
+# Metrics
+
+Prometheus formatted metrics endpoints can be configured for each container (including the OpenRemote Manager), you will either need Prometheus server running to scrape these endpoints or use a cloud provider service; here's an example using AWS Cloudwatch:
+
+```mermaid
+graph LR
+    %% Styling Definitions
+    classDef greenStyle fill:#d4edda,stroke:#28a745,stroke-width:2px,color:#000;
+    classDef innerGreenStyle fill:#e8f5e9,stroke:#28a745,stroke-width:1px,color:#000;
+    classDef orangeStyle fill:#ffe0b2,stroke:#f57c00,stroke-width:2px,color:#000;
+    classDef redStyle fill:#ffcdd2,stroke:#c62828,stroke-width:2px,color:#000;
+    classDef purpleStyle fill:#e1bee7,stroke:#7b1fa2,stroke-width:2px,color:#000;
+
+    subgraph AWS [AWS]
+        direction TB
+        CW[Cloudwatch]:::orangeStyle
+        DB["<b>Dashboard</b><br/>or-default<br/>- Standard dashboard uses variables to update widgets<br/>- Instance names list generated from list of or_attributes_total metrics<br/>- Metrics are sampled over configurable period<br/>- Sampling configuration can be tricky"]:::purpleStyle
+    end
+
+    subgraph EC2 [EC2 Instance]
+        
+        subgraph CWAgent [Cloudwatch Agent]
+            direction TB
+            CWConfig["<b>Cloudwatch Config</b><br/>/opt/aws/amazon-cloudwatch-agent/var/config.json<br/>- Cloudwatch agent is able to act like Prometheus server<br/>- Regex filters and matchers to select metrics<br/>- Cloudwatch maps metric types to its own"]:::innerGreenStyle
+            PromScrape["<b>Prometheus Scrape Config</b><br/>/opt/aws/amazon-cloudwatch-agent/var/prometheus.yaml<br/>- Defines the scrape configs for each container<br/>- Be aware some functionality does not work"]:::innerGreenStyle
+        end
+
+        subgraph Docker [Docker Containers]
+            direction TB
+            Manager["<b>Manager</b><br/>http://localhost:8404/metrics<br/>- Micrometer with Prometheus Registry<br/>- Runs on own embedded web server port 8404<br/>- OR_METRICS_ENABLED: true/false"]:::greenStyle
+            HAProxy["<b>HA Proxy</b><br/>http://localhost:8404/metrics<br/>- Uses prometheus-exporter<br/>- Runs on own embedded web server port 8404<br/>- Configured via haproxy.cfg"]:::greenStyle
+            Keycloak["<b>Keycloak</b><br/>http://localhost:8080/metrics<br/>- Built in prometheus metrics support<br/>- KC_METRICS_ENABLED: true/false<br/>- Do not publicly expose"]:::orangeStyle
+            PostgreSQL["<b>PostgreSQL</b><br/>- No metrics at present could use postgresql-exporter"]:::redStyle
+        end
+    end
+
+    %% Connections
+    PromScrape --> Manager
+    PromScrape --> HAProxy
+    CWAgent --> CW
+    CW --> DB
+
+```
+
+Refer to the website of each container app for details of metrics exposed and their meaning; here's an overview of the OpenRemote Manager metrics.
+
+## OpenRemote Manager
+<table>
+  <thead>
+    <tr>
+      <th width="10%">Component</th>
+      <th width="15%">Metric name</th>
+      <th width="5%">Type</th>
+      <th width="25%">Labels</th>
+      <th>Description <br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_active</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>If the server is active</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_address_memory_usage</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Memory used by all the addresses on broker for in-memory messages</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_address_memory_usage_percentage</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Memory used by all the addresses on broker as a percentage of the global-max-size</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_address_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost</td>
+      <td>The number of estimated bytes being used by all the queue(s) bound to this address; used to control paging and blocking</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_authentication_count</td>
+      <td>gauge</td>
+      <td>broker: localhost<br/>result: failure | success</td>
+      <td>Number of successful authentication attempts</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_authorization_count</td>
+      <td>gauge</td>
+      <td>broker: localhost<br/>result: failure | success</td>
+      <td>Number of successful authorization attempts</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_connection_count</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Number of clients connected to this server</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_consumer_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of consumers consuming messages from this queue</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_delivering_durable_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of durable messages that this queue is currently delivering to its consumers</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_delivering_durable_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of durable messages that this queue is currently delivering to its consumers</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_delivering_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages that this queue is currently delivering to its consumers</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_delivering_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of messages that this queue is currently delivering to its consumers</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_disk_store_usage</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Fraction of total disk store used</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_durable_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of durable messages currently in this queue (includes scheduled, paged, and in-delivery messages)</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_durable_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of durable messages currently in this queue (includes scheduled, paged, and in-delivery messages)</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_limit_percent</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost</td>
+      <td>The % of memory limit (global or local) that is in use by this address</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages currently in this queue (includes scheduled, paged, and in-delivery messages)</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_messages_acknowledged</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages acknowledged from this queue since it was created</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_messages_added</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages added to this queue since it was created</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_messages_expired</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages expired from this queue since it was created</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_messages_killed</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of messages removed from this queue since it was created due to exceeding the max delivery attempts</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_number_of_pages</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost</td>
+      <td>Number of pages used by this address</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of all messages (including durable and non-durable) currently in this queue (includes scheduled, paged, and in-delivery messages)</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_replica_sync</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>If the initial replication synchronization process is complete</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_routed_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost</td>
+      <td>Number of messages routed to one or more bindings</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_scheduled_durable_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of durable scheduled messages in this queue</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_scheduled_durable_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of durable scheduled messages in this queue</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_scheduled_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Number of scheduled messages in this queue</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_scheduled_persistent_size</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost<br/>queue: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request</td>
+      <td>Persistent size of scheduled messages in this queue</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_session_count</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Number of sessions on this server</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_total_connection_count</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Total number of clients which have connected to this server since it was started</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_total_session_count</td>
+      <td>gauge</td>
+      <td>broker: localhost</td>
+      <td>Total number of sessions created on this server since it was started</td>
+    </tr>
+    <tr>
+      <td>Artemis</td>
+      <td>artemis_unrouted_message_count</td>
+      <td>gauge</td>
+      <td>address: \*.\*.writeattribute.# | \*.\*.writeattributevalue.# | provisioning.\*.request<br/>broker: localhost</td>
+      <td>Number of messages not routed to any bindings</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_active_threads</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The approximate number of threads that are actively executing tasks</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_completed_tasks_total</td>
+      <td>counter</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The approximate total number of tasks that have completed execution</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_idle_seconds</td>
+      <td>summary</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>Idle time of executor</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_idle_seconds_max</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>Maximum idle time of executor</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_pool_core_threads</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The core number of threads for the pool</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_pool_max_threads</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The maximum allowed number of threads in the pool</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_pool_size_threads</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The current number of threads in the pool</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_queue_remaining_tasks</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The number of additional elements that this queue can ideally accept without blocking</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_queued_tasks</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>The approximate number of tasks that are queued for execution</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_scheduled_once_total</td>
+      <td>counter</td>
+      <td>name: ContainerExecutor</td>
+      <td>Total tasks scheduled once</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_scheduled_repetitively_total</td>
+      <td>counter</td>
+      <td>name: ContainerScheduledExecutor</td>
+      <td>Total tasks scheduled repetitively</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_seconds</td>
+      <td>summary</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>Measures executor task execution time</td>
+    </tr>
+    <tr>
+      <td>Executors</td>
+      <td>executor_seconds_max</td>
+      <td>gauge</td>
+      <td>name: ContainerExecutor | ContainerScheduledExecutor</td>
+      <td>Maximum execution time of executor tasks</td>
+    </tr>
+    <tr>
+      <td>Events</td>
+      <td>or_attributes_total</td>
+      <td>counter</td>
+      <td>source: AgentService | AttributeLinkingService | EnergyOptimisationService | GatewayService | RulesEngine | none | ...</td>
+      <td>Total attributes processed by source</td>
+    </tr>
+    <tr>
+      <td>Events</td>
+      <td>or_attributes_seconds</td>
+      <td>summary</td>
+      <td>(none)</td>
+      <td>Total time spent processing attribute events</td>
+    </tr>
+    <tr>
+      <td>Events</td>
+      <td>or_attributes_seconds_max</td>
+      <td>gauge</td>
+      <td>(none)</td>
+      <td>Maximum time spent processing an attribute event</td>
+    </tr>
+    <tr>
+      <td>Events</td>
+      <td>or_provisioning_seconds</td>
+      <td>summary</td>
+      <td>(none)</td>
+      <td>Total time spent processing provisioning requests</td>
+    </tr>
+    <tr>
+      <td>Events</td>
+      <td>or_provisioning_seconds_max</td>
+      <td>gauge</td>
+      <td>(none)</td>
+      <td>Maximum time spent processing provisioning requests</td>
+    </tr>
+    <tr>
+      <td>Rules</td>
+      <td>or_rules_seconds</td>
+      <td>summary</td>
+      <td>(none)</td>
+      <td>Total time spent processing rules</td>
+    </tr>
+    <tr>
+      <td>Rules</td>
+      <td>or_rules_seconds_max</td>
+      <td>gauge</td>
+      <td>(none)</td>
+      <td>Maximum time spent processing rules</td>
+    </tr>
+  </tbody>
+</table>