Fix log-cache hostname, added alias

[Bug Fixes]

* Fix issue with log-cache hostname from upstream template.  This also
  necessitated adding log-cache from the cf deployment to the
  bosh-dns-aliases as log-cache.service.cf.internal

Added log-cache to bosh-dns-aliases if using log-cache

overlay/enable-log-cache.yml

@@ -1,24 +1,31 @@
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/use_log_cache?
-  value: true
-
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/host
-  value: logcache
-
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/port
-  value: 8080
-
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/ca_cert
-  value: (( concat "((" meta.cf.credhub_path "log_cache.ca))" ))
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/client_cert
-  value: (( concat "((" meta.cf.credhub_path "log_cache.certificate))" ))
-
-- type: replace
-  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/client_key
-  value: (( concat "((" meta.cf.credhub_path "log_cache.private_key))" ))
-
+---
+instance_groups:
+- name: asmetrics
+  jobs:
+  - name: eventgenerator
+    properties:
+      autoscaler:
+        eventgenerator:
+          metricscollector:
+            use_log_cache: true
+            host:          log-cache.service.cf.internal
+            port:          8080
+            ca_cert:       (( concat "((" meta.cf.credhub_path "log_cache.ca))" ))
+            client_cert:   (( concat "((" meta.cf.credhub_path "log_cache.certificate))" ))
+            client_key:    (( concat "((" meta.cf.credhub_path "log_cache.private_key))" ))
 
+addons:
+- name: bosh-dns-aliases
+  jobs:
+  - name: bosh-dns-aliases
+    properties:
+      aliases:
+      - (( merge on domain))
+      - domain: log-cache.service.cf.internal
+        targets:
+        - (( merge on query ))
+        - query: "*"
+          deployment: (( grab meta.cf.deployment_name ))
+          network:    (( grab params.cf_core_network ))
+          domain: bosh
+          instance_group: log-cache

spec/results/new-cf.yml

@@ -80,6 +80,13 @@ addons:
           instance_group: nats
           network: test-core-network
           query: _
+      - domain: log-cache.service.cf.internal
+        targets:
+        - deployment: base-test-cf
+          domain: bosh
+          instance_group: log-cache
+          network: test-core-network
+          query: '*'
     release: bosh-dns-aliases
   name: bosh-dns-aliases
 - jobs:
@@ -620,7 +627,7 @@ instance_groups:
             ca_cert: <!{credhub}:log_cache.ca!>
             client_cert: <!{credhub}:log_cache.certificate!>
             client_key: <!{credhub}:log_cache.private_key!>
-            host: logcache
+            host: log-cache.service.cf.internal
             port: 8080
             use_log_cache: true
           scaling_engine: