Use loggregator_agent addon instead of metron_agent [#156048700,#1579…

…55150] Signed-off-by: Iryna Shustava <[email protected]>
cloudfoundry · Jun 11, 2018 · b4e761f · b4e761f
1 parent fddcf85
commit b4e761f
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 90 deletions.
diff --git a/cf-deployment.yml b/cf-deployment.yml
@@ -8,7 +8,7 @@ update:
   serial: false
   update_watch_time: 5000-1200000
 addons:
-- name: metron_agent
+- name: loggregator_agent
   include:
     stemcell:
     - os: ubuntu-trusty
@@ -17,15 +17,15 @@ addons:
     - name: smoke_tests
       release: cf-smoke-tests
   jobs:
-  - name: metron_agent
-    release: loggregator
+  - name: loggregator_agent
+    release: loggregator-agent
     properties:
       loggregator:
         tls:
           ca_cert: "((loggregator_ca.certificate))"
-          metron:
-            cert: "((loggregator_tls_metron.certificate))"
-            key: "((loggregator_tls_metron.private_key))"
+          agent:
+            cert: "((loggregator_tls_agent.certificate))"
+            key: "((loggregator_tls_agent.private_key))"
 instance_groups:
 - name: smoke-tests
   lifecycle: errand
@@ -274,8 +274,8 @@ instance_groups:
       loggregator: &diego_loggregator_client_properties
         use_v2_api: true
         ca_cert: "((loggregator_ca.certificate))"
-        cert: "((loggregator_tls_metron.certificate))"
-        key: "((loggregator_tls_metron.private_key))"
+        cert: "((loggregator_tls_agent.certificate))"
+        key: "((loggregator_tls_agent.private_key))"
   - name: silk-controller
     release: silk
     properties:
@@ -312,8 +312,8 @@ instance_groups:
       loggregator:
         use_v2_api: true
         ca_cert: "((loggregator_ca.certificate))"
-        cert: "((loggregator_tls_metron.certificate))"
-        key: "((loggregator_tls_metron.private_key))"
+        cert: "((loggregator_tls_agent.certificate))"
+        key: "((loggregator_tls_agent.private_key))"
 - name: uaa
   azs:
   - z1
@@ -1445,7 +1445,7 @@ variables:
     common_name: statsdinjector
     extended_key_usage:
     - client_auth
-- name: loggregator_tls_metron
+- name: loggregator_tls_agent
   type: certificate
   options:
     ca: loggregator_ca

diff --git a/operations/bosh-lite.yml b/operations/bosh-lite.yml
@@ -39,8 +39,8 @@
       loggregator: &diego_loggregator_client_properties
         use_v2_api: true
         ca_cert: "((loggregator_ca.certificate))"
-        cert: "((loggregator_tls_metron.certificate))"
-        key: "((loggregator_tls_metron.private_key))"
+        cert: "((loggregator_tls_agent.certificate))"
+        key: "((loggregator_tls_agent.private_key))"
       diego:
         ssl:
           skip_cert_verify: true

diff --git a/operations/community/change-metron-agent-deployment.yml b/operations/community/change-metron-agent-deployment.yml
@@ -1,6 +1,6 @@
 ---
 # cf-deployment uses system_domain as metron agent deployment.
-# Use this to override metron agent deployment name in the metron_agent addon
+# Use this to override metron agent deployment name in the loggregator_agent addon
 - type: replace
-  path: /addons/name=metron_agent/jobs/name=metron_agent/properties/metron_agent?/deployment
-  value: ((metron_agent_deployment))
+  path: /addons/name=loggregator_agent/jobs/name=loggregator_agent/properties/deployment?
+  value: ((loggregator_agent_deployment))
diff --git a/operations/test/add-persistent-isolation-segment-diego-cell.yml b/operations/test/add-persistent-isolation-segment-diego-cell.yml
@@ -56,8 +56,8 @@
         loggregator:
           use_v2_api: true
           ca_cert: "((loggregator_ca.certificate))"
-          cert: "((loggregator_tls_metron.certificate))"
-          key: "((loggregator_tls_metron.private_key))"
+          cert: "((loggregator_tls_agent.certificate))"
+          key: "((loggregator_tls_agent.private_key))"
         tls:
           ca_cert: "((service_cf_internal_ca.certificate))"
           cert: "((diego_rep_agent_v2.certificate))"
@@ -68,8 +68,8 @@
         loggregator:
           use_v2_api: true
           ca_cert: "((loggregator_ca.certificate))"
-          cert: "((loggregator_tls_metron.certificate))"
-          key: "((loggregator_tls_metron.private_key))"
+          cert: "((loggregator_tls_agent.certificate))"
+          key: "((loggregator_tls_agent.private_key))"
         diego:
           route_emitter:
             local_mode: true

diff --git a/operations/windows-cell.yml b/operations/windows-cell.yml
@@ -44,8 +44,8 @@
         enable_declarative_healthcheck: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
-          cert: ((loggregator_tls_metron.certificate))
-          key: ((loggregator_tls_metron.private_key))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
           use_v2_api: true
         syslog_daemon_config:
           enable: false
@@ -65,29 +65,27 @@
             local_mode: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
-          cert: ((loggregator_tls_metron.certificate))
-          key: ((loggregator_tls_metron.private_key))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
           use_v2_api: true
         tcp:
           enabled: true
         uaa:
           ca_cert: ((uaa_ca.certificate))
           client_secret: ((uaa_clients_tcp_emitter_secret))
       release: diego
-    - name: metron_agent_windows
+    - name: loggregator_agent_windows
       properties:
         loggregator:
           tls:
             ca_cert: ((loggregator_ca.certificate))
-            metron:
-              cert: ((loggregator_tls_metron.certificate))
-              key: ((loggregator_tls_metron.private_key))
-        metron_agent:
-          deployment: ((system_domain))
-          disable_udp: true
+            agent:
+              cert: ((loggregator_tls_agent.certificate))
+              key: ((loggregator_tls_agent.private_key))
+        disable_udp: true
         syslog_daemon_config:
           enable: false
-      release: loggregator
+      release: loggregator-agent
     - name: enable_ssh
       release: windows-utilities
     name: windows-cell

diff --git a/operations/windows2016-cell.yml b/operations/windows2016-cell.yml
@@ -57,8 +57,8 @@
         enable_declarative_healthcheck: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
-          cert: ((loggregator_tls_metron.certificate))
-          key: ((loggregator_tls_metron.private_key))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
           use_v2_api: true
         syslog_daemon_config:
           enable: false
@@ -78,23 +78,21 @@
             local_mode: true
         loggregator:
           ca_cert: ((loggregator_ca.certificate))
-          cert: ((loggregator_tls_metron.certificate))
-          key: ((loggregator_tls_metron.private_key))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
           use_v2_api: true
       release: diego
-    - name: metron_agent_windows
+    - name: loggregator_agent_windows
       properties:
         loggregator:
           tls:
             ca_cert: ((loggregator_ca.certificate))
-            metron:
-              cert: ((loggregator_tls_metron.certificate))
-              key: ((loggregator_tls_metron.private_key))
-        metron_agent:
-          deployment: ((system_domain))
+            agent:
+              cert: ((loggregator_tls_agent.certificate))
+              key: ((loggregator_tls_agent.private_key))
         syslog_daemon_config:
           enable: false
-      release: loggregator
+      release: loggregator-agent
     - name: enable_ssh
       release: windows-utilities
     name: windows2016-cell

diff --git a/operations/workaround/undo-metron-add-on.yml b/operations/workaround/undo-metron-add-on.yml
@@ -1,106 +1,106 @@
 - type: remove
-  path: /addons/name=metron_agent?
+  path: /addons/name=loggregator_agent?
 
 - type: replace
   path: /instance_groups/name=consul/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: &metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: &loggregator_agent_properties
       loggregator:
         tls:
           ca_cert: "((loggregator_ca.certificate))"
-          metron:
-            cert: "((loggregator_tls_metron.certificate))"
-            key: "((loggregator_tls_metron.private_key))"
+          agent:
+            cert: "((loggregator_tls_agent.certificate))"
+            key: "((loggregator_tls_agent.private_key))"
 
 - type: replace
   path: /instance_groups/name=nats/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=doppler/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=database/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=diego-api/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=uaa/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=singleton-blobstore/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=api/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=cc-worker/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=router/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=tcp-router/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=scheduler/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=diego-cell/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
 
 - type: replace
   path: /instance_groups/name=log-api/jobs/-
   value:
-    name: metron_agent
-    release: loggregator
-    properties: *metron_agent_properties
+    name: loggregator_agent
+    release: loggregator-agent
+    properties: *loggregator_agent_properties
diff --git a/scripts/fixtures/test-base-vars-store.yml b/scripts/fixtures/test-base-vars-store.yml
@@ -1160,7 +1160,7 @@ loggregator_tls_doppler:
     q8Tm6ekZoVPRDvxebjYg2FoDVP/ZLmckwJ0URjsGeI7M26npGdSDyxkGx9fq6W4o
     zDz8lzKfqMXcKkOr1PzILbSR/+/xAZ7uqZ2iC30/4s2mfAMjJA+ikA==
     -----END RSA PRIVATE KEY-----
-loggregator_tls_metron:
+loggregator_tls_agent:
   ca: |
     -----BEGIN CERTIFICATE-----
     MIIDKTCCAhGgAwIBAgIQdqyct4mDmvT+T7slhDrHBjANBgkqhkiG9w0BAQsFADA+