chef · markan · Feb 3, 2017 · Apr 7, 2017 · Oct 25, 2017 · Oct 26, 2017
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -80,6 +80,10 @@ services:
       --bind database:postgresql.default
       --bind elasticsearch:elasticsearch.default
       --bind chef-server-ctl:chef-server-ctl.default
+    environment:
+      HAB_OC_ERCHEF: |
+        [data_collector]
+        enabled = false
 
   chef-server-nginx:
     image: $HAB_ORIGIN/chef-server-nginx

diff --git a/src/nginx/habitat/config/chef_http_lb_common b/src/nginx/habitat/config/chef_http_lb_common
@@ -4,7 +4,17 @@
     listen {{port}};
     server_name api.chef-server.dev;
 
+    {{#if bind.oc_erchef ~}}
+       {{#eachAlive bind.oc_erchef.members as |member| ~}}
+         {{#if @last ~}}
+           {{#if member.cfg.data_collector.enabled ~}}
+    set_by_lua $data_collector_token '{{member.cfg.data_collector_token}}';
+           {{else ~}}
     set_by_lua $data_collector_token 'return os.getenv("DATA_COLLECTOR_TOKEN")';
+           {{/if ~}}
+         {{/if ~}}
+       {{/eachAlive ~}}
+    {{/if ~}}
 
     access_log stdout opscode;
 {{~#if is_ssl}}
@@ -56,7 +66,22 @@
       proxy_pass http://opscode_erchef;
     }
 
-
+{{#if bind.oc_erchef ~}}
+  {{#eachAlive bind.oc_erchef.members as |member| ~}}
+    {{#if @last ~}}
+      {{#if member.cfg.data_collector_enabled ~}}
+    location ~ "^/organizations/([^/]+)/data-collector$" {
+      set $request_org $1;
+      access_by_lua_block { validator.validate("POST") }
+      proxy_set_header x-data-collector-token $data_collector_token;
+      proxy_set_header x-data-collector-auth "version=1.0";
+      rewrite ^ /data-collector/v0/ break;
+      proxy_pass https://data-collector;
+    }
+      {{/if ~}}
+    {{/if ~}}
+  {{/eachAlive ~}}
+{{/if ~}}
 
     location ~ "^/organizations/([^/]+)/required_recipe$" {
       # This endpoint is unique because it is defined via nginx and is not

diff --git a/src/nginx/habitat/config/nginx.conf b/src/nginx/habitat/config/nginx.conf
@@ -99,6 +99,17 @@ http {
        {{/eachAlive}}
     {{/if}}
   }
+{{#if bind.oc_erchef ~}}
+  {{#eachAlive bind.oc_erchef.members as |member| ~}}
+    {{#if @last ~}}
+      {{#if member.cfg.data_collector_enabled ~}}
+  upstream data-collector {
+         server {{member.cfg.data_collector_server}}:{{member.cfg.data_collector_port}};
+  }
+      {{/if ~}}
+    {{/if ~}}
+  {{/eachAlive ~}}
+{{/if ~}}
 
   # Include upstream definitions for addons
   # TODO HABITAT plugins not yet

diff --git a/src/nginx/habitat/default.toml b/src/nginx/habitat/default.toml
@@ -28,10 +28,6 @@ server_name = "chef-server"
 ssl_protocols = "TLSv1.2"
 ssl_ciphers = "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:AES256-GCM-SHA384:!aNULL:!eNULL:!EXPORT"
 
-# Copied from workflow-server's default.toml
-[data_collector]
-token = "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"
-
 # Ports used for SSL traffic; used to render partials for chef_http[s]_lb_conf
 [http]
 port = 8080

diff --git a/src/nginx/habitat/plan.sh b/src/nginx/habitat/plan.sh
@@ -18,7 +18,7 @@ pkg_exports=(
 )
 pkg_binds_optional=(
   [bookshelf]="port"
-  [oc_erchef]="port"
+  [oc_erchef]="port data_collector_enabled data_collector_server data_collector_port data_collector_token"
   [oc_bifrost]="port"
   [elasticsearch]="http-port"
   [oc_id]="port"

diff --git a/src/oc_erchef/habitat/config/sys.config b/src/oc_erchef/habitat/config/sys.config
@@ -256,8 +256,18 @@
         {depsolver_timeout, 20000},
         {depsolver_pooler_timeout, 0}
     ]},
-
-
+{{#if cfg.data_collector.enabled ~}}
+    {data_collector, [
+        {root_url,                "https://{{cfg.data_collector.server}}:{{cfg.data_collector.port}}/data-collector/v0/"},
+        {timeout,                 30000},
+        {init_count,              25},
+        {max_count,               100},
+        {cull_interval,           {1, min}},
+        {max_age,                 {70, sec}},
+        {max_connection_duration, {70,sec}},
+        {ibrowse_options,         [{connect_timeout, 10000}]}
+    ]},
+{{/if ~}}
     {stats_hero, [
         {udp_socket_pool_size, 20 },
         {protocol, estatsd},

diff --git a/src/oc_erchef/habitat/default.toml b/src/oc_erchef/habitat/default.toml
@@ -66,6 +66,9 @@ queue_at_capacity_affects_overall_status=""
 
 [data_collector]
 enabled=false
+server="automate-server.test"
+port="443"
+token="93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"
 
 [stats_hero]
 

diff --git a/src/oc_erchef/habitat/plan.sh b/src/oc_erchef/habitat/plan.sh
@@ -24,7 +24,11 @@ pkg_upstream_url="https://github.com/chef/chef-server"
 
 pkg_exposes=(port)
 pkg_exports=(
-    [port]=oc_chef_wm.port
+  [port]=oc_chef_wm.port
+  [data_collector_enabled]=data_collector.enabled
+  [data_collector_server]=data_collector.server
+  [data_collector_port]=data_collector.port
+  [data_collector_token]=data_collector.token
 )
 
 pkg_binds_optional=(