Merge pull request #116 from gdashboard/cloudwatch-min-interval

CloudWatch metrics: allow configuring min interval
gdashboard · Mar 26, 2024 · b42283a · b42283a
2 parents 90d7f1e + 383d13a
commit b42283a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/docs/data-sources/bar_gauge.md b/docs/data-sources/bar_gauge.md
@@ -862,6 +862,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/docs/data-sources/gauge.md b/docs/data-sources/gauge.md
@@ -900,6 +900,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/docs/data-sources/logs.md b/docs/data-sources/logs.md
@@ -148,6 +148,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/docs/data-sources/stat.md b/docs/data-sources/stat.md
@@ -897,6 +897,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/docs/data-sources/table.md b/docs/data-sources/table.md
@@ -932,6 +932,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/docs/data-sources/timeseries.md b/docs/data-sources/timeseries.md
@@ -927,6 +927,7 @@ Optional:
 - `hide` (Boolean) Whether to hide query result from the panel or not.
 - `label` (String) The legend name.
 - `match_exact` (Boolean) If enabled you also need to specify **all** the dimensions of the metric you’re querying.
+- `min_interval` (String) The lower bounds on the interval between data points.
 - `period` (String) The minimum interval between points in seconds.
 - `ref_id` (String) The ID of the query. The ID can be used to reference queries in math expressions.
 - `region` (String) The AWS region to query the metrics from.

diff --git a/internal/provider/utils.go b/internal/provider/utils.go
@@ -291,9 +291,10 @@ type CloudWatchMetricsTarget struct {
 	MatchExact types.Bool            `tfsdk:"match_exact"`
 	Region     types.String          `tfsdk:"region"`
 	// etc
-	RefId  types.String `tfsdk:"ref_id"`
-	Period types.String `tfsdk:"period"`
-	Label  types.String `tfsdk:"label"`
+	RefId       types.String `tfsdk:"ref_id"`
+	MinInterval types.String `tfsdk:"min_interval"`
+	Period      types.String `tfsdk:"period"`
+	Label       types.String `tfsdk:"label"`
 }
 
 type CloudWatchLogGroup struct {
@@ -720,6 +721,10 @@ func queryBlock() schema.Block {
 											Optional:    true,
 											Description: "The ID of the query. The ID can be used to reference queries in math expressions.",
 										},
+										"min_interval": schema.StringAttribute{
+											Optional:    true,
+											Description: "The lower bounds on the interval between data points.",
+										},
 										"period": schema.StringAttribute{
 											Optional:    true,
 											Description: "The minimum interval between points in seconds.",
@@ -1066,6 +1071,7 @@ func createTargets(queries []Query) []grafana.Target {
 					},
 					RefID:            metrics.RefId.ValueString(),
 					Hide:             metrics.Hide.ValueBool(),
+					Interval:         metrics.MinInterval.ValueString(),
 					QueryMode:        "Metrics",
 					MetricQueryType:  &zero,
 					MetricEditorMode: &zero,