removing tags, updates to terraform to handle accepting a raw redis FQDN

Author: slorello89

grafana_v2/dashboards/grafana_v9-11/cloud/ops/cluster.json

@@ -3084,7 +3084,6 @@
     "refresh": "",
     "schemaVersion": 39,
     "tags": [
-      "Operations Preview"
     ],
     "templating": {
       "list": [

grafana_v2/dashboards/grafana_v9-11/cloud/ops/database.json

@@ -4323,7 +4323,6 @@
     "refresh": "",
     "schemaVersion": 39,
     "tags": [
-      "Operations Preview"
     ],
     "templating": {
       "list": [

grafana_v2/dashboards/grafana_v9-11/cloud/ops/latency.json

@@ -2303,8 +2303,6 @@
     "refresh": "30s",
     "schemaVersion": 39,
     "tags": [
-      "Operations Preview",
-      "Customer view"
     ],
     "templating": {
       "list": [

grafana_v2/dashboards/grafana_v9-11/cloud/ops/node.json

@@ -3506,8 +3506,6 @@
     ],
     "schemaVersion": 39,
     "tags": [
-      "Operations Preview",
-      "Customer view"
     ],
     "templating": {
       "list": [

grafana_v2/dashboards/grafana_v9-11/cloud/ops/shard.json

@@ -2677,7 +2677,6 @@
     "refresh": "5s",
     "schemaVersion": 39,
     "tags": [
-      "Operations Preview"
     ],
     "templating": {
       "list": [

grafana_v2/kickstart_v2/terraform/gcp/main.tf

@@ -32,6 +32,7 @@ provider "google" {
 
 # Data source to fetch Redis Cloud database information
 data "rediscloud_database" "redis_db" {
+    count = var.existing_subnet_id == null ? 1 : 0
     subscription_id = var.subscription_id
     name           = var.db_name
 }
@@ -46,7 +47,7 @@ locals {
   # Extract FQDN from Redis Cloud database private_endpoint
   # Format: redis-18738.internal.c41372.us-central1-mz.gcp.cloud.rlrcp.com:18738
   # Extract: internal.c41372.us-central1-mz.gcp.cloud.rlrcp.com
-  redis_db_primary_fqdn = regex("^[^.]+\\.(.+):\\d+$", data.rediscloud_database.redis_db.private_endpoint)[0]
+  redis_db_primary_fqdn = var.redis_fqdn != null ? var.redis_fqdn : regex("^[^.]+\\.(.+):\\d+$", data.rediscloud_database.redis_db[0].private_endpoint)[0]
 }
 
 # Conditionally create VPC only if not using existing one
@@ -120,8 +121,9 @@ resource "google_compute_firewall" "redispeer_allow_egress" {
 }
 
 
+# VPC Peering for regular (non-Active-Active) subscriptions
 resource "rediscloud_subscription_peering" "redispeer-sub-vpc-peering" {
-    count   = var.existing_vpc_id == null ? 1 : 0
+    count   = var.existing_vpc_id == null  ? 1 : 0
     subscription_id = var.subscription_id
     provider_name="GCP"
     gcp_project_id = var.gcp_project

grafana_v2/kickstart_v2/terraform/gcp/variables.tf

@@ -98,4 +98,17 @@ variable "grafana_password" {
     description = "The Grafana admin password"
     default     = "admin"
     sensitive   = true
+}
+
+variable "subscription_name" {
+    type        = string
+    description = "The name of the Redis Cloud subscription"
+    default = ""
+  
+}
+
+variable "redis_fqdn" {
+    type        = string
+    description = "The FQDN of the Redis Cloud database"
+    default     = null  
 }