diff --git a/.gitignore b/.gitignore
index 9ac996ef6b..2c7eecd88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ ee/query-service/tests/test-deploy/data/
 bin/
 .local/
 */query-service/queries.active
+ee/query-service/db
 
 # e2e
 
diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.json
new file mode 100644
index 0000000000..c50a95d8ef
--- /dev/null
+++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.json
@@ -0,0 +1,1189 @@
+{
+  "description": "Overview Dashboard for Amazon MSK",
+  "image": "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8"?>
<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/64/Arch_Amazon-Managed-Streaming-for-Kafka_64</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
            <stop stop-color="#4D27A8" offset="0%"></stop>
            <stop stop-color="#A166FF" offset="100%"></stop>
        </linearGradient>
    </defs>
    <g id="Icon-Architecture/64/Arch_Amazon-Managed-Streaming-for-Kafka_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="Icon-Architecture-BG/64/Analytics" fill="url(#linearGradient-1)">
            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
        </g>
        <path d="M36.0081373,36.9770888 L36.0081373,27.9864616 L38.0040686,27.9864616 L38.0040686,31.9822959 L40.697578,27.9864616 L42.907074,27.9864616 L39.7854374,32.1900793 L43.1645492,36.9770888 L40.7973746,36.9770888 L38.0040686,32.631619 L38.0040686,36.9770888 L36.0081373,36.9770888 Z M66,49.1174325 L65.331363,49.6958295 C63.9841093,50.8755996 62.1718036,51.4659841 60.357502,51.4659841 C58.5432004,51.4659841 56.7279008,50.8755996 55.3786512,49.6928326 L54.0453691,48.5380365 C52.0893563,46.8238236 48.665336,46.8238236 46.7133152,48.5340406 L45.3720493,49.6958295 C42.6785399,52.0563686 38.1168388,52.0583665 35.4193375,49.6928326 L34.0860553,48.5380365 C32.1300426,46.8238236 28.7060223,46.8238236 26.7540015,48.5340406 L25.4127356,49.6958295 C22.7192262,52.0563686 18.157525,52.0583665 15.4600238,49.6928326 L14.7953787,49.1174325 L16.1017157,47.6060081 L16.7703527,48.1854041 C18.7273635,49.899617 22.1513837,49.899617 24.1024066,48.1893999 L25.4436725,47.0266121 C28.1371819,44.667072 32.698883,44.667072 35.3963843,47.030608 L36.7296664,48.1854041 C38.6866772,49.899617 42.1106974,49.899617 44.0617203,48.1893999 L45.4029862,47.0266121 C48.0964956,44.667072 52.6581968,44.667072 55.355698,47.030608 L56.6889802,48.1854041 C58.6449929,49.899617 62.0690132,49.899617 64.021034,48.1893999 L64.6936629,47.6060081 L66,49.1174325 Z M63.8982843,61.139899 L65.2046213,62.6503244 L64.5359843,63.2297203 C63.1897286,64.4094904 61.3774229,64.998876 59.5641193,64.998876 C57.7488197,64.998876 55.9335201,64.4084915 54.5832726,63.2257245 L53.2499904,62.0709284 C51.2939777,60.3587134 47.8699574,60.3587134 45.9179365,62.0669326 L44.5766706,63.2297203 C41.8851572,65.5902595 37.323456,65.5912584 34.6239589,63.2257245 L33.2906767,62.0709284 C31.3356619,60.3587134 27.9116417,60.3587134 25.9586228,62.0669326 L24.6173569,63.2297203 C21.9248455,65.5902595 17.3631444,65.5912584 14.6646451,63.2257245 L14,62.6503244 L15.3063371,61.139899 L15.9749741,61.719295 C17.9319848,63.43151 21.3560051,63.4325089 23.307028,61.7222918 L24.6482939,60.560503 C27.3428012,58.2009628 31.9025064,58.1999639 34.6010056,60.5634999 L35.9342878,61.719295 C37.8912985,63.43151 41.3153188,63.4325089 43.2663417,61.7222918 L44.6076076,60.560503 C47.3021149,58.2009628 51.8618201,58.1999639 54.5603193,60.5634999 L55.8936015,61.719295 C57.8506122,63.43151 61.2746325,63.4325089 63.2256554,61.7222918 L63.8982843,61.139899 Z M63.8982843,54.8065016 L65.2046213,56.315928 L64.5359843,56.895324 C61.8434729,59.2568621 57.2817718,59.257861 54.5832726,56.8923271 L53.2499904,55.737531 C51.2939777,54.0233181 47.8699574,54.024317 45.9179365,55.7335351 L44.5766706,56.8963229 C43.2304149,58.076093 41.4171113,58.6654786 39.6048056,58.6654786 C37.789506,58.6654786 35.9742064,58.0750941 34.6239589,56.8923271 L33.2906767,55.737531 C31.3356619,54.0233181 27.9116417,54.024317 25.9586228,55.7335351 L24.6173569,56.8963229 C21.9258435,59.2568621 17.3641423,59.2568621 14.6646451,56.8923271 L14,56.315928 L15.3063371,54.8065016 L15.9749741,55.3858976 C17.9319848,57.1001105 21.3560051,57.0991115 23.307028,55.3888944 L24.6482939,54.2271056 C27.3428012,51.8675654 31.9045024,51.8655675 34.6010056,54.2301025 L35.9342878,55.3848986 C37.8912985,57.1001105 41.3153188,57.0991115 43.2663417,55.3888944 L44.6076076,54.2271056 C47.3021149,51.8675654 51.8638161,51.8655675 54.5603193,54.2301025 L55.8936015,55.3848986 C57.8506122,57.1001105 61.2746325,57.0991115 63.2256554,55.3888944 L63.8982843,54.8065016 Z M24.032549,37.9760474 C25.1333052,37.9760474 26.0284804,38.8721132 26.0284804,39.9739646 C26.0284804,41.0758159 25.1333052,41.9718817 24.032549,41.9718817 C22.9317929,41.9718817 22.0366177,41.0758159 22.0366177,39.9739646 C22.0366177,38.8721132 22.9317929,37.9760474 24.032549,37.9760474 L24.032549,37.9760474 Z M39.0020343,16.9979172 C40.1027905,16.9979172 40.9979657,17.893983 40.9979657,18.9958343 C40.9979657,20.0976856 40.1027905,20.9937515 39.0020343,20.9937515 C37.9012782,20.9937515 37.0061029,20.0976856 37.0061029,18.9958343 C37.0061029,17.893983 37.9012782,16.9979172 39.0020343,16.9979172 L39.0020343,16.9979172 Z M55.967451,39.9739646 C55.967451,41.0758159 55.0722757,41.9718817 53.9715196,41.9718817 C52.8707634,41.9718817 51.9755882,41.0758159 51.9755882,39.9739646 C51.9755882,38.8721132 52.8707634,37.9760474 53.9715196,37.9760474 C55.0722757,37.9760474 55.967451,38.8721132 55.967451,39.9739646 L55.967451,39.9739646 Z M39.0020343,22.9916687 C39.6666795,22.9916687 40.2854182,22.8128551 40.8372932,22.5231571 L51.0045676,37.3267243 C50.5884159,37.792239 50.2830384,38.3526548 50.1223659,38.975006 L27.8817027,38.975006 C27.7210302,38.3526548 27.4156527,37.792239 26.999501,37.3267243 L37.1667754,22.5231571 C37.7186504,22.8128551 38.3373892,22.9916687 39.0020343,22.9916687 L39.0020343,22.9916687 Z M24.032549,43.9697989 C25.8867693,43.9697989 27.43661,42.6911319 27.8817027,40.9729231 L50.1223659,40.9729231 C50.5674586,42.6911319 52.1172994,43.9697989 53.9715196,43.9697989 C56.1730319,43.9697989 57.9633823,42.1776672 57.9633823,39.9739646 C57.9633823,37.7702619 56.1730319,35.9781302 53.9715196,35.9781302 C53.5114574,35.9781302 53.0763444,36.0720323 52.6631866,36.2158824 L42.3372356,21.1805567 C42.7503934,20.5522118 42.9938971,19.8029929 42.9938971,18.9958343 C42.9938971,16.7921317 41.2035466,15 39.0020343,15 C36.800522,15 35.0101716,16.7921317 35.0101716,18.9958343 C35.0101716,19.8029929 35.2536752,20.5522118 35.666833,21.1805567 L25.340882,36.2158824 C24.9277243,36.0720323 24.4926112,35.9781302 24.032549,35.9781302 C21.8310367,35.9781302 20.0406863,37.7702619 20.0406863,39.9739646 C20.0406863,42.1776672 21.8310367,43.9697989 24.032549,43.9697989 L24.032549,43.9697989 Z" id="Amazon-Managed-Streaming-for-Kafka-Icon_64_Squid" fill="#FFFFFF"></path>
    </g>
</svg>",
+  "layout": [
+    {
+      "h": 6,
+      "i": "238ff900-c0e4-4e29-83e3-d6acfcc9c6e5",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 0,
+      "y": 0
+    },
+    {
+      "h": 6,
+      "i": "e201e9c4-7a52-4558-a5f9-10d8686a6890",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 6,
+      "y": 0
+    },
+    {
+      "h": 6,
+      "i": "fcf5c63c-5da6-4f96-9243-5f42980df049",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 0,
+      "y": 6
+    },
+    {
+      "h": 6,
+      "i": "601ec1b7-f614-4678-b445-7f6b8fec2e16",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 6,
+      "y": 6
+    },
+    {
+      "h": 6,
+      "i": "e2ab4538-bc01-4e96-b3e0-c7f73a2c972f",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 0,
+      "y": 12
+    },
+    {
+      "h": 6,
+      "i": "f15ba73d-d85e-48ac-b478-e6911965e9e3",
+      "moved": false,
+      "static": false,
+      "w": 6,
+      "x": 6,
+      "y": 12
+    }
+  ],
+  "panelMap": {},
+  "tags": [],
+  "title": "Overview of Amazon MSK",
+  "uploadedGrafana": false,
+  "variables": {
+    "627dec44-a04e-44c7-9dd4-b0fdaf4b5b62": {
+      "allSelected": false,
+      "customValue": "",
+      "description": "Cloud Account ID of AWS",
+      "id": "627dec44-a04e-44c7-9dd4-b0fdaf4b5b62",
+      "key": "627dec44-a04e-44c7-9dd4-b0fdaf4b5b62",
+      "modificationUUID": "b23952ff-b081-468c-bf50-96a062383743",
+      "multiSelect": false,
+      "name": "Account",
+      "order": 0,
+      "queryValue": "SELECT DISTINCT JSONExtractString(labels, 'cloud_account_id') AS cloud_account_id\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'aws_Kafka_KafkaDataLogsDiskUsed_max' GROUP BY cloud_account_id\n",
+      "showALLOption": false,
+      "sort": "DISABLED",
+      "textboxValue": "",
+      "type": "QUERY"
+    },
+    "c69e90bd-adaa-4f75-9108-1c6e91a00fbc": {
+      "allSelected": false,
+      "customValue": "",
+      "description": "AWS Region",
+      "id": "c69e90bd-adaa-4f75-9108-1c6e91a00fbc",
+      "modificationUUID": "07f23d13-c94e-452c-b917-04124f910942",
+      "multiSelect": false,
+      "name": "Region",
+      "order": 0,
+      "queryValue": "SELECT DISTINCT JSONExtractString(labels, 'cloud_region') AS region\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'aws_Kafka_KafkaDataLogsDiskUsed_max' AND JSONExtractString(labels, 'cloud_account_id') IN {{.Account}} GROUP BY region\n",
+      "showALLOption": false,
+      "sort": "DISABLED",
+      "textboxValue": "",
+      "type": "QUERY"
+    }
+  },
+  "version": "v4",
+  "widgets": [
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "238ff900-c0e4-4e29-83e3-d6acfcc9c6e5",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_KafkaDataLogsDiskUsed_max--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_KafkaDataLogsDiskUsed_max",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "max",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "be8452fb",
+                    "key": {
+                      "dataType": "string",
+                      "id": "Broker_ID--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "Broker_ID",
+                      "type": "tag"
+                    },
+                    "op": "exists",
+                    "value": ""
+                  },
+                  {
+                    "id": "8b658843",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  },
+                  {
+                    "id": "9cbc21ee",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                },
+                {
+                  "dataType": "string",
+                  "id": "Broker_ID--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Broker_ID",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "Broker {{Broker_ID}} ({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "max",
+              "stepInterval": 60,
+              "timeAggregation": "max"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "caafc0b7-fc3c-472d-87cd-ae176e4d9602",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": "Disk usage by (Cluster, Broker)",
+      "yAxisUnit": "percent"
+    },
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "e201e9c4-7a52-4558-a5f9-10d8686a6890",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_CpuUser_max--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_CpuUser_max",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "max",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "03054a63",
+                    "key": {
+                      "dataType": "string",
+                      "id": "Broker_ID--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "Broker_ID",
+                      "type": "tag"
+                    },
+                    "op": "exists",
+                    "value": ""
+                  },
+                  {
+                    "id": "754c3c99",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  },
+                  {
+                    "id": "09ad3a79",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Broker_ID--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Broker_ID",
+                  "type": "tag"
+                },
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "Broker {{Broker_ID}} ({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "max",
+              "stepInterval": 60,
+              "timeAggregation": "max"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "476bd12d-7454-41e9-89b3-27406083bbaa",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": "CPU (User) usage by (Cluster, Broker)",
+      "yAxisUnit": "percent"
+    },
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "fcf5c63c-5da6-4f96-9243-5f42980df049",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_CpuSystem_max--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_CpuSystem_max",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "max",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "1c4feb03",
+                    "key": {
+                      "dataType": "string",
+                      "id": "Broker_ID--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "Broker_ID",
+                      "type": "tag"
+                    },
+                    "op": "exists",
+                    "value": ""
+                  },
+                  {
+                    "id": "3e5db1d7",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  },
+                  {
+                    "id": "9e9bf94c",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Broker_ID--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Broker_ID",
+                  "type": "tag"
+                },
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "Broker {{Broker_ID}} ({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "max",
+              "stepInterval": 60,
+              "timeAggregation": "max"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "91132e98-9068-48cf-ad89-af9a4bcb5a40",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": "CPU (System) usage by (Cluster, Broker)",
+      "yAxisUnit": "percent"
+    },
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "601ec1b7-f614-4678-b445-7f6b8fec2e16",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_NetworkTxPackets_sum--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_NetworkTxPackets_sum",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "sum",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "df3f9941",
+                    "key": {
+                      "dataType": "string",
+                      "id": "Broker_ID--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "Broker_ID",
+                      "type": "tag"
+                    },
+                    "op": "exists",
+                    "value": ""
+                  },
+                  {
+                    "id": "2233f9a5",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  },
+                  {
+                    "id": "52bd69d4",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Broker_ID--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Broker_ID",
+                  "type": "tag"
+                },
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "Broker {{Broker_ID}} ({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "sum",
+              "stepInterval": 60,
+              "timeAggregation": "sum"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "47d4e8b7-2ca3-412c-a48a-bfbd592b0709",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": " Network TX packets by (Cluster, Broker)",
+      "yAxisUnit": "none"
+    },
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "e2ab4538-bc01-4e96-b3e0-c7f73a2c972f",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_NetworkRxPackets_sum--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_NetworkRxPackets_sum",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "sum",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "a00425be",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  },
+                  {
+                    "id": "726d60d7",
+                    "key": {
+                      "dataType": "string",
+                      "id": "Broker_ID--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "Broker_ID",
+                      "type": "tag"
+                    },
+                    "op": "exists",
+                    "value": ""
+                  },
+                  {
+                    "id": "02adea69",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Broker_ID--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Broker_ID",
+                  "type": "tag"
+                },
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "Broker {{Broker_ID}} ({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "sum",
+              "stepInterval": 60,
+              "timeAggregation": "sum"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "1c6ec479-a7d2-4f8f-bb31-1bf2a6b6fc25",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": "Network RX packets by (Cluster, Broker)",
+      "yAxisUnit": "none"
+    },
+    {
+      "bucketCount": 30,
+      "bucketWidth": 0,
+      "columnUnits": {},
+      "description": "",
+      "fillSpans": false,
+      "id": "f15ba73d-d85e-48ac-b478-e6911965e9e3",
+      "isStacked": false,
+      "mergeAllActiveQueries": false,
+      "nullZeroValues": "zero",
+      "opacity": "1",
+      "panelTypes": "graph",
+      "query": {
+        "builder": {
+          "queryData": [
+            {
+              "aggregateAttribute": {
+                "dataType": "float64",
+                "id": "aws_Kafka_SumOffsetLag_max--float64--Gauge--true",
+                "isColumn": true,
+                "isJSON": false,
+                "key": "aws_Kafka_SumOffsetLag_max",
+                "type": "Gauge"
+              },
+              "aggregateOperator": "max",
+              "dataSource": "metrics",
+              "disabled": false,
+              "expression": "A",
+              "filters": {
+                "items": [
+                  {
+                    "id": "0626eebd",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_account_id--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_account_id",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Account"
+                  },
+                  {
+                    "id": "b633d867",
+                    "key": {
+                      "dataType": "string",
+                      "id": "cloud_region--string--tag--false",
+                      "isColumn": false,
+                      "isJSON": false,
+                      "key": "cloud_region",
+                      "type": "tag"
+                    },
+                    "op": "=",
+                    "value": "$Region"
+                  }
+                ],
+                "op": "AND"
+              },
+              "functions": [],
+              "groupBy": [
+                {
+                  "dataType": "string",
+                  "id": "Cluster_Name--string--tag--false",
+                  "isColumn": false,
+                  "isJSON": false,
+                  "key": "Cluster_Name",
+                  "type": "tag"
+                }
+              ],
+              "having": [],
+              "legend": "({{Cluster_Name}})",
+              "limit": null,
+              "orderBy": [],
+              "queryName": "A",
+              "reduceTo": "avg",
+              "spaceAggregation": "max",
+              "stepInterval": 60,
+              "timeAggregation": "max"
+            }
+          ],
+          "queryFormulas": []
+        },
+        "clickhouse_sql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "id": "49e4cbd5-d4d1-40a4-8724-7d6580dee56e",
+        "promql": [
+          {
+            "disabled": false,
+            "legend": "",
+            "name": "A",
+            "query": ""
+          }
+        ],
+        "queryType": "builder"
+      },
+      "selectedLogFields": [
+        {
+          "dataType": "string",
+          "name": "body",
+          "type": ""
+        },
+        {
+          "dataType": "string",
+          "name": "timestamp",
+          "type": ""
+        }
+      ],
+      "selectedTracesFields": [
+        {
+          "dataType": "string",
+          "id": "serviceName--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "serviceName",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "name--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "name",
+          "type": "tag"
+        },
+        {
+          "dataType": "float64",
+          "id": "durationNano--float64--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "durationNano",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "httpMethod--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "httpMethod",
+          "type": "tag"
+        },
+        {
+          "dataType": "string",
+          "id": "responseStatusCode--string--tag--true",
+          "isColumn": true,
+          "isJSON": false,
+          "key": "responseStatusCode",
+          "type": "tag"
+        }
+      ],
+      "softMax": 0,
+      "softMin": 0,
+      "stackedBarChart": false,
+      "thresholds": [],
+      "timePreferance": "GLOBAL_TIME",
+      "title": "Lag Offset by Cluster",
+      "yAxisUnit": "none"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.png b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.png
new file mode 100644
index 0000000000..dd89dbef89
Binary files /dev/null and b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/assets/dashboards/overview.png differ
diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/icon.svg b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/icon.svg
new file mode 100644
index 0000000000..91bc2931f6
--- /dev/null
+++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/icon.svg
@@ -0,0 +1 @@
+<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid"><title>AWS Managed Streaming for Apache Kafka (MSK)</title><defs><linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="a"><stop stop-color="#4D27A8" offset="0%"/><stop stop-color="#A166FF" offset="100%"/></linearGradient></defs><g><rect fill="url(#a)" width="256" height="256"/><path d="M115.226039,118.326684 L115.226039,89.5566771 L121.61302,89.5566771 L121.61302,102.343347 L130.23225,89.5566771 L137.302637,89.5566771 L127.3134,103.008254 L138.126557,118.326684 L130.551599,118.326684 L121.61302,104.421181 L121.61302,118.326684 L115.226039,118.326684 Z M211.2,157.175784 L209.060362,159.026654 C204.74915,162.801919 198.949772,164.691149 193.144006,164.691149 C187.338241,164.691149 181.529283,162.801919 177.211684,159.017064 L172.945181,155.321717 C166.68594,149.836236 155.729075,149.836236 149.482609,155.30893 L145.190558,159.026654 C136.571328,166.58038 121.973884,166.586773 113.34188,159.017064 L109.075377,155.321717 C102.816136,149.836236 91.8592714,149.836236 85.6128048,155.30893 L81.3207539,159.026654 C72.7015238,166.58038 58.10408,166.586773 49.4720762,159.017064 L47.3452118,157.175784 L51.5254902,152.339226 L53.6651286,154.193293 C59.9275632,159.678774 70.8844278,159.678774 77.1277011,154.20608 L81.419752,150.485159 C90.0389821,142.93463 104.636426,142.93463 113.26843,150.497946 L117.534932,154.193293 C123.797367,159.678774 134.754232,159.678774 140.997505,154.20608 L145.289556,150.485159 C153.908786,142.93463 168.50623,142.93463 177.138234,150.497946 L181.404737,154.193293 C187.663977,159.678774 198.620842,159.678774 204.867309,154.20608 L207.019721,152.339226 L211.2,157.175784 Z M204.47451,195.647677 L208.654788,200.481038 L206.51515,202.335105 C202.207132,206.110369 196.407753,207.996403 190.605182,207.996403 C184.796223,207.996403 178.987264,206.107173 174.666472,202.322318 L170.399969,198.626971 C164.140729,193.147883 153.183864,193.147883 146.937397,198.614184 L142.645346,202.335105 C134.032503,209.88883 119.435059,209.892027 110.796668,202.322318 L106.530165,198.626971 C100.274118,193.147883 89.3172534,193.147883 83.067593,198.614184 L78.7755421,202.335105 C70.1595056,209.88883 55.5620621,209.892027 46.9268643,202.322318 L44.8,200.481038 L48.9802787,195.647677 L51.1199171,197.501744 C57.3823514,202.980832 68.3392163,202.984028 74.5824896,197.511334 L78.8745405,193.79361 C87.4969638,186.243081 102.08802,186.239884 110.723218,193.8032 L114.989721,197.501744 C121.252155,202.980832 132.20902,202.984028 138.452293,197.511334 L142.744344,193.79361 C151.366768,186.243081 165.957824,186.239884 174.593022,193.8032 L178.859525,197.501744 C185.121959,202.980832 196.078824,202.984028 202.322097,197.511334 L204.47451,195.647677 Z M204.47451,175.380805 L208.654788,180.21097 L206.51515,182.065037 C197.899113,189.621959 183.30167,189.625155 174.666472,182.055447 L170.399969,178.360099 C164.140729,172.874618 153.183864,172.877814 146.937397,178.347312 L142.645346,182.068233 C138.337328,185.843498 132.534756,187.729532 126.735378,187.729532 C120.926419,187.729532 115.11746,185.840301 110.796668,182.055447 L106.530165,178.360099 C100.274118,172.874618 89.3172534,172.877814 83.067593,178.347312 L78.7755421,182.068233 C70.1626992,189.621959 55.5652554,189.621959 46.9268643,182.055447 L44.8,180.21097 L48.9802787,175.380805 L51.1199171,177.234872 C57.3823514,182.720354 68.3392163,182.717157 74.5824896,177.244462 L78.8745405,173.526738 C87.4969638,165.976209 102.094408,165.969816 110.723218,173.536328 L114.989721,177.231676 C121.252155,182.720354 132.20902,182.717157 138.452293,177.244462 L142.744344,173.526738 C151.366768,165.976209 165.964212,165.969816 174.593022,173.536328 L178.859525,177.231676 C185.121959,182.720354 196.078824,182.717157 202.322097,177.244462 L204.47451,175.380805 Z M76.9041568,121.523352 C80.4265766,121.523352 83.2911373,124.390762 83.2911373,127.916687 C83.2911373,131.442611 80.4265766,134.310021 76.9041568,134.310021 C73.3817373,134.310021 70.5171766,131.442611 70.5171766,127.916687 C70.5171766,124.390762 73.3817373,121.523352 76.9041568,121.523352 L76.9041568,121.523352 Z M124.80651,54.393335 C128.32893,54.393335 131.19349,57.2607456 131.19349,60.7866698 C131.19349,64.3125939 128.32893,67.1800048 124.80651,67.1800048 C121.28409,67.1800048 118.419529,64.3125939 118.419529,60.7866698 C118.419529,57.2607456 121.28409,54.393335 124.80651,54.393335 L124.80651,54.393335 Z M179.095843,127.916687 C179.095843,131.442611 176.231282,134.310021 172.708863,134.310021 C169.186443,134.310021 166.321882,131.442611 166.321882,127.916687 C166.321882,124.390762 169.186443,121.523352 172.708863,121.523352 C176.231282,121.523352 179.095843,124.390762 179.095843,127.916687 L179.095843,127.916687 Z M124.80651,73.5733398 C126.933374,73.5733398 128.913338,73.0011363 130.679338,72.0741027 L163.214616,119.445518 C161.882931,120.935165 160.905723,122.728495 160.391571,124.720019 L89.2214486,124.720019 C88.7072966,122.728495 87.7300886,120.935165 86.3984032,119.445518 L118.933681,72.0741027 C120.699681,73.0011363 122.679645,73.5733398 124.80651,73.5733398 L124.80651,73.5733398 Z M76.9041568,140.703356 C82.8376618,140.703356 87.797152,136.611622 89.2214486,131.113354 L160.391571,131.113354 C161.815868,136.611622 166.775358,140.703356 172.708863,140.703356 C179.753702,140.703356 185.482823,134.968535 185.482823,127.916687 C185.482823,120.864838 179.753702,115.130017 172.708863,115.130017 C171.236664,115.130017 169.844302,115.430503 168.522197,115.890824 L135.479154,67.7777814 C136.801259,65.7670778 137.580471,63.3695773 137.580471,60.7866698 C137.580471,53.7348214 131.851349,48 124.80651,48 C117.76167,48 112.032549,53.7348214 112.032549,60.7866698 C112.032549,63.3695773 112.811761,65.7670778 114.133866,67.7777814 L81.0908224,115.890824 C79.7687178,115.430503 78.3763558,115.130017 76.9041568,115.130017 C69.8593174,115.130017 64.1301962,120.864838 64.1301962,127.916687 C64.1301962,134.968535 69.8593174,140.703356 76.9041568,140.703356 L76.9041568,140.703356 Z" fill="#FFFFFF"/></g></svg>
\ No newline at end of file
diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/integration.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/integration.json
new file mode 100644
index 0000000000..dda714598a
--- /dev/null
+++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/integration.json
@@ -0,0 +1,1091 @@
+{
+    "id": "msk",
+    "title": "Amazon MSK",
+    "icon": "file://icon.svg",
+    "overview": "file://overview.md",
+    "supported_signals": {
+      "metrics": true,
+      "logs": false
+    },
+    "data_collected": {
+      "metrics": [
+        {
+          "name": "aws_Kafka_ActiveControllerCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ActiveControllerCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ActiveControllerCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ActiveControllerCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BurstBalance_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BurstBalance_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BurstBalance_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BurstBalance_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesInPerSec_count",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesInPerSec_max",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesInPerSec_min",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesInPerSec_sum",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesOutPerSec_count",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesOutPerSec_max",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesOutPerSec_min",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_BytesOutPerSec_sum",
+          "unit": "Bytes/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ClientConnectionCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ClientConnectionCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ClientConnectionCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ClientConnectionCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ConnectionCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ConnectionCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ConnectionCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ConnectionCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIdle_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIdle_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIdle_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIdle_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIoWait_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIoWait_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIoWait_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuIoWait_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuSystem_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuSystem_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuSystem_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuSystem_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuUser_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuUser_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuUser_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_CpuUser_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_EstimatedMaxTimeLag_count",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_EstimatedMaxTimeLag_max",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_EstimatedMaxTimeLag_min",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_EstimatedMaxTimeLag_sum",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalPartitionCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalPartitionCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalPartitionCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalPartitionCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalTopicCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalTopicCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalTopicCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_GlobalTopicCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_HeapMemoryAfterGC_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_HeapMemoryAfterGC_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_HeapMemoryAfterGC_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_HeapMemoryAfterGC_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaAppLogsDiskUsed_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaAppLogsDiskUsed_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaAppLogsDiskUsed_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaAppLogsDiskUsed_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaDataLogsDiskUsed_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaDataLogsDiskUsed_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaDataLogsDiskUsed_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_KafkaDataLogsDiskUsed_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_LeaderCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_LeaderCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_LeaderCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_LeaderCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MaxOffsetLag_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MaxOffsetLag_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MaxOffsetLag_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MaxOffsetLag_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryBuffered_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryBuffered_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryBuffered_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryBuffered_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryCached_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryCached_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryCached_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryCached_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryFree_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryFree_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryFree_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryFree_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryUsed_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryUsed_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryUsed_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MemoryUsed_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MessagesInPerSec_count",
+          "unit": "Count/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MessagesInPerSec_max",
+          "unit": "Count/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MessagesInPerSec_min",
+          "unit": "Count/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_MessagesInPerSec_sum",
+          "unit": "Count/Second",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxDropped_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxDropped_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxDropped_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxDropped_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxErrors_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxErrors_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxErrors_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxErrors_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxPackets_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxPackets_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxPackets_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkRxPackets_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxDropped_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxDropped_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxDropped_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxDropped_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxErrors_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxErrors_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxErrors_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxErrors_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxPackets_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxPackets_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxPackets_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_NetworkTxPackets_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_OfflinePartitionsCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_OfflinePartitionsCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_OfflinePartitionsCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_OfflinePartitionsCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_PartitionCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_PartitionCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_PartitionCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_PartitionCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ProduceTotalTimeMsMean_count",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ProduceTotalTimeMsMean_max",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ProduceTotalTimeMsMean_min",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ProduceTotalTimeMsMean_sum",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RequestBytesMean_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RequestBytesMean_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RequestBytesMean_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RequestBytesMean_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RollingEstimatedTimeLagMax_count",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RollingEstimatedTimeLagMax_max",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RollingEstimatedTimeLagMax_min",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RollingEstimatedTimeLagMax_sum",
+          "unit": "Seconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RootDiskUsed_count",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RootDiskUsed_max",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RootDiskUsed_min",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_RootDiskUsed_sum",
+          "unit": "Percent",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SumOffsetLag_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SumOffsetLag_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SumOffsetLag_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SumOffsetLag_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapFree_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapFree_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapFree_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapFree_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapUsed_count",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapUsed_max",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapUsed_min",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_SwapUsed_sum",
+          "unit": "Bytes",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_TrafficShaping_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_TrafficShaping_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_TrafficShaping_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_TrafficShaping_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderMinIsrPartitionCount_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderMinIsrPartitionCount_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderMinIsrPartitionCount_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderMinIsrPartitionCount_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderReplicatedPartitions_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderReplicatedPartitions_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderReplicatedPartitions_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UnderReplicatedPartitions_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UserPartitionExists_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UserPartitionExists_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UserPartitionExists_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_UserPartitionExists_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperRequestLatencyMsMean_count",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperRequestLatencyMsMean_max",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperRequestLatencyMsMean_min",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperRequestLatencyMsMean_sum",
+          "unit": "Milliseconds",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperSessionState_count",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperSessionState_max",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperSessionState_min",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        },
+        {
+          "name": "aws_Kafka_ZooKeeperSessionState_sum",
+          "unit": "Count",
+          "type": "Gauge",
+          "description": ""
+        }
+      ]
+    },
+    "telemetry_collection_strategy": {
+      "aws_metrics": {
+        "cloudwatch_metric_stream_filters": [
+          {
+            "Namespace": "AWS/Kafka"
+          }
+        ]
+      }
+    },
+    "assets": {
+      "dashboards": [
+        {
+          "id": "overview",
+          "title": "AWS MSK Overview",
+          "description": "Overview of AWS MSK",
+          "image": "file://assets/dashboards/overview.png",
+          "definition": "file://assets/dashboards/overview.json"
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/overview.md b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/overview.md
new file mode 100644
index 0000000000..422c2e4c0c
--- /dev/null
+++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/msk/overview.md
@@ -0,0 +1,3 @@
+### Monitor Managed Streaming Kafka with SigNoz
+
+Collect key MSK metrics and view them with an out of the box dashboard.