diff --git a/packages/rabbitmq/changelog.yml b/packages/rabbitmq/changelog.yml
index a7a420edcede..da4843a1eac0 100644
--- a/packages/rabbitmq/changelog.yml
+++ b/packages/rabbitmq/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.8.0"
+  changes:
+    - description: Added dimension fields for connection datastream to enable TSDB.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/5717
 - version: "1.7.0"
   changes:
     - description: Migrate visualizations to lens.
diff --git a/packages/rabbitmq/data_stream/connection/fields/agent.yml b/packages/rabbitmq/data_stream/connection/fields/agent.yml
index da4e652c53b8..4f62096bf6ea 100644
--- a/packages/rabbitmq/data_stream/connection/fields/agent.yml
+++ b/packages/rabbitmq/data_stream/connection/fields/agent.yml
@@ -25,6 +25,7 @@
       ignore_above: 1024
       description: Instance ID of the host machine.
       example: i-1234567890abcdef0
+      dimension: true
     - name: instance.name
       level: extended
       type: keyword
@@ -42,6 +43,7 @@
       ignore_above: 1024
       description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
       example: aws
+      dimension: true
     - name: region
       level: extended
       type: keyword
@@ -51,6 +53,7 @@
     - name: project.id
       type: keyword
       description: Name of the project in Google Cloud.
+      dimension: true
     - name: image.id
       type: keyword
       description: Image ID for the cloud instance.
@@ -67,6 +70,7 @@
       type: keyword
       ignore_above: 1024
       description: Unique container id.
+      dimension: true
     - name: image.name
       level: extended
       type: keyword
@@ -134,6 +138,7 @@
       level: core
       type: keyword
       ignore_above: 1024
+      dimension: true
       description: 'Name of the host.
 
         It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.'
@@ -196,3 +201,11 @@
       description: >
         OS codename, if any.
 
+- name: agent
+  title: Agent
+  type: group
+  fields:
+    - name: id
+      type: keyword
+      ignore_above: 1024
+      dimension: true
diff --git a/packages/rabbitmq/data_stream/connection/fields/ecs.yml b/packages/rabbitmq/data_stream/connection/fields/ecs.yml
index 59b37655563f..0b8b5f3f167e 100644
--- a/packages/rabbitmq/data_stream/connection/fields/ecs.yml
+++ b/packages/rabbitmq/data_stream/connection/fields/ecs.yml
@@ -6,5 +6,6 @@
   name: ecs.version
 - external: ecs
   name: service.address
+  dimension: true
 - external: ecs
   name: service.type
diff --git a/packages/rabbitmq/data_stream/connection/fields/fields.yml b/packages/rabbitmq/data_stream/connection/fields/fields.yml
index e58363b0fc90..fa63a824684b 100644
--- a/packages/rabbitmq/data_stream/connection/fields/fields.yml
+++ b/packages/rabbitmq/data_stream/connection/fields/fields.yml
@@ -3,6 +3,8 @@
   fields:
     - name: name
       type: keyword
+      # Reason for adding as dimension field : Name is used to identify an application.
+      dimension: true
       description: |
         The name of the connection with non-ASCII characters escaped as in C.
     - name: state
diff --git a/packages/rabbitmq/docs/README.md b/packages/rabbitmq/docs/README.md
index 59326174fcac..56342cb9edcc 100644
--- a/packages/rabbitmq/docs/README.md
+++ b/packages/rabbitmq/docs/README.md
@@ -131,6 +131,7 @@ An example event for `connection` looks as following:
 | Field | Description | Type |
 |---|---|---|
 | @timestamp | Event timestamp. | date |
+| agent.id |  | keyword |
 | cloud.account.id | The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier. | keyword |
 | cloud.availability_zone | Availability zone in which this host is running. | keyword |
 | cloud.image.id | Image ID for the cloud instance. | keyword |
diff --git a/packages/rabbitmq/manifest.yml b/packages/rabbitmq/manifest.yml
index f8ce759160bc..b82f3b3e1357 100644
--- a/packages/rabbitmq/manifest.yml
+++ b/packages/rabbitmq/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: rabbitmq
 title: RabbitMQ Logs
-version: 1.7.0
+version: 1.8.0
 license: basic
 description: Collect and parse logs from RabbitMQ servers with Elastic Agent.
 type: integration