Skip to content

Commit 2bb9f50

Browse files
committed
Remove awslogs from runtime
1 parent 7e68988 commit 2bb9f50

3 files changed

Lines changed: 28 additions & 31 deletions

File tree

ci/pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ jobs:
250250
- bosh-config/operations/add-cloud-gov-root-certificate.yml
251251
- bosh-config/operations/nats-payload.yml
252252
- bosh-config/operations/root-disk.yml
253+
- bosh-config/operations/tooling-bosh-awslogs.yml
253254
vars_files:
254255
- bosh-config/variables/tooling.yml
255256
- terraform-secrets/terraform.yml
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Keeping a stubbed version of the release for tooling bosh, the aws cli is used for cron.yml
2+
# and uses the version packaged in this release. For now, tooling bosh will be the only vm with
3+
# awslogs until a replacement for the aws cli is created.
4+
5+
- type: replace
6+
path: /releases/-
7+
value:
8+
name: awslogs-jammy
9+
version: latest
10+
11+
12+
- type: replace
13+
path: /instance_groups/name=bosh/jobs/-
14+
value:
15+
name: awslogs-jammy
16+
release: awslogs-jammy
17+
properties:
18+
awslogs-jammy:
19+
region: us-gov-west-1
20+
awslogs_files_config:
21+
- name: /var/log/audit/audit.log
22+
file: /var/log/audit/audit.log
23+
log_group_name: /var/log/audit/audit.log
24+
log_stream_name: "{{instance_id}}"
25+
initial_position: start_of_file
26+
datetime_format: "%Y-%m-%dT%H:%M:%S"

runtime-config/runtime.yml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ releases:
33
- {name: aide, version: ((release_aide))}
44
- {name: clamav, version: ((release_clamav))}
55
- {name: jammy-snort, version: ((release_jammy_snort))}
6-
- {name: awslogs-jammy, version: ((release_awslogs_jammy))}
76
- {name: nessus-agent, version: ((release_nessus_agent))}
87
- {name: node-exporter, version: ((release_node_exporter))}
98
- {name: syslog, version: ((release_syslog))}
@@ -48,36 +47,7 @@ addons:
4847
group: ((/nessus_agent_group))
4948
server: ((terraform_outputs.nessus_static_ip))
5049
port: 8834
51-
- name: awslogs-jammy
52-
release: awslogs-jammy
53-
properties:
54-
awslogs-jammy:
55-
region: us-gov-west-1
56-
awslogs_files_config:
57-
- name: /var/log/audit/audit.log
58-
file: /var/log/audit/audit.log
59-
log_group_name: /var/log/audit/audit.log
60-
log_stream_name: "{{instance_id}}"
61-
initial_position: start_of_file
62-
datetime_format: "%Y-%m-%dT%H:%M:%S"
63-
- name: /var/log/auth.log
64-
file: /var/log/auth.log
65-
log_group_name: /var/log/auth.log
66-
log_stream_name: "{{instance_id}}"
67-
initial_position: start_of_file
68-
datetime_format: "%Y-%m-%dT%H:%M:%S"
69-
- name: /var/log/dpkg.log
70-
file: /var/log/dpkg.log
71-
log_group_name: /var/log/dpkg.log
72-
log_stream_name: "{{instance_id}}"
73-
initial_position: start_of_file
74-
datetime_format: "%Y-%m-%dT%H:%M:%S"
75-
- name: /var/log/syslog
76-
file: /var/log/syslog
77-
log_group_name: /var/log/syslog
78-
log_stream_name: "{{instance_id}}"
79-
initial_position: start_of_file
80-
datetime_format: "%Y-%m-%dT%H:%M:%S"
50+
8151
tags:
8252
environment: ((bosh_environment))
8353
variables:

0 commit comments

Comments
 (0)