From 52f41e006495a12ea2b1950ef3ae6d3cef697383 Mon Sep 17 00:00:00 2001 From: Raj Kamal Singh <1133322+raj-k-singh@users.noreply.github.com> Date: Fri, 14 Feb 2025 18:40:46 +0530 Subject: [PATCH] Chore: aws integrations: ec2 and rds dashboards and collected metric details with gauges (#7113) * chore: aws integration: update agent version * chore: aws integration: gauges based ec2 overview dashboard * chore: aws integration: gauges based rds overview dashboard * chore: aws integrations: ec2 metrics collected * chore: aws integrations: rds metrics collected --- .../app/cloudintegrations/controller.go | 2 +- .../aws/ec2/assets/dashboards/overview.json | 1042 ++++++++--- .../aws/ec2/integration.json | 394 +++-- .../aws/rds/assets/dashboards/overview.json | 1569 +++++++++++++---- .../aws/rds/integration.json | 1270 ++++++------- 5 files changed, 2803 insertions(+), 1474 deletions(-) diff --git a/pkg/query-service/app/cloudintegrations/controller.go b/pkg/query-service/app/cloudintegrations/controller.go index 8f0d69194e..3647a74774 100644 --- a/pkg/query-service/app/cloudintegrations/controller.go +++ b/pkg/query-service/app/cloudintegrations/controller.go @@ -124,7 +124,7 @@ func (c *Controller) GenerateConnectionUrl( } // TODO(Raj): parameterized this in follow up changes - agentVersion := "latest" + agentVersion := "0.0.1" connectionUrl := fmt.Sprintf( "https://%s.console.aws.amazon.com/cloudformation/home?region=%s#/stacks/quickcreate?", diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/assets/dashboards/overview.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/assets/dashboards/overview.json index 85d61f992f..3dba9c50bb 100644 --- a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/assets/dashboards/overview.json +++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/assets/dashboards/overview.json @@ -3,8 +3,8 @@ "image": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB3aWR0aD0iODAwcHgiIGhlaWdodD0iODAwcHgiIHZpZXdCb3g9IjAgMCAxNiAxNiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBmaWxsPSJub25lIj4KICA8cGF0aCBmaWxsPSIjOUQ1MDI1IiBkPSJNMS43MDIgMi45OEwxIDMuMzEydjkuMzc2bC43MDIuMzMyIDIuODQyLTQuNzc3TDEuNzAyIDIuOTh6IiAvPgogIDxwYXRoIGZpbGw9IiNGNTg1MzYiIGQ9Ik0zLjMzOSAxMi42NTdsLTEuNjM3LjM2M1YyLjk4bDEuNjM3LjM1M3Y5LjMyNHoiIC8+CiAgPHBhdGggZmlsbD0iIzlENTAyNSIgZD0iTTIuNDc2IDIuNjEybC44NjMtLjQwNiA0LjA5NiA2LjIxNi00LjA5NiA1LjM3Mi0uODYzLS40MDZWMi42MTJ6IiAvPgogIDxwYXRoIGZpbGw9IiNGNTg1MzYiIGQ9Ik01LjM4IDEzLjI0OGwtMi4wNDEuNTQ2VjIuMjA2bDIuMDQuNTQ4djEwLjQ5NHoiIC8+CiAgPHBhdGggZmlsbD0iIzlENTAyNSIgZD0iTTQuMyAxLjc1bDEuMDgtLjUxMiA2LjA0MyA3Ljg2NC02LjA0MyA1LjY2LTEuMDgtLjUxMVYxLjc0OXoiIC8+CiAgPHBhdGggZmlsbD0iI0Y1ODUzNiIgZD0iTTcuOTk4IDEzLjg1NmwtMi42MTguOTA2VjEuMjM4bDIuNjE4LjkwOHYxMS43MXoiIC8+CiAgPHBhdGggZmlsbD0iIzlENTAyNSIgZD0iTTYuNjAyLjY2TDcuOTk4IDBsNi41MzggOC40NTNMNy45OTggMTZsLTEuMzk2LS42NlYuNjZ6IiAvPgogIDxwYXRoIGZpbGw9IiNGNTg1MzYiIGQ9Ik0xNSAxMi42ODZMNy45OTggMTZWMEwxNSAzLjMxNHY5LjM3MnoiIC8+Cjwvc3ZnPg==", "layout": [ { - "h": 6, - "i": "b7a8d21e-d0e9-42de-a83f-5399f37db96c", + "h": 5, + "i": "b8a20569-7e4f-40d0-ada6-7736cfadae06", "moved": false, "static": false, "w": 6, @@ -12,8 +12,8 @@ "y": 0 }, { - "h": 6, - "i": "24b502cc-8f30-4a72-9dce-b6ee4555643a", + "h": 5, + "i": "b668ba49-d126-4f2d-9eb5-b4cfbfaf94d1", "moved": false, "static": false, "w": 6, @@ -21,40 +21,40 @@ "y": 0 }, { - "h": 6, - "i": "87422d3b-4128-4450-a0fe-317dbdcb9f83", + "h": 5, + "i": "6fced7be-8a73-4b9b-8440-f2142230268c", "moved": false, "static": false, "w": 6, "x": 0, - "y": 6 + "y": 5 }, { - "h": 6, - "i": "676c985b-de96-490f-ae1c-b2843deba7f8", + "h": 5, + "i": "20dbaec7-9a16-47ad-af3b-f56375db8e69", "moved": false, "static": false, "w": 6, "x": 6, - "y": 6 + "y": 5 }, { - "h": 6, - "i": "1f0c2eea-3f63-4c38-93e1-eff6d3981dfd", + "h": 5, + "i": "827a354b-1fff-400b-8172-c41e4c830eb5", "moved": false, "static": false, "w": 6, "x": 0, - "y": 12 + "y": 10 }, { - "h": 6, - "i": "0548fe05-e13d-4110-b012-013b675f690f", + "h": 5, + "i": "05de543a-73a2-4221-b784-263749d39b1e", "moved": false, "static": false, "w": 6, "x": 6, - "y": 12 + "y": 10 } ], "panelMap": {}, @@ -62,32 +62,32 @@ "title": "EC2 Overview", "uploadedGrafana": false, "variables": { - "1de21552-5c52-4484-ad9f-065ec51fd8e9": { + "11b96105-b752-47ef-88bc-832f248cf855": { "allSelected": false, "customValue": "", "description": "AWS Account", - "id": "1de21552-5c52-4484-ad9f-065ec51fd8e9", - "key": "1de21552-5c52-4484-ad9f-065ec51fd8e9", - "modificationUUID": "a48382b3-010e-45e1-8e77-a6a3f5e8d138", + "id": "11b96105-b752-47ef-88bc-832f248cf855", + "key": "11b96105-b752-47ef-88bc-832f248cf855", + "modificationUUID": "23866855-0966-45ae-99cd-53fab002a1fa", "multiSelect": false, "name": "Account", "order": 0, - "queryValue": "SELECT JSONExtractString(labels, 'cloud_account_id') as cloud_account_id\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'CPUUtilization'\n and JSONExtractString(labels, 'cloud_provider') like 'aws'\n and JSONExtractString(labels, 'service_name') like 'EC2'\nGROUP BY cloud_account_id", + "queryValue": "SELECT JSONExtractString(labels, 'cloud_account_id') as cloud_account_id\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'aws_EC2_CPUUtilization_sum'\nGROUP BY cloud_account_id", "showALLOption": false, "sort": "DISABLED", "textboxValue": "", "type": "QUERY" }, - "d4088f55-111c-479c-84bd-445dce8ba210": { + "63a394bf-4acd-4f14-bf0a-f9dc5e4f00c2": { "allSelected": false, "customValue": "", "description": "AWS Region", - "id": "d4088f55-111c-479c-84bd-445dce8ba210", - "modificationUUID": "fc1b8b85-dfa9-4250-a04a-ff77bca0398c", + "id": "63a394bf-4acd-4f14-bf0a-f9dc5e4f00c2", + "modificationUUID": "d3060c9c-fa76-4fc3-bcfa-e417c90717fa", "multiSelect": false, "name": "Region", "order": 0, - "queryValue": "SELECT JSONExtractString(labels, 'cloud_region') as cloud_region\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'CPUUtilization'\n and JSONExtractString(labels, 'cloud_account_id') IN {{.Account}}\n and JSONExtractString(labels, 'cloud_provider') like 'aws'\n and JSONExtractString(labels, 'service_name') like 'EC2'\nGROUP BY cloud_region", + "queryValue": "\nSELECT JSONExtractString(labels, 'cloud_region') as cloud_region\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'aws_EC2_CPUUtilization_sum'\n and JSONExtractString(labels, 'cloud_account_id') IN {{.Account}}\nGROUP BY cloud_region", "showALLOption": false, "sort": "DISABLED", "textboxValue": "", @@ -102,7 +102,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "b7a8d21e-d0e9-42de-a83f-5399f37db96c", + "id": "b8a20569-7e4f-40d0-ada6-7736cfadae06", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -114,18 +114,58 @@ { "aggregateAttribute": { "dataType": "float64", - "id": "CPUUtilization_count--float64--Sum--true", + "id": "aws_EC2_CPUUtilization_max--float64--Gauge--true", "isColumn": true, "isJSON": false, - "key": "CPUUtilization_count", - "type": "Sum" + "key": "aws_EC2_CPUUtilization_max", + "type": "Gauge" }, - "aggregateOperator": "increase", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, - "expression": "B", + "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "d302d50d", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "e6c54e87", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "7907211a", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + } + ], "op": "AND" }, "functions": [], @@ -137,17 +177,33 @@ "isJSON": false, "key": "service_instance_id", "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" } ], "having": [], - "legend": "", + "legend": "{{service_instance_id}}", "limit": null, "orderBy": [], - "queryName": "B", + "queryName": "A", "reduceTo": "avg", "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "increase" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -160,16 +216,16 @@ "query": "" } ], - "id": "c933d8b2-036b-4a64-8935-6c253c1da6a3", + "id": "170f1610-b7d0-4628-aca4-207c122b3709", "promql": [ { "disabled": false, - "legend": "{{service_instance_id}} ", + "legend": "", "name": "A", - "query": "CPUUtilization{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -239,7 +295,7 @@ "columnUnits": {}, "description": "Percentage of available CPU credits that were utilizaed", "fillSpans": false, - "id": "24b502cc-8f30-4a72-9dce-b6ee4555643a", + "id": "b668ba49-d126-4f2d-9eb5-b4cfbfaf94d1", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -250,31 +306,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "CPUCredit------false", - "isColumn": false, - "key": "CPUCredit", - "type": "" + "dataType": "float64", + "id": "aws_EC2_CPUCreditUsage_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_CPUCreditUsage_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "30ded0dc", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "c935f6ec", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "d092fef8", + "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": [], + "groupBy": [ + { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{service_instance_id}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -287,16 +409,16 @@ "query": "" } ], - "id": "d97f6a4d-f66e-4688-9daf-172f24c87984", + "id": "0643cc76-eedd-4101-bd7a-ec810a3e9b8a", "promql": [ { "disabled": false, - "legend": "{{service_instance_id}}", + "legend": "", "name": "A", - "query": "CPUCreditUsage{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -366,7 +488,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "676c985b-de96-490f-ae1c-b2843deba7f8", + "id": "6fced7be-8a73-4b9b-8440-f2142230268c", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -377,31 +499,191 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "EBSRea------false", - "isColumn": false, - "key": "EBSRea", - "type": "" + "dataType": "float64", + "id": "aws_EC2_EBSReadBytes_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_EBSReadBytes_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "a5fbfa4a", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "87071f13", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "c84a88c4", + "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": [], + "groupBy": [ + { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{service_instance_id}} - Reads", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "" + "timeAggregation": "max" + }, + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_EC2_EBSWriteBytes_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_EBSWriteBytes_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "B", + "filters": { + "items": [ + { + "id": "4d10ca4b", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "fc2db932", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "a3fd74c0", + "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": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], + "having": [], + "legend": "{{service_instance_id}} - Writes", + "limit": null, + "orderBy": [], + "queryName": "B", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" } ], "queryFormulas": [] @@ -414,132 +696,8 @@ "query": "" } ], - "id": "8267701a-10e4-4405-bb1c-53f0dba4b711", + "id": "43627952-52aa-40fd-9c04-cb0e3c123f98", "promql": [ - { - "disabled": false, - "legend": "{{service_instance_id}} - Reads", - "name": "A", - "query": "EBSReadOps{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" - }, - { - "disabled": false, - "legend": "{{service_instance_id}} - Writes", - "name": "B", - "query": "EBSWriteOps{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" - } - ], - "queryType": "promql" - }, - "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": "EBS Ops", - "yAxisUnit": "none" - }, - { - "bucketCount": 30, - "bucketWidth": 0, - "columnUnits": {}, - "description": "", - "fillSpans": false, - "id": "87422d3b-4128-4450-a0fe-317dbdcb9f83", - "isStacked": false, - "mergeAllActiveQueries": false, - "nullZeroValues": "zero", - "opacity": "1", - "panelTypes": "graph", - "query": { - "builder": { - "queryData": [ - { - "aggregateAttribute": { - "dataType": "", - "id": "EBS------false", - "isColumn": false, - "key": "EBS", - "type": "" - }, - "aggregateOperator": "count", - "dataSource": "metrics", - "disabled": false, - "expression": "A", - "filters": { - "items": [], - "op": "AND" - }, - "functions": [], - "groupBy": [], - "having": [], - "legend": "", - "limit": null, - "orderBy": [], - "queryName": "A", - "reduceTo": "avg", - "spaceAggregation": "", - "stepInterval": 60, - "timeAggregation": "" - } - ], - "queryFormulas": [] - }, - "clickhouse_sql": [ { "disabled": false, "legend": "", @@ -547,22 +705,7 @@ "query": "" } ], - "id": "0cf58200-a2bc-4a08-ab41-7b2a7d2ec92e", - "promql": [ - { - "disabled": false, - "legend": "{{service_instance_id}} - Reads", - "name": "A", - "query": "EBSReadBytes{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" - }, - { - "disabled": false, - "legend": "{{service_instance_id}} - Writes", - "name": "B", - "query": "EBSWriteBytes{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" - } - ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -632,7 +775,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "1f0c2eea-3f63-4c38-93e1-eff6d3981dfd", + "id": "20dbaec7-9a16-47ad-af3b-f56375db8e69", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -643,31 +786,191 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, - "key": "", - "type": "" + "dataType": "float64", + "id": "aws_EC2_EBSReadOps_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_EBSReadOps_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "85d84806", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "f2074606", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "134c7ca9", + "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": [], + "groupBy": [ + { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{service_instance_id}} - Reads", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "" + "timeAggregation": "max" + }, + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_EC2_EBSWriteOps_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_EBSWriteOps_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "B", + "filters": { + "items": [ + { + "id": "47e0c00f", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "0a157dfe", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "a7d1e8df", + "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": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], + "having": [], + "legend": "{{service_instance_id}} - Writes", + "limit": null, + "orderBy": [], + "queryName": "B", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" } ], "queryFormulas": [] @@ -680,16 +983,209 @@ "query": "" } ], - "id": "6378c4a2-d0fd-485f-a768-89910ff2d934", + "id": "a70e41d1-27dc-4e91-bf13-23d8bd2f3c49", "promql": [ { "disabled": false, - "legend": "{{service_instance_id}}", + "legend": "", "name": "A", - "query": "NetworkIn{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "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": "EBS Read/Write Ops", + "yAxisUnit": "cps" + }, + { + "bucketCount": 30, + "bucketWidth": 0, + "columnUnits": {}, + "description": "", + "fillSpans": false, + "id": "827a354b-1fff-400b-8172-c41e4c830eb5", + "isStacked": false, + "mergeAllActiveQueries": false, + "nullZeroValues": "zero", + "opacity": "1", + "panelTypes": "graph", + "query": { + "builder": { + "queryData": [ + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_EC2_NetworkIn_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_NetworkIn_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "A", + "filters": { + "items": [ + { + "id": "12d6748d", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "df3a8da1", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "81ec53f4", + "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": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], + "having": [], + "legend": "{{service_instance_id}}", + "limit": null, + "orderBy": [], + "queryName": "A", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" + } + ], + "queryFormulas": [] + }, + "clickhouse_sql": [ + { + "disabled": false, + "legend": "", + "name": "A", + "query": "" + } + ], + "id": "ac2ce4a6-f595-4d2a-bc22-ddc51c2d59ff", + "promql": [ + { + "disabled": false, + "legend": "", + "name": "A", + "query": "" + } + ], + "queryType": "builder" }, "selectedLogFields": [ { @@ -759,7 +1255,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "0548fe05-e13d-4110-b012-013b675f690f", + "id": "05de543a-73a2-4221-b784-263749d39b1e", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -770,31 +1266,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, - "key": "", - "type": "" + "dataType": "float64", + "id": "aws_EC2_NetworkOut_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_EC2_NetworkOut_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "d301aaa7", + "key": { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + "op": "!=", + "value": "" + }, + { + "id": "e8afaa3b", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "d67487ab", + "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": [], + "groupBy": [ + { + "dataType": "string", + "id": "service_instance_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "service_instance_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{service_instance_id}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -807,16 +1369,16 @@ "query": "" } ], - "id": "5c1479bc-1e10-4643-b797-006e97f42b6d", + "id": "94027537-0da8-4ac5-a880-532b975a818c", "promql": [ { "disabled": false, - "legend": "{{service_instance_id}}", + "legend": "", "name": "A", - "query": "NetworkOut{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"EC2\", service_instance_id!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/integration.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/integration.json index 7a96405c16..913a44c9f9 100644 --- a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/integration.json +++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/ec2/integration.json @@ -10,345 +10,483 @@ "data_collected": { "metrics": [ { - "name": "CPUCreditBalance", + "name": "aws_EC2_CPUCreditBalance_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditBalance_count", + "name": "aws_EC2_CPUCreditBalance_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditBalance_sum", + "name": "aws_EC2_CPUCreditBalance_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditUsage", + "name": "aws_EC2_CPUCreditBalance_sum", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditUsage_count", + "name": "aws_EC2_CPUCreditUsage_count", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditUsage_sum", + "name": "aws_EC2_CPUCreditUsage_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditBalance", + "name": "aws_EC2_CPUCreditUsage_min", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditBalance_count", + "name": "aws_EC2_CPUCreditUsage_sum", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditBalance_sum", + "name": "aws_EC2_CPUSurplusCreditBalance_count", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditsCharged", + "name": "aws_EC2_CPUSurplusCreditBalance_max", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditsCharged_count", + "name": "aws_EC2_CPUSurplusCreditBalance_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUSurplusCreditsCharged_sum", + "name": "aws_EC2_CPUSurplusCreditBalance_sum", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUUtilization", + "name": "aws_EC2_CPUSurplusCreditsCharged_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_CPUSurplusCreditsCharged_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_CPUSurplusCreditsCharged_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_CPUSurplusCreditsCharged_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_CPUUtilization_count", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUUtilization_count", + "name": "aws_EC2_CPUUtilization_max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUUtilization_sum", + "name": "aws_EC2_CPUUtilization_min", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance_", + "name": "aws_EC2_CPUUtilization_sum", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance__count", + "name": "aws_EC2_EBSByteBalance__count", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance__sum", + "name": "aws_EC2_EBSByteBalance__max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance_", + "name": "aws_EC2_EBSByteBalance__min", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance__count", + "name": "aws_EC2_EBSByteBalance__sum", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance__sum", + "name": "aws_EC2_EBSIOBalance__count", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSReadBytes", + "name": "aws_EC2_EBSIOBalance__max", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSIOBalance__min", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSIOBalance__sum", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSReadBytes_count", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSReadBytes_count", + "name": "aws_EC2_EBSReadBytes_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSReadBytes_sum", + "name": "aws_EC2_EBSReadBytes_min", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSReadOps", - "unit": "Count", - "type": "Summary", - "description": "" - }, - { - "name": "EBSReadOps_count", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "EBSReadOps_sum", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "EBSWriteBytes", + "name": "aws_EC2_EBSReadBytes_sum", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSWriteBytes_count", + "name": "aws_EC2_EBSReadOps_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSReadOps_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSReadOps_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSReadOps_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSWriteBytes_count", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSWriteBytes_sum", + "name": "aws_EC2_EBSWriteBytes_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSWriteOps", + "name": "aws_EC2_EBSWriteBytes_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSWriteBytes_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_EBSWriteOps_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSWriteOps_count", + "name": "aws_EC2_EBSWriteOps_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSWriteOps_sum", + "name": "aws_EC2_EBSWriteOps_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "MetadataNoToken", + "name": "aws_EC2_EBSWriteOps_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_MetadataNoToken_count", "unit": "None", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "MetadataNoToken_count", + "name": "aws_EC2_MetadataNoToken_max", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "MetadataNoToken_sum", + "name": "aws_EC2_MetadataNoToken_min", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkIn", + "name": "aws_EC2_MetadataNoToken_sum", + "unit": "None", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_NetworkIn_count", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "NetworkIn_count", + "name": "aws_EC2_NetworkIn_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkIn_sum", + "name": "aws_EC2_NetworkIn_min", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkOut", + "name": "aws_EC2_NetworkIn_sum", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "NetworkOut_count", + "name": "aws_EC2_NetworkOut_count", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkOut_sum", + "name": "aws_EC2_NetworkOut_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsIn", - "unit": "Count", - "type": "Summary", + "name": "aws_EC2_NetworkOut_min", + "unit": "Bytes", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsIn_count", - "unit": "Count", - "type": "Sum", + "name": "aws_EC2_NetworkOut_sum", + "unit": "Bytes", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsIn_sum", + "name": "aws_EC2_NetworkPacketsIn_count", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsOut", + "name": "aws_EC2_NetworkPacketsIn_max", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsOut_count", + "name": "aws_EC2_NetworkPacketsIn_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkPacketsOut_sum", + "name": "aws_EC2_NetworkPacketsIn_sum", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed", + "name": "aws_EC2_NetworkPacketsOut_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_Instance", + "name": "aws_EC2_NetworkPacketsOut_max", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_Instance_count", + "name": "aws_EC2_NetworkPacketsOut_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_Instance_sum", + "name": "aws_EC2_NetworkPacketsOut_sum", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_System", + "name": "aws_EC2_StatusCheckFailed_AttachedEBS_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_System_count", + "name": "aws_EC2_StatusCheckFailed_AttachedEBS_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_System_sum", + "name": "aws_EC2_StatusCheckFailed_AttachedEBS_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_count", + "name": "aws_EC2_StatusCheckFailed_AttachedEBS_sum", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "StatusCheckFailed_sum", + "name": "aws_EC2_StatusCheckFailed_Instance_count", "unit": "Count", - "type": "Sum", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_Instance_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_Instance_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_Instance_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_System_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_System_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_System_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_System_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_EC2_StatusCheckFailed_sum", + "unit": "Count", + "type": "Gauge", "description": "" } ], diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/assets/dashboards/overview.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/assets/dashboards/overview.json index dcab95f4f1..ac9eff1cb2 100644 --- a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/assets/dashboards/overview.json +++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/assets/dashboards/overview.json @@ -4,7 +4,7 @@ "layout": [ { "h": 5, - "i": "85a58979-a0d5-4bea-8e8b-2141bbe9a3de", + "i": "45856010-5998-4762-99ef-ffa799bf8e6d", "moved": false, "static": false, "w": 6, @@ -13,7 +13,7 @@ }, { "h": 5, - "i": "d4dd7bc0-7fbd-4697-aed5-870de8dd26d8", + "i": "b533700b-71e8-4294-8f2a-db48a9c407b2", "moved": false, "static": false, "w": 6, @@ -22,7 +22,7 @@ }, { "h": 5, - "i": "5145172f-69ce-4b9a-b96c-7e7c46c9435d", + "i": "d64bed38-c9c0-4fac-a30a-1d7e73b4ee55", "moved": false, "static": false, "w": 6, @@ -31,7 +31,7 @@ }, { "h": 5, - "i": "935ce065-35bf-442b-be8a-df3231e53862", + "i": "b3c3fddc-5497-41e6-8f0e-e1802c9e43ae", "moved": false, "static": false, "w": 6, @@ -39,8 +39,8 @@ "y": 5 }, { - "h": 6, - "i": "ac41a973-1d06-44d6-9609-de0fa3211ae0", + "h": 5, + "i": "e5f430cc-2b07-4844-8c7f-6543ea12875c", "moved": false, "static": false, "w": 6, @@ -48,8 +48,8 @@ "y": 10 }, { - "h": 6, - "i": "b9bd5864-6317-43f6-af2a-f595c3206216", + "h": 5, + "i": "a9f22b15-c22d-4505-a5b4-6f5878500565", "moved": false, "static": false, "w": 6, @@ -57,22 +57,22 @@ "y": 10 }, { - "h": 6, - "i": "ca60d14e-c0d1-4764-b24d-06fe7104ab50", + "h": 5, + "i": "71652346-286f-44f2-9edc-aab33fe514ec", "moved": false, "static": false, "w": 6, "x": 0, - "y": 16 + "y": 15 }, { - "h": 6, - "i": "cadb30be-31f6-4cb9-ad75-6a3d140d4325", + "h": 5, + "i": "7f8d7340-eeb5-47cb-a2b1-be653275c2d0", "moved": false, "static": false, "w": 6, "x": 6, - "y": 16 + "y": 15 } ], "panelMap": {}, @@ -84,13 +84,13 @@ "allSelected": false, "customValue": "", "description": "AWS Account", - "id": "b3e3a481-f198-472c-9e3f-e38ebe3c4141", - "key": "b3e3a481-f198-472c-9e3f-e38ebe3c4141", - "modificationUUID": "0b1d4ccd-3722-4026-9a5d-a45e5023b8bb", + "id": "d5e770d2-5ab7-4481-b677-189e8eca218c", + "key": "d5e770d2-5ab7-4481-b677-189e8eca218c", + "modificationUUID": "619393f3-4796-40ed-a4b1-8b98fd5ebc48", "multiSelect": false, "name": "Account", "order": 0, - "queryValue": "SELECT JSONExtractString(labels, 'cloud_account_id') as cloud_account_id\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'CPUUtilization'\n and JSONExtractString(labels, 'cloud_provider') like 'aws'\n and JSONExtractString(labels, 'service_name') like 'RDS'\nGROUP BY cloud_account_id", + "queryValue": "SELECT JSONExtractString(labels, 'cloud_account_id') as cloud_account_id\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'aws_RDS_CPUUtilization_sum'\nGROUP BY cloud_account_id", "showALLOption": false, "sort": "DISABLED", "textboxValue": "", @@ -100,13 +100,13 @@ "allSelected": false, "customValue": "", "description": "AWS Region", - "id": "5aaf8d9a-deeb-4a36-8f01-70ee4afe86f6", - "key": "5aaf8d9a-deeb-4a36-8f01-70ee4afe86f6", - "modificationUUID": "75cf9374-61a8-4885-9fd9-6e003eb99f81", + "id": "10aede9a-ef01-42f3-9946-2260dec2a398", + "key": "10aede9a-ef01-42f3-9946-2260dec2a398", + "modificationUUID": "c810775c-052f-45dd-948b-77fc3cc979e9", "multiSelect": false, "name": "Region", "order": 1, - "queryValue": "SELECT JSONExtractString(labels, 'cloud_region') as cloud_region\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'CPUUtilization'\n and JSONExtractString(labels, 'cloud_account_id') IN {{.Account}}\n and JSONExtractString(labels, 'cloud_provider') like 'aws'\n and JSONExtractString(labels, 'service_name') like 'RDS'\nGROUP BY cloud_region", + "queryValue": "SELECT JSONExtractString(labels, 'cloud_region') as cloud_region\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE \n metric_name like 'aws_RDS_CPUUtilization_sum'\n and JSONExtractString(labels, 'cloud_account_id') IN {{.Account}}\nGROUP BY cloud_region", "showALLOption": false, "sort": "DISABLED", "textboxValue": "", @@ -121,7 +121,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "85a58979-a0d5-4bea-8e8b-2141bbe9a3de", + "id": "45856010-5998-4762-99ef-ffa799bf8e6d", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -132,32 +132,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_CPUUtilization_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_CPUUtilization_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "f8e72efc", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "4e68256a", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "a5082e1b", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -170,16 +235,16 @@ "query": "" } ], - "id": "a1ba90cd-81cf-492f-b387-760bf776ef03", + "id": "0970e1f2-18fe-45c3-9045-6a5c254f8fe3", "promql": [ { "disabled": false, - "legend": "{{DBInstanceIdentifier}}", + "legend": "", "name": "A", - "query": "CPUUtilization{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -249,7 +314,7 @@ "columnUnits": {}, "description": "The amount of available random access memory.\n\nFor MariaDB, MySQL, Oracle, and PostgreSQL DB instances, this metric reports the value of the MemAvailable field of /proc/meminfo.", "fillSpans": false, - "id": "d4dd7bc0-7fbd-4697-aed5-870de8dd26d8", + "id": "b533700b-71e8-4294-8f2a-db48a9c407b2", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -260,32 +325,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_FreeableMemory_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_FreeableMemory_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "723ba84a", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "f8227b55", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "3951e8ed", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -298,16 +428,16 @@ "query": "" } ], - "id": "d5e59d39-8c7a-4614-8e20-651bf140eb80", + "id": "530a64c6-c4e2-416a-b172-a79fed4ab258", "promql": [ { "disabled": false, - "legend": "{{DBInstanceIdentifier}}", + "legend": "", "name": "A", - "query": "FreeableMemory{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -377,7 +507,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "cadb30be-31f6-4cb9-ad75-6a3d140d4325", + "id": "d64bed38-c9c0-4fac-a30a-1d7e73b4ee55", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -388,159 +518,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, - "key": "", - "type": "" - }, - "aggregateOperator": "count", - "dataSource": "metrics", - "disabled": false, - "expression": "A", - "filters": { - "items": [], - "op": "AND" - }, - "functions": [], - "groupBy": [], - "having": [], - "legend": "", - "limit": null, - "orderBy": [], - "queryName": "A", - "reduceTo": "avg", - "spaceAggregation": "", - "stepInterval": 60, - "timeAggregation": "" - } - ], - "queryFormulas": [] - }, - "clickhouse_sql": [ - { - "disabled": false, - "legend": "", - "name": "A", - "query": "" - } - ], - "id": "bd011f26-5da1-4163-9dc0-951c3c364143", - "promql": [ - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}}", - "name": "A", - "query": "FreeStorageSpace{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - } - ], - "queryType": "promql" - }, - "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": "Free Storage Space", - "yAxisUnit": "decbytes" - }, - { - "bucketCount": 30, - "bucketWidth": 0, - "columnUnits": {}, - "description": "", - "fillSpans": false, - "id": "b9bd5864-6317-43f6-af2a-f595c3206216", - "isStacked": false, - "mergeAllActiveQueries": false, - "nullZeroValues": "zero", - "opacity": "1", - "panelTypes": "graph", - "query": { - "builder": { - "queryData": [ - { - "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_DatabaseConnections_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_DatabaseConnections_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "31191f74", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "aa644bbf", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "e5b31a18", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -553,16 +621,16 @@ "query": "" } ], - "id": "8e79fb06-8089-4d14-afe0-af914d13dca9", + "id": "ade71dbc-c62b-487d-9bf5-a7fba2a73a86", "promql": [ { "disabled": false, - "legend": "{{DBInstanceIdentifier}}", + "legend": "", "name": "A", - "query": "DiskQueueDepth{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -623,7 +691,7 @@ "stackedBarChart": false, "thresholds": [], "timePreferance": "GLOBAL_TIME", - "title": "Disk Queue Depth", + "title": "Database Connections", "yAxisUnit": "none" }, { @@ -632,7 +700,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "ac41a973-1d06-44d6-9609-de0fa3211ae0", + "id": "b3c3fddc-5497-41e6-8f0e-e1802c9e43ae", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -643,32 +711,191 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_ReadLatency_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_ReadLatency_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "83f232af", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "2677873f", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "78eddd81", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}} - Reads", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" + }, + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_RDS_WriteLatency_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_RDS_WriteLatency_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "B", + "filters": { + "items": [ + { + "id": "e2df7981", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "6daad748", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "28057159", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], + "op": "AND" + }, + "functions": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], + "having": [], + "legend": "{{DBInstanceIdentifier}} - Writes", + "limit": null, + "orderBy": [], + "queryName": "B", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" } ], "queryFormulas": [] @@ -681,133 +908,8 @@ "query": "" } ], - "id": "a8394fa7-fd1e-4051-a738-146f64240174", + "id": "3327c4aa-f47b-4019-8eed-1e0f68edc071", "promql": [ - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Reads", - "name": "A", - "query": "ReadIOPS{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - }, - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Writes", - "name": "B", - "query": "WriteIOPS{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - } - ], - "queryType": "promql" - }, - "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 Read / Write IOPS", - "yAxisUnit": "cps" - }, - { - "bucketCount": 30, - "bucketWidth": 0, - "columnUnits": {}, - "description": "", - "fillSpans": false, - "id": "935ce065-35bf-442b-be8a-df3231e53862", - "isStacked": false, - "mergeAllActiveQueries": false, - "nullZeroValues": "zero", - "opacity": "1", - "panelTypes": "graph", - "query": { - "builder": { - "queryData": [ - { - "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, - "isJSON": false, - "key": "", - "type": "" - }, - "aggregateOperator": "count", - "dataSource": "metrics", - "disabled": false, - "expression": "A", - "filters": { - "items": [], - "op": "AND" - }, - "functions": [], - "groupBy": [], - "having": [], - "legend": "", - "limit": null, - "orderBy": [], - "queryName": "A", - "reduceTo": "avg", - "spaceAggregation": "sum", - "stepInterval": 60, - "timeAggregation": "rate" - } - ], - "queryFormulas": [] - }, - "clickhouse_sql": [ { "disabled": false, "legend": "", @@ -815,22 +917,7 @@ "query": "" } ], - "id": "d584298b-ee0e-4cf1-8333-edc4f286878d", - "promql": [ - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Reads", - "name": "A", - "query": "ReadLatency{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - }, - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Writes", - "name": "B", - "query": "WriteLatency{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - } - ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -900,7 +987,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "ca60d14e-c0d1-4764-b24d-06fe7104ab50", + "id": "e5f430cc-2b07-4844-8c7f-6543ea12875c", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -911,32 +998,191 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_ReadIOPS_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_ReadIOPS_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "17142c3d", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "27fcc87d", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "5510ad1d", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}} - Reads", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" + }, + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_RDS_WriteIOPS_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_RDS_WriteIOPS_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "B", + "filters": { + "items": [ + { + "id": "a050e23a", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "6df80990", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "72bc50d0", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], + "op": "AND" + }, + "functions": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], + "having": [], + "legend": "{{DBInstanceIdentifier}} - Writes", + "limit": null, + "orderBy": [], + "queryName": "B", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" } ], "queryFormulas": [] @@ -949,22 +1195,303 @@ "query": "" } ], - "id": "10f91076-5aa2-4c56-986c-397b208a7165", + "id": "e41982c2-d975-41c3-aca3-62259806c112", "promql": [ { "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Reads", + "legend": "", "name": "A", - "query": "ReadThroughput{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" - }, - { - "disabled": false, - "legend": "{{DBInstanceIdentifier}} - Writes", - "name": "B", - "query": "WriteThroughput{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "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 Read / Write IOPS", + "yAxisUnit": "cps" + }, + { + "bucketCount": 30, + "bucketWidth": 0, + "columnUnits": {}, + "description": "", + "fillSpans": false, + "id": "a9f22b15-c22d-4505-a5b4-6f5878500565", + "isStacked": false, + "mergeAllActiveQueries": false, + "nullZeroValues": "zero", + "opacity": "1", + "panelTypes": "graph", + "query": { + "builder": { + "queryData": [ + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_RDS_ReadThroughput_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_RDS_ReadThroughput_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "A", + "filters": { + "items": [ + { + "id": "a298d4bd", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "810c0586", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "fa40ae81", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], + "op": "AND" + }, + "functions": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], + "having": [], + "legend": "{{DBInstanceIdentifier}} - Reads", + "limit": null, + "orderBy": [], + "queryName": "A", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" + }, + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_RDS_WriteThroughput_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_RDS_WriteThroughput_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "B", + "filters": { + "items": [ + { + "id": "d46f3f53", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "4ec47a19", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "a0e648d6", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], + "op": "AND" + }, + "functions": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], + "having": [], + "legend": "{{DBInstanceIdentifier}} - Writes", + "limit": null, + "orderBy": [], + "queryName": "B", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" + } + ], + "queryFormulas": [] + }, + "clickhouse_sql": [ + { + "disabled": false, + "legend": "", + "name": "A", + "query": "" + } + ], + "id": "314ca22f-c50f-4b5a-9ab0-285488f0f220", + "promql": [ + { + "disabled": false, + "legend": "", + "name": "A", + "query": "" + } + ], + "queryType": "builder" }, "selectedLogFields": [ { @@ -1026,7 +1553,7 @@ "thresholds": [], "timePreferance": "GLOBAL_TIME", "title": "Disk Read / Write Throughput", - "yAxisUnit": "decbytes" + "yAxisUnit": "binBps" }, { "bucketCount": 30, @@ -1034,7 +1561,7 @@ "columnUnits": {}, "description": "", "fillSpans": false, - "id": "5145172f-69ce-4b9a-b96c-7e7c46c9435d", + "id": "71652346-286f-44f2-9edc-aab33fe514ec", "isStacked": false, "mergeAllActiveQueries": false, "nullZeroValues": "zero", @@ -1045,32 +1572,97 @@ "queryData": [ { "aggregateAttribute": { - "dataType": "", - "id": "------false", - "isColumn": false, + "dataType": "float64", + "id": "aws_RDS_DiskQueueDepth_max--float64--Gauge--true", + "isColumn": true, "isJSON": false, - "key": "", - "type": "" + "key": "aws_RDS_DiskQueueDepth_max", + "type": "Gauge" }, - "aggregateOperator": "count", + "aggregateOperator": "max", "dataSource": "metrics", "disabled": false, "expression": "A", "filters": { - "items": [], + "items": [ + { + "id": "f64f0096", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "18ad7c1e", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "5d3f4963", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], "op": "AND" }, "functions": [], - "groupBy": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], "having": [], - "legend": "", + "legend": "{{DBInstanceIdentifier}}", "limit": null, "orderBy": [], "queryName": "A", "reduceTo": "avg", - "spaceAggregation": "sum", + "spaceAggregation": "max", "stepInterval": 60, - "timeAggregation": "rate" + "timeAggregation": "max" } ], "queryFormulas": [] @@ -1083,16 +1675,16 @@ "query": "" } ], - "id": "0444bb20-3b72-4907-96a6-d3e7c48cab9f", + "id": "f0c67967-a129-4e88-883f-01454c729864", "promql": [ { "disabled": false, - "legend": "{{DBInstanceIdentifier}}", + "legend": "", "name": "A", - "query": "DatabaseConnections{cloud_provider=\"aws\",cloud_account_id=\"$Account\",cloud_region=\"$Region\",service_name=\"RDS\", DBInstanceIdentifier!=\"\",quantile=\"1\"}" + "query": "" } ], - "queryType": "promql" + "queryType": "builder" }, "selectedLogFields": [ { @@ -1153,8 +1745,201 @@ "stackedBarChart": false, "thresholds": [], "timePreferance": "GLOBAL_TIME", - "title": "Database Connections", + "title": "Disk Queue Depth", "yAxisUnit": "none" + }, + { + "bucketCount": 30, + "bucketWidth": 0, + "columnUnits": {}, + "description": "", + "fillSpans": false, + "id": "7f8d7340-eeb5-47cb-a2b1-be653275c2d0", + "isStacked": false, + "mergeAllActiveQueries": false, + "nullZeroValues": "zero", + "opacity": "1", + "panelTypes": "graph", + "query": { + "builder": { + "queryData": [ + { + "aggregateAttribute": { + "dataType": "float64", + "id": "aws_RDS_FreeStorageSpace_max--float64--Gauge--true", + "isColumn": true, + "isJSON": false, + "key": "aws_RDS_FreeStorageSpace_max", + "type": "Gauge" + }, + "aggregateOperator": "max", + "dataSource": "metrics", + "disabled": false, + "expression": "A", + "filters": { + "items": [ + { + "id": "7786e529", + "key": { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + "op": "=", + "value": "$Account" + }, + { + "id": "f27b4616", + "key": { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + "op": "=", + "value": "$Region" + }, + { + "id": "51ca6d55", + "key": { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + }, + "op": "!=", + "value": "" + } + ], + "op": "AND" + }, + "functions": [], + "groupBy": [ + { + "dataType": "string", + "id": "cloud_account_id--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_account_id", + "type": "tag" + }, + { + "dataType": "string", + "id": "cloud_region--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "cloud_region", + "type": "tag" + }, + { + "dataType": "string", + "id": "DBInstanceIdentifier--string--tag--false", + "isColumn": false, + "isJSON": false, + "key": "DBInstanceIdentifier", + "type": "tag" + } + ], + "having": [], + "legend": "{{DBInstanceIdentifier}}", + "limit": null, + "orderBy": [], + "queryName": "A", + "reduceTo": "avg", + "spaceAggregation": "max", + "stepInterval": 60, + "timeAggregation": "max" + } + ], + "queryFormulas": [] + }, + "clickhouse_sql": [ + { + "disabled": false, + "legend": "", + "name": "A", + "query": "" + } + ], + "id": "e3f55e7f-9701-4145-a177-672d6d380f3b", + "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": "Free Storage Space", + "yAxisUnit": "bytes" } ] } \ No newline at end of file diff --git a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/integration.json b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/integration.json index cd51dae7c8..f2ac02ddfe 100644 --- a/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/integration.json +++ b/pkg/query-service/app/cloudintegrations/serviceDefinitions/aws/rds/integration.json @@ -10,903 +10,747 @@ "data_collected": { "metrics": [ { - "name": "BurstBalance", + "name": "aws_RDS_BurstBalance_count", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "BurstBalance_count", + "name": "aws_RDS_BurstBalance_max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "BurstBalance_sum", + "name": "aws_RDS_BurstBalance_min", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUCreditBalance", - "unit": "Count", - "type": "Summary", - "description": "" - }, - { - "name": "CPUCreditBalance_count", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUCreditBalance_sum", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUCreditUsage", - "unit": "Count", - "type": "Summary", - "description": "" - }, - { - "name": "CPUCreditUsage_count", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUCreditUsage_sum", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUSurplusCreditBalance", - "unit": "Count", - "type": "Summary", - "description": "" - }, - { - "name": "CPUSurplusCreditBalance_count", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUSurplusCreditBalance_sum", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUSurplusCreditsCharged", - "unit": "Count", - "type": "Summary", - "description": "" - }, - { - "name": "CPUSurplusCreditsCharged_count", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUSurplusCreditsCharged_sum", - "unit": "Count", - "type": "Sum", - "description": "" - }, - { - "name": "CPUUtilization", + "name": "aws_RDS_BurstBalance_sum", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CPUUtilization_count", + "name": "aws_RDS_CPUCreditBalance_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditBalance_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditBalance_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditBalance_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditUsage_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditUsage_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditUsage_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUCreditUsage_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditBalance_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditBalance_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditBalance_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditBalance_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditsCharged_count", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditsCharged_max", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditsCharged_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUSurplusCreditsCharged_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUUtilization_count", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CPUUtilization_sum", + "name": "aws_RDS_CPUUtilization_max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CheckpointLag", + "name": "aws_RDS_CPUUtilization_min", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CPUUtilization_sum", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_CheckpointLag_count", "unit": "Seconds", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "CheckpointLag_count", + "name": "aws_RDS_CheckpointLag_max", "unit": "Seconds", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "CheckpointLag_sum", + "name": "aws_RDS_CheckpointLag_min", "unit": "Seconds", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoad", + "name": "aws_RDS_CheckpointLag_sum", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DBLoadCPU_count", "unit": "None", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DBLoadCPU", + "name": "aws_RDS_DBLoadCPU_max", "unit": "None", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DBLoadCPU_count", + "name": "aws_RDS_DBLoadCPU_min", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoadCPU_sum", + "name": "aws_RDS_DBLoadCPU_sum", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoadNonCPU", + "name": "aws_RDS_DBLoadNonCPU_count", "unit": "None", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DBLoadNonCPU_count", + "name": "aws_RDS_DBLoadNonCPU_max", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoadNonCPU_sum", + "name": "aws_RDS_DBLoadNonCPU_min", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoadRelativeToNumVCPUs", + "name": "aws_RDS_DBLoadNonCPU_sum", "unit": "None", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DBLoadRelativeToNumVCPUs_count", + "name": "aws_RDS_DBLoadRelativeToNumVCPUs_count", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoadRelativeToNumVCPUs_sum", + "name": "aws_RDS_DBLoadRelativeToNumVCPUs_max", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoad_count", + "name": "aws_RDS_DBLoadRelativeToNumVCPUs_min", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DBLoad_sum", + "name": "aws_RDS_DBLoadRelativeToNumVCPUs_sum", "unit": "None", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DatabaseConnections", + "name": "aws_RDS_DBLoad_count", + "unit": "None", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DBLoad_max", + "unit": "None", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DBLoad_min", + "unit": "None", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DBLoad_sum", + "unit": "None", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DatabaseConnections_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DatabaseConnections_count", + "name": "aws_RDS_DatabaseConnections_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DatabaseConnections_sum", + "name": "aws_RDS_DatabaseConnections_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DiskQueueDepth", + "name": "aws_RDS_DatabaseConnections_sum", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "DiskQueueDepth_count", + "name": "aws_RDS_DiskQueueDepth_count", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "DiskQueueDepth_sum", + "name": "aws_RDS_DiskQueueDepth_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance_", + "name": "aws_RDS_DiskQueueDepth_min", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_DiskQueueDepth_sum", + "unit": "Count", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_EBSByteBalance__count", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance__count", + "name": "aws_RDS_EBSByteBalance__max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSByteBalance__sum", + "name": "aws_RDS_EBSByteBalance__min", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance_", + "name": "aws_RDS_EBSByteBalance__sum", "unit": "Percent", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance__count", + "name": "aws_RDS_EBSIOBalance__count", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "EBSIOBalance__sum", + "name": "aws_RDS_EBSIOBalance__max", "unit": "Percent", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "FreeStorageSpace", + "name": "aws_RDS_EBSIOBalance__min", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_EBSIOBalance__sum", + "unit": "Percent", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_FreeStorageSpace_count", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "FreeStorageSpace_count", + "name": "aws_RDS_FreeStorageSpace_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "FreeStorageSpace_sum", + "name": "aws_RDS_FreeStorageSpace_min", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "FreeableMemory", + "name": "aws_RDS_FreeStorageSpace_sum", "unit": "Bytes", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "FreeableMemory_count", + "name": "aws_RDS_FreeableMemory_count", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "FreeableMemory_sum", + "name": "aws_RDS_FreeableMemory_max", "unit": "Bytes", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "MaximumUsedTransactionIDs", + "name": "aws_RDS_FreeableMemory_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_FreeableMemory_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_MaximumUsedTransactionIDs_count", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "MaximumUsedTransactionIDs_count", + "name": "aws_RDS_MaximumUsedTransactionIDs_max", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "MaximumUsedTransactionIDs_sum", + "name": "aws_RDS_MaximumUsedTransactionIDs_min", "unit": "Count", - "type": "Sum", + "type": "Gauge", "description": "" }, { - "name": "NetworkReceiveThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "NetworkReceiveThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "NetworkReceiveThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "NetworkTransmitThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "NetworkTransmitThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "NetworkTransmitThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "OldestReplicationSlotLag", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "OldestReplicationSlotLag_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "OldestReplicationSlotLag_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "ReadIOPS", - "unit": "Count/Second", - "type": "Summary", - "description": "" - }, - { - "name": "ReadIOPS_count", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "ReadIOPS_sum", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "ReadLatency", - "unit": "Seconds", - "type": "Summary", - "description": "" - }, - { - "name": "ReadLatency_count", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "ReadLatency_sum", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "ReadThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "ReadThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "ReadThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "ReplicationSlotDiskUsage", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "ReplicationSlotDiskUsage_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "ReplicationSlotDiskUsage_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "SwapUsage", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "SwapUsage_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "SwapUsage_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "TransactionLogsDiskUsage", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "TransactionLogsDiskUsage_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "TransactionLogsDiskUsage_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "TransactionLogsGeneration", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "TransactionLogsGeneration_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TransactionLogsGeneration_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "WriteIOPS", - "unit": "Count/Second", - "type": "Summary", - "description": "" - }, - { - "name": "WriteIOPS_count", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "WriteIOPS_sum", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "WriteLatency", - "unit": "Seconds", - "type": "Summary", - "description": "" - }, - { - "name": "WriteLatency_count", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "WriteLatency_sum", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "WriteThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "WriteThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "WriteThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "ACUUtilization", - "unit": "Percent", - "type": "Summary", - "description": "" - }, - { - "name": "ACUUtilization_count", - "unit": "Percent", - "type": "Sum", - "description": "" - }, - { - "name": "ACUUtilization_sum", - "unit": "Percent", - "type": "Sum", - "description": "" - }, - { - "name": "BackupRetentionPeriodStorageUsed", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "BackupRetentionPeriodStorageUsed_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "BackupRetentionPeriodStorageUsed_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "BufferCacheHitRatio", - "unit": "Percent", - "type": "Summary", - "description": "" - }, - { - "name": "BufferCacheHitRatio_count", - "unit": "Percent", - "type": "Sum", - "description": "" - }, - { - "name": "BufferCacheHitRatio_sum", - "unit": "Percent", - "type": "Sum", - "description": "" - }, - { - "name": "CommitLatency", - "unit": "Milliseconds", - "type": "Summary", - "description": "" - }, - { - "name": "CommitLatency_count", - "unit": "Milliseconds", - "type": "Sum", - "description": "" - }, - { - "name": "CommitLatency_sum", - "unit": "Milliseconds", - "type": "Sum", - "description": "" - }, - { - "name": "CommitThroughput", - "unit": "Count/Second", - "type": "Summary", - "description": "" - }, - { - "name": "CommitThroughput_count", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "CommitThroughput_sum", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "Deadlocks", - "unit": "Count/Second", - "type": "Summary", - "description": "" - }, - { - "name": "Deadlocks_count", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "Deadlocks_sum", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "EngineUptime", - "unit": "Seconds", - "type": "Summary", - "description": "" - }, - { - "name": "EngineUptime_count", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "EngineUptime_sum", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "NetworkThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "NetworkThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "NetworkThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "RDSToAuroraPostgreSQLReplicaLag", - "unit": "Seconds", - "type": "Summary", - "description": "" - }, - { - "name": "RDSToAuroraPostgreSQLReplicaLag_count", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "RDSToAuroraPostgreSQLReplicaLag_sum", - "unit": "Seconds", - "type": "Sum", - "description": "" - }, - { - "name": "ServerlessDatabaseCapacity", - "unit": "None", - "type": "Summary", - "description": "" - }, - { - "name": "ServerlessDatabaseCapacity_count", - "unit": "None", - "type": "Sum", - "description": "" - }, - { - "name": "ServerlessDatabaseCapacity_sum", - "unit": "None", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkReceiveThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "StorageNetworkReceiveThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkReceiveThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "StorageNetworkThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkTransmitThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "StorageNetworkTransmitThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "StorageNetworkTransmitThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TempStorageIOPS", - "unit": "Count/Second", - "type": "Summary", - "description": "" - }, - { - "name": "TempStorageIOPS_count", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TempStorageIOPS_sum", - "unit": "Count/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TempStorageThroughput", - "unit": "Bytes/Second", - "type": "Summary", - "description": "" - }, - { - "name": "TempStorageThroughput_count", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TempStorageThroughput_sum", - "unit": "Bytes/Second", - "type": "Sum", - "description": "" - }, - { - "name": "TotalBackupStorageBilled", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "TotalBackupStorageBilled_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "TotalBackupStorageBilled_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "VolumeBytesUsed", - "unit": "Bytes", - "type": "Summary", - "description": "" - }, - { - "name": "VolumeBytesUsed_count", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "VolumeBytesUsed_sum", - "unit": "Bytes", - "type": "Sum", - "description": "" - }, - { - "name": "VolumeReadIOPs", + "name": "aws_RDS_MaximumUsedTransactionIDs_sum", "unit": "Count", - "type": "Summary", + "type": "Gauge", "description": "" }, { - "name": "VolumeReadIOPs_count", - "unit": "Count", - "type": "Sum", + "name": "aws_RDS_NetworkReceiveThroughput_count", + "unit": "Bytes/Second", + "type": "Gauge", "description": "" }, { - "name": "VolumeReadIOPs_sum", - "unit": "Count", - "type": "Sum", + "name": "aws_RDS_NetworkReceiveThroughput_max", + "unit": "Bytes/Second", + "type": "Gauge", "description": "" }, { - "name": "VolumeWriteIOPs", - "unit": "Count", - "type": "Summary", + "name": "aws_RDS_NetworkReceiveThroughput_min", + "unit": "Bytes/Second", + "type": "Gauge", "description": "" }, { - "name": "VolumeWriteIOPs_count", - "unit": "Count", - "type": "Sum", + "name": "aws_RDS_NetworkReceiveThroughput_sum", + "unit": "Bytes/Second", + "type": "Gauge", "description": "" }, { - "name": "VolumeWriteIOPs_sum", - "unit": "Count", - "type": "Sum", + "name": "aws_RDS_NetworkTransmitThroughput_count", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_NetworkTransmitThroughput_max", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_NetworkTransmitThroughput_min", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_NetworkTransmitThroughput_sum", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_OldestReplicationSlotLag_count", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_OldestReplicationSlotLag_max", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_OldestReplicationSlotLag_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_OldestReplicationSlotLag_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadIOPS_count", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadIOPS_max", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadIOPS_min", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadIOPS_sum", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadLatency_count", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadLatency_max", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadLatency_min", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadLatency_sum", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadThroughput_count", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadThroughput_max", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadThroughput_min", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReadThroughput_sum", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReplicationSlotDiskUsage_count", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReplicationSlotDiskUsage_max", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReplicationSlotDiskUsage_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_ReplicationSlotDiskUsage_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_SwapUsage_count", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_SwapUsage_max", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_SwapUsage_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_SwapUsage_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsDiskUsage_count", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsDiskUsage_max", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsDiskUsage_min", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsDiskUsage_sum", + "unit": "Bytes", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsGeneration_count", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsGeneration_max", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsGeneration_min", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_TransactionLogsGeneration_sum", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteIOPS_count", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteIOPS_max", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteIOPS_min", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteIOPS_sum", + "unit": "Count/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteLatency_count", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteLatency_max", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteLatency_min", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteLatency_sum", + "unit": "Seconds", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteThroughput_count", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteThroughput_max", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteThroughput_min", + "unit": "Bytes/Second", + "type": "Gauge", + "description": "" + }, + { + "name": "aws_RDS_WriteThroughput_sum", + "unit": "Bytes/Second", + "type": "Gauge", "description": "" } ],