remove wavefront dependancy

#18 Signed-off-by: Rui Yang <[email protected]>
concourse · Jul 28, 2022 · b307a99 · b307a99
1 parent ab0f272
commit b307a99
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 543 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,6 @@ the bootstrapping pipeline, since this repo is private.
 It will also prompt you to ensure that the required secrets have been added
 to GCP Secret Manager. The following secrets must be created:
 
-* `production-wavefront_token` - the wavefront token for sending metrics/traces
 * `production-ci-github_client_id` - the client ID of the Github application
   for authenticating with the CI concourse deployment
 * `production-ci-github_client_secret` - the client ID of the Github

diff --git a/bootstrap/setup b/bootstrap/setup
@@ -39,7 +39,6 @@ jq -n '{ "greenpeace_gcp_credentials_json": $credentials[] | tojson,
 # TODO: actually validate that these secrets are present with gcloud cli
 echo
 echo "ensure that the following secrets have been added to GCP Secret Manager:"
-echo "- production-wavefront_token"
 echo "- production-ci-github_client_id"
 echo "- production-ci-github_client_secret"
 echo "- dispatcher-concourse-github_client_id"

diff --git a/terraform/dependencies/wavefront/main.tf b/terraform/dependencies/wavefront/main.tf
diff --git a/terraform/dependencies/wavefront/outputs.tf b/terraform/dependencies/wavefront/outputs.tf
diff --git a/terraform/dependencies/wavefront/variables.tf b/terraform/dependencies/wavefront/variables.tf
diff --git a/terraform/environments/dispatcher/concourse-values.yml.tpl b/terraform/environments/dispatcher/concourse-values.yml.tpl
@@ -34,19 +34,6 @@ web:
       type: LoadBalancer
       loadBalancerIP: ${lb_address}
 
-  sidecarContainers:
-    - name: otel-collector
-      image: otel/opentelemetry-collector-contrib:0.15.0
-      args: ['--config=/etc/config/otelcol.yml']
-      volumeMounts:
-        - name: otelcol-config
-          mountPath: /etc/config
-
-  additionalVolumes:
-    - name: otelcol-config
-      configMap:
-        name: ${otelcol_config_map_name}
-
 worker:
   replicas: 1
   annotations:

diff --git a/terraform/environments/dispatcher/concourse.tf b/terraform/environments/dispatcher/concourse.tf
@@ -66,8 +66,6 @@ data "template_file" "concourse_values" {
     vault_ca_cert            = jsonencode(module.vault.ca_pem)
     vault_client_cert        = jsonencode(module.vault.client_cert_pem)
     vault_client_private_key = jsonencode(module.vault.client_private_key_pem)
-
-    otelcol_config_map_name = kubernetes_config_map.otel_collector.metadata.0.name
   }
 }
 

diff --git a/terraform/environments/dispatcher/metrics.tf b/terraform/environments/dispatcher/metrics.tf
diff --git a/terraform/environments/production/ci-values.yml.tpl b/terraform/environments/production/ci-values.yml.tpl
@@ -37,18 +37,6 @@ web:
       type: LoadBalancer
       loadBalancerIP: ${lb_address}
 
-  sidecarContainers:
-    - name: otel-collector
-      image: otel/opentelemetry-collector-contrib:0.15.0
-      args: ['--config=/etc/config/otelcol.yml']
-      volumeMounts:
-        - name: otelcol-config
-          mountPath: /etc/config
-  additionalVolumes:
-    - name: otelcol-config
-      configMap:
-        name: ${otelcol_config_map_name}
-
 concourse:
   web:
     auth:
@@ -78,10 +66,6 @@ concourse:
       createTeamNamespaces: false
     prometheus:
       enabled: true
-    tracing:
-      serviceName: web
-      otlpAddress: 127.0.0.1:55680
-      otlpUseTls: false
     vault:
       enabled: true
       url: https://vault.vault.svc.cluster.local:8200

diff --git a/terraform/environments/production/ci.tf b/terraform/environments/production/ci.tf
@@ -100,8 +100,6 @@ data "template_file" "ci_values" {
     vault_ca_cert            = jsonencode(module.vault.ca_pem)
     vault_client_cert        = jsonencode(module.vault.client_cert_pem)
     vault_client_private_key = jsonencode(module.vault.client_private_key_pem)
-
-    otelcol_config_map_name = jsonencode(kubernetes_config_map.otel_collector.metadata[0].name)
   }
 }