From 18dcc8ed03bb1e055a575c70cc405bc71b70375a Mon Sep 17 00:00:00 2001 From: Mark Boyd Date: Mon, 9 Dec 2024 15:08:26 -0500 Subject: [PATCH 1/2] update instance group name for ingesting RDS cloudwatch logs --- opensearch-development.yml | 2 +- opensearch-jobs.yml | 4 ++-- opensearch-production.yml | 2 +- opensearch-staging.yml | 2 +- opsfiles/enable-node-tls.yml | 10 +++++----- opsfiles/enable-proxy-auth.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/opensearch-development.yml b/opensearch-development.yml index 516a8a2..e078a1f 100644 --- a/opensearch-development.yml +++ b/opensearch-development.yml @@ -24,7 +24,7 @@ instance_groups: instances: 1 vm_type: m6i.large -- name: ingestor_cloudwatch +- name: ingestor_cloudwatch_rds instances: 1 - name: maintenance diff --git a/opensearch-jobs.yml b/opensearch-jobs.yml index 139a810..80c1191 100644 --- a/opensearch-jobs.yml +++ b/opensearch-jobs.yml @@ -378,7 +378,7 @@ instance_groups: networks: - name: services -- name: ingestor_cloudwatch +- name: ingestor_cloudwatch_rds instances: 1 jobs: - name: bpm @@ -432,4 +432,4 @@ instance_groups: - logs-opensearch-ingestor-profile - 50GB_ephemeral_disk networks: - - name: services \ No newline at end of file + - name: services diff --git a/opensearch-production.yml b/opensearch-production.yml index 178fc28..128e3dc 100644 --- a/opensearch-production.yml +++ b/opensearch-production.yml @@ -27,7 +27,7 @@ instance_groups: instances: 7 vm_type: r6i.xlarge.logsearch.ingestor -- name: ingestor_cloudwatch +- name: ingestor_cloudwatch_rds instances: 1 vm_type: r6i.large diff --git a/opensearch-staging.yml b/opensearch-staging.yml index 01dca52..bcf4006 100644 --- a/opensearch-staging.yml +++ b/opensearch-staging.yml @@ -27,7 +27,7 @@ instance_groups: instances: 1 vm_type: m6i.large -- name: ingestor_cloudwatch +- name: ingestor_cloudwatch_rds instances: 1 - name: maintenance diff --git a/opsfiles/enable-node-tls.yml b/opsfiles/enable-node-tls.yml index 3f2bc5f..4c0f097 100644 --- a/opsfiles/enable-node-tls.yml +++ b/opsfiles/enable-node-tls.yml @@ -123,21 +123,21 @@ path: /instance_groups/name=ingestor/jobs/name=opensearch/properties?/opensearch?/http?/ssl? value: *http-tls-properties -# ingestor_cloudwatch +# ingestor_cloudwatch_rds - type: replace - path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties?/opensearch?/http_host? + path: /instance_groups/name=ingestor_cloudwatch_rds/jobs/name=opensearch/properties?/opensearch?/http_host? value: 127.0.0.1 - type: replace - path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties/opensearch?/admin? + path: /instance_groups/name=ingestor_cloudwatch_rds/jobs/name=opensearch/properties/opensearch?/admin? value: *admin-tls-properties - type: replace - path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties/opensearch?/node?/ssl? + path: /instance_groups/name=ingestor_cloudwatch_rds/jobs/name=opensearch/properties/opensearch?/node?/ssl? value: *node-tls-properties - type: replace - path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties?/opensearch?/http?/ssl? + path: /instance_groups/name=ingestor_cloudwatch_rds/jobs/name=opensearch/properties?/opensearch?/http?/ssl? value: *http-tls-properties diff --git a/opsfiles/enable-proxy-auth.yml b/opsfiles/enable-proxy-auth.yml index 30b037c..a5ea63d 100644 --- a/opsfiles/enable-proxy-auth.yml +++ b/opsfiles/enable-proxy-auth.yml @@ -33,9 +33,9 @@ - type: replace path: /instance_groups/name=ingestor/jobs/name=opensearch/properties?/opensearch?/enable_proxy_auth value: true -# ingestor_cloudwatch +# ingestor_cloudwatch_rds - type: replace - path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties?/opensearch?/enable_proxy_auth + path: /instance_groups/name=ingestor_cloudwatch_rds/jobs/name=opensearch/properties?/opensearch?/enable_proxy_auth value: true # add variable for auth proxy certs - type: replace From c8a12a714bca85a619d1324f83cfd691b90f29e0 Mon Sep 17 00:00:00 2001 From: Mark Boyd Date: Mon, 9 Dec 2024 15:12:39 -0500 Subject: [PATCH 2/2] update var name --- opensearch-jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensearch-jobs.yml b/opensearch-jobs.yml index 80c1191..2ededae 100644 --- a/opensearch-jobs.yml +++ b/opensearch-jobs.yml @@ -403,7 +403,7 @@ instance_groups: logstash_ingestor: cloudwatch: region: ((region)) - prefix: ((cloudwatch_prefix)) + prefix: ((rds_cloudwatch_prefix)) syslog_tls: port: 6972 ssl_cert: ((ingestor_syslog_server_tls.certificate))