Skip to content

Commit 357263a

Browse files
committed
Disable cloudwatch datasource for non aws
1 parent b96f403 commit 357263a

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

services/monitoring/grafana/terraform/datasources.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ resource "grafana_data_source" "tempo" {
2525
}
2626

2727
resource "grafana_data_source" "cloudwatch" {
28+
# This resource is only created if the AWS Deployments
29+
count = var.IS_AWS_DEPLOYMENT ? 1 : 0
30+
2831
type = "cloudwatch"
2932
name = "cloudwatch"
3033
uid = "fem2inr5v64n4c"
@@ -35,7 +38,7 @@ resource "grafana_data_source" "cloudwatch" {
3538
})
3639

3740
secure_json_data_encoded = jsonencode({
38-
accessKey = var.AWS_GRAFANA_CLOUDWATCH_DATASOURCE_USER_ACCESS_KEY
39-
secretKey = var.AWS_GRAFANA_CLOUDWATCH_DATASOURCE_USER_SECRET_KEY
41+
accessKey = var.GRAFANA_CLOUDWATCH_DATASOURCE_USER_ACCESS_KEY
42+
secretKey = var.GRAFANA_CLOUDWATCH_DATASOURCE_USER_SECRET_KEY
4043
})
4144
}

services/monitoring/grafana/terraform/variables.tf

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,25 @@ variable "PROMETHEUS_CATCHALL_URL" {
1919
sensitive = false
2020
}
2121

22+
# to be used to create resource only for AWS / non AWS Deployments
23+
# this is not syncronised / validated with dashboards imported from folders
24+
variable "IS_AWS_DEPLOYMENT" {
25+
description = "Is AWS Deployment"
26+
type = bool
27+
default = false
28+
}
29+
2230
variable "AWS_DEFAULT_REGION" {
23-
description = "AWS Default Region"
31+
description = "AWS Region"
2432
sensitive = false
2533
}
2634

27-
variable "AWS_GRAFANA_CLOUDWATCH_DATASOURCE_USER_ACCESS_KEY" {
35+
variable "GRAFANA_CLOUDWATCH_DATASOURCE_USER_ACCESS_KEY" {
2836
description = "AWS Grafana Cloudwatch User Access Key"
2937
sensitive = true
3038
}
3139

32-
variable "AWS_GRAFANA_CLOUDWATCH_DATASOURCE_USER_SECRET_KEY" {
40+
variable "GRAFANA_CLOUDWATCH_DATASOURCE_USER_SECRET_KEY" {
3341
description = "AWS Grafana Cloudwatch User Secret Key"
3442
sensitive = true
3543
}

0 commit comments

Comments
 (0)