Fixing UI deployment (#530)

ExpediaDotCom · Nov 8, 2019 · 29a6705 · 29a6705
1 parent 41f1ad2
commit 29a6705
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/deployment/terraform/main.tf b/deployment/terraform/main.tf
@@ -36,7 +36,7 @@ data "template_file" "config_data" {
     ui_saml_entry_point = "${var.ui_saml_entry_point}"
     ui_saml_issuer = "${var.ui_saml_issuer}"
     ui_session_secret = "${var.ui_session_secret}"
-    metricpoint_encoder_type = "${var.metricpoint_encoder_type}"
+    encoder_type = "${var.encoder_type}"
   }
 }
 

diff --git a/deployment/terraform/templates/haystack-ui_json.tpl b/deployment/terraform/templates/haystack-ui_json.tpl
@@ -2,6 +2,7 @@
   "port": 8080,
   "cluster": true,
   "upstreamTimeout": 30000,
+  "encoder": "${encoder_type}",
   "enableServicePerformance": false,
   "enableServiceLevelTrends": false,
   "enableLatencyCostViewer": true,
@@ -22,9 +23,7 @@
     },
     "trends": {
       "connectorName": "haystack",
-      "metricTankUrl": "http://${metrictank_hostname}:${metrictank_port}",
-      "encoder": "${metricpoint_encoder_type}"
-
+      "metricTankUrl": "http://${metrictank_hostname}:${metrictank_port}"
     },
     "alerts": {
       "connectorName": "haystack",

diff --git a/deployment/terraform/variables.tf b/deployment/terraform/variables.tf
@@ -14,7 +14,7 @@ variable "cpu_request"{}
 variable "cpu_limit"{}
 variable "graphite_hostname" {}
 variable "graphite_port" {}
-variable "metricpoint_encoder_type" {}
+variable "encoder_type" {}
 
 variable "termination_grace_period" {
   default = 30