Skip to content

Commit b4e761f

Browse files
njbennettnjbennett
committed
Use loggregator_agent addon instead of metron_agent [#156048700,#157955150]
Signed-off-by: Iryna Shustava <ishustava@pivotal.io>
1 parent fddcf85 commit b4e761f

8 files changed

Lines changed: 86 additions & 90 deletions

File tree

‎cf-deployment.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ update:
88
serial: false
99
update_watch_time: 5000-1200000
1010
addons:
11-
- name: metron_agent
11+
- name: loggregator_agent
1212
include:
1313
stemcell:
1414
- os: ubuntu-trusty
@@ -17,15 +17,15 @@ addons:
1717
- name: smoke_tests
1818
release: cf-smoke-tests
1919
jobs:
20-
- name: metron_agent
21-
release: loggregator
20+
- name: loggregator_agent
21+
release: loggregator-agent
2222
properties:
2323
loggregator:
2424
tls:
2525
ca_cert: "((loggregator_ca.certificate))"
26-
metron:
27-
cert: "((loggregator_tls_metron.certificate))"
28-
key: "((loggregator_tls_metron.private_key))"
26+
agent:
27+
cert: "((loggregator_tls_agent.certificate))"
28+
key: "((loggregator_tls_agent.private_key))"
2929
instance_groups:
3030
- name: smoke-tests
3131
lifecycle: errand
@@ -274,8 +274,8 @@ instance_groups:
274274
loggregator: &diego_loggregator_client_properties
275275
use_v2_api: true
276276
ca_cert: "((loggregator_ca.certificate))"
277-
cert: "((loggregator_tls_metron.certificate))"
278-
key: "((loggregator_tls_metron.private_key))"
277+
cert: "((loggregator_tls_agent.certificate))"
278+
key: "((loggregator_tls_agent.private_key))"
279279
- name: silk-controller
280280
release: silk
281281
properties:
@@ -312,8 +312,8 @@ instance_groups:
312312
loggregator:
313313
use_v2_api: true
314314
ca_cert: "((loggregator_ca.certificate))"
315-
cert: "((loggregator_tls_metron.certificate))"
316-
key: "((loggregator_tls_metron.private_key))"
315+
cert: "((loggregator_tls_agent.certificate))"
316+
key: "((loggregator_tls_agent.private_key))"
317317
- name: uaa
318318
azs:
319319
- z1
@@ -1445,7 +1445,7 @@ variables:
14451445
common_name: statsdinjector
14461446
extended_key_usage:
14471447
- client_auth
1448-
- name: loggregator_tls_metron
1448+
- name: loggregator_tls_agent
14491449
type: certificate
14501450
options:
14511451
ca: loggregator_ca

‎operations/bosh-lite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
loggregator: &diego_loggregator_client_properties
4040
use_v2_api: true
4141
ca_cert: "((loggregator_ca.certificate))"
42-
cert: "((loggregator_tls_metron.certificate))"
43-
key: "((loggregator_tls_metron.private_key))"
42+
cert: "((loggregator_tls_agent.certificate))"
43+
key: "((loggregator_tls_agent.private_key))"
4444
diego:
4545
ssl:
4646
skip_cert_verify: true

‎operations/community/change-metron-agent-deployment.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# cf-deployment uses system_domain as metron agent deployment.
3-
# Use this to override metron agent deployment name in the metron_agent addon
3+
# Use this to override metron agent deployment name in the loggregator_agent addon
44
- type: replace
5-
path: /addons/name=metron_agent/jobs/name=metron_agent/properties/metron_agent?/deployment
6-
value: ((metron_agent_deployment))
5+
path: /addons/name=loggregator_agent/jobs/name=loggregator_agent/properties/deployment?
6+
value: ((loggregator_agent_deployment))

‎operations/test/add-persistent-isolation-segment-diego-cell.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
loggregator:
5757
use_v2_api: true
5858
ca_cert: "((loggregator_ca.certificate))"
59-
cert: "((loggregator_tls_metron.certificate))"
60-
key: "((loggregator_tls_metron.private_key))"
59+
cert: "((loggregator_tls_agent.certificate))"
60+
key: "((loggregator_tls_agent.private_key))"
6161
tls:
6262
ca_cert: "((service_cf_internal_ca.certificate))"
6363
cert: "((diego_rep_agent_v2.certificate))"
@@ -68,8 +68,8 @@
6868
loggregator:
6969
use_v2_api: true
7070
ca_cert: "((loggregator_ca.certificate))"
71-
cert: "((loggregator_tls_metron.certificate))"
72-
key: "((loggregator_tls_metron.private_key))"
71+
cert: "((loggregator_tls_agent.certificate))"
72+
key: "((loggregator_tls_agent.private_key))"
7373
diego:
7474
route_emitter:
7575
local_mode: true

‎operations/windows-cell.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
enable_declarative_healthcheck: true
4545
loggregator:
4646
ca_cert: ((loggregator_ca.certificate))
47-
cert: ((loggregator_tls_metron.certificate))
48-
key: ((loggregator_tls_metron.private_key))
47+
cert: ((loggregator_tls_agent.certificate))
48+
key: ((loggregator_tls_agent.private_key))
4949
use_v2_api: true
5050
syslog_daemon_config:
5151
enable: false
@@ -65,29 +65,27 @@
6565
local_mode: true
6666
loggregator:
6767
ca_cert: ((loggregator_ca.certificate))
68-
cert: ((loggregator_tls_metron.certificate))
69-
key: ((loggregator_tls_metron.private_key))
68+
cert: ((loggregator_tls_agent.certificate))
69+
key: ((loggregator_tls_agent.private_key))
7070
use_v2_api: true
7171
tcp:
7272
enabled: true
7373
uaa:
7474
ca_cert: ((uaa_ca.certificate))
7575
client_secret: ((uaa_clients_tcp_emitter_secret))
7676
release: diego
77-
- name: metron_agent_windows
77+
- name: loggregator_agent_windows
7878
properties:
7979
loggregator:
8080
tls:
8181
ca_cert: ((loggregator_ca.certificate))
82-
metron:
83-
cert: ((loggregator_tls_metron.certificate))
84-
key: ((loggregator_tls_metron.private_key))
85-
metron_agent:
86-
deployment: ((system_domain))
87-
disable_udp: true
82+
agent:
83+
cert: ((loggregator_tls_agent.certificate))
84+
key: ((loggregator_tls_agent.private_key))
85+
disable_udp: true
8886
syslog_daemon_config:
8987
enable: false
90-
release: loggregator
88+
release: loggregator-agent
9189
- name: enable_ssh
9290
release: windows-utilities
9391
name: windows-cell

‎operations/windows2016-cell.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
enable_declarative_healthcheck: true
5858
loggregator:
5959
ca_cert: ((loggregator_ca.certificate))
60-
cert: ((loggregator_tls_metron.certificate))
61-
key: ((loggregator_tls_metron.private_key))
60+
cert: ((loggregator_tls_agent.certificate))
61+
key: ((loggregator_tls_agent.private_key))
6262
use_v2_api: true
6363
syslog_daemon_config:
6464
enable: false
@@ -78,23 +78,21 @@
7878
local_mode: true
7979
loggregator:
8080
ca_cert: ((loggregator_ca.certificate))
81-
cert: ((loggregator_tls_metron.certificate))
82-
key: ((loggregator_tls_metron.private_key))
81+
cert: ((loggregator_tls_agent.certificate))
82+
key: ((loggregator_tls_agent.private_key))
8383
use_v2_api: true
8484
release: diego
85-
- name: metron_agent_windows
85+
- name: loggregator_agent_windows
8686
properties:
8787
loggregator:
8888
tls:
8989
ca_cert: ((loggregator_ca.certificate))
90-
metron:
91-
cert: ((loggregator_tls_metron.certificate))
92-
key: ((loggregator_tls_metron.private_key))
93-
metron_agent:
94-
deployment: ((system_domain))
90+
agent:
91+
cert: ((loggregator_tls_agent.certificate))
92+
key: ((loggregator_tls_agent.private_key))
9593
syslog_daemon_config:
9694
enable: false
97-
release: loggregator
95+
release: loggregator-agent
9896
- name: enable_ssh
9997
release: windows-utilities
10098
name: windows2016-cell

‎operations/workaround/undo-metron-add-on.yml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
11
- type: remove
2-
path: /addons/name=metron_agent?
2+
path: /addons/name=loggregator_agent?
33

44
- type: replace
55
path: /instance_groups/name=consul/jobs/-
66
value:
7-
name: metron_agent
8-
release: loggregator
9-
properties: &metron_agent_properties
7+
name: loggregator_agent
8+
release: loggregator-agent
9+
properties: &loggregator_agent_properties
1010
loggregator:
1111
tls:
1212
ca_cert: "((loggregator_ca.certificate))"
13-
metron:
14-
cert: "((loggregator_tls_metron.certificate))"
15-
key: "((loggregator_tls_metron.private_key))"
13+
agent:
14+
cert: "((loggregator_tls_agent.certificate))"
15+
key: "((loggregator_tls_agent.private_key))"
1616

1717
- type: replace
1818
path: /instance_groups/name=nats/jobs/-
1919
value:
20-
name: metron_agent
21-
release: loggregator
22-
properties: *metron_agent_properties
20+
name: loggregator_agent
21+
release: loggregator-agent
22+
properties: *loggregator_agent_properties
2323

2424
- type: replace
2525
path: /instance_groups/name=doppler/jobs/-
2626
value:
27-
name: metron_agent
28-
release: loggregator
29-
properties: *metron_agent_properties
27+
name: loggregator_agent
28+
release: loggregator-agent
29+
properties: *loggregator_agent_properties
3030

3131
- type: replace
3232
path: /instance_groups/name=database/jobs/-
3333
value:
34-
name: metron_agent
35-
release: loggregator
36-
properties: *metron_agent_properties
34+
name: loggregator_agent
35+
release: loggregator-agent
36+
properties: *loggregator_agent_properties
3737

3838
- type: replace
3939
path: /instance_groups/name=diego-api/jobs/-
4040
value:
41-
name: metron_agent
42-
release: loggregator
43-
properties: *metron_agent_properties
41+
name: loggregator_agent
42+
release: loggregator-agent
43+
properties: *loggregator_agent_properties
4444

4545
- type: replace
4646
path: /instance_groups/name=uaa/jobs/-
4747
value:
48-
name: metron_agent
49-
release: loggregator
50-
properties: *metron_agent_properties
48+
name: loggregator_agent
49+
release: loggregator-agent
50+
properties: *loggregator_agent_properties
5151

5252
- type: replace
5353
path: /instance_groups/name=singleton-blobstore/jobs/-
5454
value:
55-
name: metron_agent
56-
release: loggregator
57-
properties: *metron_agent_properties
55+
name: loggregator_agent
56+
release: loggregator-agent
57+
properties: *loggregator_agent_properties
5858

5959
- type: replace
6060
path: /instance_groups/name=api/jobs/-
6161
value:
62-
name: metron_agent
63-
release: loggregator
64-
properties: *metron_agent_properties
62+
name: loggregator_agent
63+
release: loggregator-agent
64+
properties: *loggregator_agent_properties
6565

6666
- type: replace
6767
path: /instance_groups/name=cc-worker/jobs/-
6868
value:
69-
name: metron_agent
70-
release: loggregator
71-
properties: *metron_agent_properties
69+
name: loggregator_agent
70+
release: loggregator-agent
71+
properties: *loggregator_agent_properties
7272

7373
- type: replace
7474
path: /instance_groups/name=router/jobs/-
7575
value:
76-
name: metron_agent
77-
release: loggregator
78-
properties: *metron_agent_properties
76+
name: loggregator_agent
77+
release: loggregator-agent
78+
properties: *loggregator_agent_properties
7979

8080
- type: replace
8181
path: /instance_groups/name=tcp-router/jobs/-
8282
value:
83-
name: metron_agent
84-
release: loggregator
85-
properties: *metron_agent_properties
83+
name: loggregator_agent
84+
release: loggregator-agent
85+
properties: *loggregator_agent_properties
8686

8787
- type: replace
8888
path: /instance_groups/name=scheduler/jobs/-
8989
value:
90-
name: metron_agent
91-
release: loggregator
92-
properties: *metron_agent_properties
90+
name: loggregator_agent
91+
release: loggregator-agent
92+
properties: *loggregator_agent_properties
9393

9494
- type: replace
9595
path: /instance_groups/name=diego-cell/jobs/-
9696
value:
97-
name: metron_agent
98-
release: loggregator
99-
properties: *metron_agent_properties
97+
name: loggregator_agent
98+
release: loggregator-agent
99+
properties: *loggregator_agent_properties
100100

101101
- type: replace
102102
path: /instance_groups/name=log-api/jobs/-
103103
value:
104-
name: metron_agent
105-
release: loggregator
106-
properties: *metron_agent_properties
104+
name: loggregator_agent
105+
release: loggregator-agent
106+
properties: *loggregator_agent_properties

‎scripts/fixtures/test-base-vars-store.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ loggregator_tls_doppler:
11601160
q8Tm6ekZoVPRDvxebjYg2FoDVP/ZLmckwJ0URjsGeI7M26npGdSDyxkGx9fq6W4o
11611161
zDz8lzKfqMXcKkOr1PzILbSR/+/xAZ7uqZ2iC30/4s2mfAMjJA+ikA==
11621162
-----END RSA PRIVATE KEY-----
1163-
loggregator_tls_metron:
1163+
loggregator_tls_agent:
11641164
ca: |
11651165
-----BEGIN CERTIFICATE-----
11661166
MIIDKTCCAhGgAwIBAgIQdqyct4mDmvT+T7slhDrHBjANBgkqhkiG9w0BAQsFADA+

0 commit comments

Comments
 (0)
⚡