Merge pull request #57 from vaibhavsawhney/versionUpgrade

Added ports as variables in haystack-agent config

Author: keshavpeswani

deployment/terraform/haystack-agent/main.tf

@@ -25,6 +25,8 @@ data "template_file" "config_data" {
     kafka_endpoint = "${var.kafka_hostname}:${var.kafka_port}"
     aws_bucket_name = "${var.haystack-agent["blobs_aws_bucket_name"]}"
     aws_region = "${var.haystack-agent["blobs_aws_region"]}"
+    blobs_service_port = "${var.blobs_service_port}"
+    spans_service_port = "${var.spans_service_port}"
   }
 }
 

deployment/terraform/haystack-agent/outputs.tf

@@ -0,0 +1,3 @@
+output "proxy_grpc_server_endpoint" {
+  value = "haystack-agent:${var.blobs_service_port}"
+}

deployment/terraform/haystack-agent/templates/haystack-agent.conf

@@ -1,7 +1,7 @@
 agents {
   spans {
     enabled = true
-    port = 35000
+    port = "${spans_service_port}"
     dispatchers {
       kafka {
         bootstrap.servers = "${kafka_endpoint}"
@@ -13,7 +13,7 @@ agents {
   }
   ossblobs {
     enabled = true
-    port = 35001
+    port = "${blobs_service_port}"
     max.blob.size.in.kb = 512
     dispatchers {
       s3 {