From 93a3f295484d31cb67eb39fd1b4ad8fc47301b4a Mon Sep 17 00:00:00 2001 From: Gabriel Diaz Date: Wed, 7 Sep 2022 11:17:05 -0400 Subject: [PATCH 1/2] adding apigateway model --- aws/cloudstream/apigateway/apigateway.hcl | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 aws/cloudstream/apigateway/apigateway.hcl diff --git a/aws/cloudstream/apigateway/apigateway.hcl b/aws/cloudstream/apigateway/apigateway.hcl new file mode 100644 index 0000000..c0d784d --- /dev/null +++ b/aws/cloudstream/apigateway/apigateway.hcl @@ -0,0 +1,38 @@ +scraper aws_apigateway_cloudstream module { + frequency = 60 + lookback = 600 + timeout = 30 + resolution = 60 + lag = 60 + + gauge "throughput" { + source promql "throughput" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_Count_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } + } + + gauge "4XX" { + source promql "4XX" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_4XXError_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } + } + + gauge "5XX" { + source promql "5XX" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_5XXError_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } + } + + gauge "latency" { + source promql "latency" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_Latency_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } + } + + gauge "integration_latency" { + source promql "integration_latency" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_IntegrationLatency_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } + } +} + From bdc85118cbd4d3094bf3c1c90fc93b8b5dd9a978 Mon Sep 17 00:00:00 2001 From: Aniket Rao Date: Wed, 7 Sep 2022 21:50:31 +0530 Subject: [PATCH 2/2] fix hclfmt --- aws/cloudstream/apigateway/apigateway.hcl | 20 ++++++++++---------- sample/ome/rds.hcl | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aws/cloudstream/apigateway/apigateway.hcl b/aws/cloudstream/apigateway/apigateway.hcl index c0d784d..ca98d72 100644 --- a/aws/cloudstream/apigateway/apigateway.hcl +++ b/aws/cloudstream/apigateway/apigateway.hcl @@ -7,29 +7,29 @@ scraper aws_apigateway_cloudstream module { gauge "throughput" { source promql "throughput" { - query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_Count_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_Count_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" } } - + gauge "4XX" { source promql "4XX" { query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_4XXError_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" - } + } } - + gauge "5XX" { - source promql "5XX" { - query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_5XXError_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" - } + source promql "5XX" { + query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_5XXError_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" + } } - gauge "latency" { + gauge "latency" { source promql "latency" { query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_Latency_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" } - } + } - gauge "integration_latency" { + gauge "integration_latency" { source promql "integration_latency" { query = "sum by (ApiName) (amazonaws_com_AWS_ApiGateway_IntegrationLatency_count{ApiName=~'${join("|", resources.all.ApiName)}', Namespace!=''})" } diff --git a/sample/ome/rds.hcl b/sample/ome/rds.hcl index 583a7d4..2c9fd10 100644 --- a/sample/ome/rds.hcl +++ b/sample/ome/rds.hcl @@ -17,10 +17,10 @@ var rds_tags { } extends aws_rds_cloudwatch "my-rds" { - resources = var.rds - label_set = var.rds_tags + resources = var.rds + label_set = var.rds_tags module_uri = "https://github.com/last9/openmetrics-registry/releases/download/v0.0.1/aws_cloudwatch_rds_v0.0.1.hcl" using = { - default = "ap-south-1" + default = "ap-south-1" } }