Skip to content

Commit 1732f31

Browse files
committed
fix: Complete all tfvars templates with missing variables
- cert-manager: Add 8 missing variables (total: 10) - ingress-controller: Add 3 missing variables (total: 6) - argocd: Add 14 missing variables (total: 19) - lgtm-stack: Add 19 missing variables (total: 28) - Update lgtm-stack README for consistency with other components All terraform.tfvars.template files now include complete variable sets
1 parent 5ffcde5 commit 1732f31

File tree

5 files changed

+58
-42
lines changed

5 files changed

+58
-42
lines changed

argocd/terraform/terraform.tfvars.template

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
# ==============================================================================
2-
# ArgoCD Configuration
2+
# ArgoCD Terraform Configuration
33
# ==============================================================================
44
# See: docs/adopting-argocd.md | docs/troubleshooting-argocd.md
55

6-
# Keycloak OIDC
6+
# Keycloak OIDC Configuration
77
keycloak_url = "https://keycloak.example.com"
88
keycloak_user = "admin"
99
keycloak_password = "your-secure-password"
1010
target_realm = "argocd"
1111

12-
# ArgoCD Settings
12+
# ArgoCD Configuration
1313
argocd_url = "https://argocd.example.com"
1414
kube_context = "gke_your-project_us-central1_your-cluster"
15-
namespace = "argocd-test"
15+
namespace = "argocd"
1616

17-
# Shared Infrastructure (set to false if managed elsewhere)
17+
# Shared Infrastructure
1818
install_cert_manager = false
1919
install_nginx_ingress = false
2020

21-
# Cert-Manager (only used if install_cert_manager = true)
21+
# Cert-Manager Configuration
2222
cert_manager_version = "v1.16.2"
2323
cert_manager_namespace = "cert-manager"
2424
cert_manager_release_name = "cert-manager"
2525
letsencrypt_email = "admin@example.com"
2626
cert_issuer_name = "letsencrypt-prod"
2727
cert_issuer_kind = "ClusterIssuer"
2828

29-
# Ingress Controller (only used if install_nginx_ingress = true)
29+
# NGINX Ingress Configuration
3030
nginx_ingress_version = "4.14.1"
3131
nginx_ingress_release_name = "ingress-nginx"
3232
nginx_ingress_namespace = "ingress-nginx"
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
# ==============================================================================
2-
# Cert-Manager Configuration
2+
# Cert-Manager Terraform Configuration
33
# ==============================================================================
44
# See: docs/adopting-cert-manager.md | docs/troubleshooting-cert-manager.md
55

66
# Installation Control
7-
install_cert_manager = false # Set to true to install or adopt
7+
install_cert_manager = false
88

9-
# Helm Release (must match existing if adopting)
10-
release_name = "cert-manager"
11-
namespace = "cert-manager"
12-
cert_manager_version = "v1.16.2"
9+
# Helm Release
10+
release_name = "cert-manager"
11+
namespace = "cert-manager"
12+
cert_manager_version = "v1.16.2"
1313

1414
# Certificate Issuer
1515
letsencrypt_email = "admin@example.com"
16-
cert_issuer_kind = "ClusterIssuer" # or "Issuer"
16+
cert_issuer_kind = "ClusterIssuer"
1717
cert_issuer_name = "letsencrypt-prod"
18-
issuer_namespace = "cert-manager" # Only used if cert_issuer_kind = "Issuer"
18+
issuer_namespace = "cert-manager"
19+
20+
# ACME Configuration
21+
ingress_class_name = "nginx"
22+
issuer_server = "https://acme-v02.api.letsencrypt.org/directory"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# ==============================================================================
2-
# NGINX Ingress Controller Configuration
2+
# NGINX Ingress Controller Terraform Configuration
33
# ==============================================================================
44
# See: docs/adopting-ingress-controller.md | docs/troubleshooting-ingress-controller.md
55

66
# Installation Control
7-
install_nginx_ingress = false # Set to true to install or adopt
7+
install_nginx_ingress = false
88

9-
# Helm Release (must match existing if adopting)
9+
# Helm Release
1010
release_name = "ingress-nginx"
1111
namespace = "ingress-nginx"
1212
nginx_ingress_version = "4.14.1"
1313

1414
# Controller Configuration
1515
replica_count = 1
16-
ingress_class_name = "nginx" # WARNING: Immutable after creation
16+
ingress_class_name = "nginx"

lgtm-stack/README.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
# LGTM Stack Deployment
22

3-
The **LGTM** stack is a comprehensive open-source observability platform powered by Grafana Labs. It provides unmatched correlation between metrics, logs, and traces, allowing complete visibility into your applications and infrastructure.
3+
The LGTM stack is a comprehensive open-source observability platform powered by Grafana Labs. It provides correlation between metrics, logs, and traces for complete visibility into applications and infrastructure.
44

55
## Components
66

7-
- **Loki**: Like Prometheus, but for logs. It is a horizontally-scalable, highly-available, multi-tenant log aggregation system.
8-
- **Grafana**: The open observability platform for visualization and analytics.
9-
- **Tempo**: A high-volume, minimal dependency distributed tracing backend.
10-
- **Mimir**: Scalable long-term storage for Prometheus metrics.
7+
- **Loki**: Horizontally-scalable, highly-available, multi-tenant log aggregation system
8+
- **Grafana**: Open observability platform for visualization and analytics
9+
- **Tempo**: High-volume, minimal dependency distributed tracing backend
10+
- **Mimir**: Scalable long-term storage for Prometheus metrics
1111

12-
## Deployment Guides
12+
## Deployment Options
1313

14-
This repository provides two guides to help you deploy the stack:
14+
### 1. Automated Deployment (Terraform)
15+
Fully automated deployment using Terraform for infrastructure-as-code management.
1516

16-
### 1. Automated Deployment
17-
For a fully automated deployment using this stack, please refer to the [observability guide](../docs/kubernetes-observability.md).
17+
For detailed instructions, see the [Terraform deployment guide](../docs/kubernetes-observability.md).
1818

19-
### 2. Manual Deployment
20-
If you prefer to configure and deploy components manually, or need to understand the individual steps, please refer to the [Manual LGTM Deployment Guide](../docs/manual-lgtm-deployment.md).
19+
### 2. Manual Deployment (Helm)
20+
Manual configuration and deployment for granular control over individual components.
2121

22-
## Testing & Verification
23-
To verify that your deployment is working correctly, please refer to the [Testing Monitoring Stack Deployment Guide](../docs/testing-monitoring-stack-deployment.md).
22+
For detailed instructions, see the [Manual deployment guide](../docs/manual-lgtm-deployment.md).
23+
24+
## Testing and Verification
25+
26+
To verify deployment correctness, see the [Testing guide](../docs/testing-monitoring-stack-deployment.md).
2427

2528
## Configuration
26-
For detailed configuration of the Alloy collector, please refer to the [Alloy Configuration Guide](../docs/alloy-config.md).
29+
30+
For Alloy collector configuration, see the [Alloy configuration guide](../docs/alloy-config.md).
31+
32+
## Adoption and Troubleshooting
33+
34+
### Adopting Existing Installation
35+
To manage an existing LGTM stack with Terraform, see the [Adoption guide](../docs/adopting-lgtm-stack.md).
36+
37+
### Troubleshooting
38+
For common issues and solutions, see the [Troubleshooting guide](../docs/troubleshooting-lgtm-stack.md).

lgtm-stack/terraform/terraform.tfvars.template

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
# ==============================================================================
2-
# LGTM Stack Configuration
2+
# LGTM Stack Terraform Configuration
33
# ==============================================================================
44
# See: docs/adopting-lgtm-stack.md | docs/troubleshooting-lgtm-stack.md
55

6-
# GCP & Cluster
6+
# GCP and Cluster Configuration
77
project_id = "your-gcp-project-id"
88
region = "us-central1"
99
cluster_name = "your-cluster-name"
1010
cluster_location = "us-central1"
1111

12-
# Environment & Domain
12+
# Environment Configuration
1313
environment = "production"
1414
monitoring_domain = "monitoring.example.com"
1515
letsencrypt_email = "admin@example.com"
1616

17-
# Kubernetes
17+
# Kubernetes Configuration
1818
namespace = "lgtm"
1919
k8s_service_account_name = "observability-sa"
2020
gcp_service_account_name = "gke-observability-sa"
2121

22-
# Shared Infrastructure (set to false if managed elsewhere)
22+
# Shared Infrastructure
2323
install_cert_manager = false
2424
install_nginx_ingress = false
2525

26-
# Cert-Manager (only used if install_cert_manager = true)
26+
# Cert-Manager Configuration
2727
cert_manager_version = "v1.16.2"
2828
cert_manager_release_name = "cert-manager"
2929
cert_manager_namespace = "cert-manager"
3030
cert_issuer_name = "letsencrypt-prod"
3131
cert_issuer_kind = "ClusterIssuer"
3232

33-
# Ingress Controller (only used if install_nginx_ingress = true)
33+
# NGINX Ingress Configuration
3434
nginx_ingress_version = "4.14.1"
3535
nginx_ingress_release_name = "ingress-nginx"
3636
nginx_ingress_namespace = "ingress-nginx"
3737
ingress_class_name = "nginx"
3838

3939
# Application Configuration
4040
grafana_admin_password = "change-this-secure-password"
41-
loki_schema_from_date = "2024-01-01" # Must be in the past
41+
loki_schema_from_date = "2024-01-01"
4242

43-
# Component Versions (Helm chart versions)
43+
# Component Versions
4444
loki_version = "6.20.0"
4545
mimir_version = "5.5.0"
4646
tempo_version = "1.57.0"

0 commit comments

Comments
 (0)