Merge pull request #844 from ExpediaDotCom/ns_add

adding missing variables

Author: Jason Bulicek

deployment/terraform/cluster/aws/apps/variables.tf

@@ -240,6 +240,10 @@ variable "haystack-console" {
     console_memory_request = "1000"
     console_memory_limit = "1000"
     console_jvm_memory_limit = "768"
+    upstreamTimeout = 20000
+    healthcheckthreshold_k8sCluster_cpuUsage = "0.9"
+    healthcheckthreshold_k8sCluster_memoryUsage = "0.9"
+    healthcheckthreshold_kafka_cpuUsage = "0.9"
     healthcheckthreshold_trends_iteratorAgeSeconds = "300"
     healthcheckthreshold_traces_iteratorAgeSeconds = "300"
     healthcheckthreshold_service-graph_iteratorAgeSeconds = "300"
@@ -384,6 +388,13 @@ variable "modelservice" {
     detector_mapper_index_name=""
     detector_index_name=""
     detector_mapper_es_config_aws_iam_auth_required=""
+    modelservice_tracing_apikey=""
+    haystack_collector_endpoint=""
+    modelservice_tracing_clientid=""
+    haystack_tracer_shutdown_timeout=""
+    haystack_tracer_flush_interval=""
+    haystack_tracer_thread_count=""
+    haystack_tracer_queue_size=""
   }
 }
 
@@ -439,6 +450,14 @@ variable "ad-manager" {
     metric_consumer_group_id=""
     anomaly_producer_breakout_topic=""
     throttle_gate_likelihood=""
+    ad_manager_tracing_clientid=""
+    tracing_status=""
+    haystack_tracer_shutdown_timeout=""
+    haystack_collector_endpoint=""
+    haystack_tracer_flush_interval=""
+    ad_manager_tracing_apikey=""
+    haystack_tracer_thread_count=""
+    haystack_tracer_queue_size=""
   }
 }
 

deployment/terraform/cluster/local/apps/variables.tf

@@ -251,6 +251,10 @@ variable "haystack-console" {
     console_memory_request = "1000"
     console_memory_limit = "1000"
     console_jvm_memory_limit = "768"
+    upstreamTimeout = 20000
+    healthcheckthreshold_k8sCluster_cpuUsage = "0.9"
+    healthcheckthreshold_k8sCluster_memoryUsage = "0.9"
+    healthcheckthreshold_kafka_cpuUsage = "0.9"
     healthcheckthreshold_trends_iteratorAgeSeconds = "300"
     healthcheckthreshold_traces_iteratorAgeSeconds = "300"
     healthcheckthreshold_service-graph_iteratorAgeSeconds = "300"
@@ -393,6 +397,13 @@ variable "modelservice" {
     detector_mapper_index_name=""
     detector_index_name=""
     detector_mapper_es_config_aws_iam_auth_required=""
+    modelservice_tracing_apikey=""
+    haystack_collector_endpoint=""
+    modelservice_tracing_clientid=""
+    haystack_tracer_shutdown_timeout=""
+    haystack_tracer_flush_interval=""
+    haystack_tracer_thread_count=""
+    haystack_tracer_queue_size=""
   }
 }
 
@@ -450,6 +461,14 @@ variable "ad-manager" {
     metric_consumer_group_id=""
     anomaly_producer_breakout_topic=""
     throttle_gate_likelihood=""
+    ad_manager_tracing_clientid=""
+    tracing_status=""
+    haystack_tracer_shutdown_timeout=""
+    haystack_collector_endpoint=""
+    haystack_tracer_flush_interval=""
+    ad_manager_tracing_apikey=""
+    haystack_tracer_thread_count=""
+    haystack_tracer_queue_size=""
   }
 }
 

deployment/terraform/modules/haystack-apps/kubernetes/main.tf

@@ -124,10 +124,14 @@ module "haystack-console" {
   influxdb_endpoint_host = "${var.haystack-console["influxdb_endpoint_host"]}"
   influxdb_endpoint_port = "${var.haystack-console["influxdb_endpoint_port"]}"
   grafana_endpoint = "${var.haystack-console["console_grafana_endpoint"]}"
+  upstreamTimeout = "${var.haystack-console["upstreamTimeout"]}"
   healthcheckthreshold_trends_iteratorAgeSeconds = "${var.haystack-console["healthcheckthreshold_trends_iteratorAgeSeconds"]}"
   healthcheckthreshold_traces_iteratorAgeSeconds = "${var.haystack-console["healthcheckthreshold_traces_iteratorAgeSeconds"]}"
   healthcheckthreshold_service-graph_iteratorAgeSeconds = "${var.haystack-console["healthcheckthreshold_service-graph_iteratorAgeSeconds"]}"
   healthcheckthreshold_collector_iteratorAgeSeconds = "${var.haystack-console["healthcheckthreshold_collector_iteratorAgeSeconds"]}"
+  healthcheckthreshold_k8sCluster_cpuUsage = "${var.haystack-console["healthcheckthreshold_k8sCluster_cpuUsage"]}"
+  healthcheckthreshold_k8sCluster_memoryUsage = "${var.haystack-console["healthcheckthreshold_k8sCluster_memoryUsage"]}"
+  healthcheckthreshold_kafka_cpuUsage = "${var.haystack-console["healthcheckthreshold_kafka_cpuUsage"]}"
   attributorAdditionalTags= "${var.haystack-console["attributorAdditionalTags"]}"
   replicas = "${var.haystack-console["console_instances"]}"
   namespace = "${var.k8s_app_namespace}"
@@ -256,3 +260,4 @@ module "haystack-attribution" {
   haystack_cluster_name ="${var.haystack_cluster_name}"
   haystack_domain_name="${var.domain_name}"
 }
+