turning off until replicas is done

opensearch-development.yml

@@ -24,6 +24,9 @@ instance_groups:
   instances: 1
   vm_type: m6i.large
 
+- name: ingestor_cloudwatch
+  instances: 1
+
 - name: maintenance
   vm_type: t3.large
   instances: 1

opensearch-jobs.yml

@@ -334,23 +334,25 @@ instance_groups:
         http_host: 127.0.0.1
         jvm_options:
         - -Dlog4j2.formatMsgNoLookups=true
-  - consumes: *consumes-opensearch-manager
-    name: ingestor_cloudwatch
+  - name: ingestor_syslog
+    consumes: *consumes-opensearch-manager
     properties:
       logstash:
         jvm_options:
         - -Dlog4j2.formatMsgNoLookups=true
         queue:
           max_bytes: 30gb
       logstash_ingestor:
-        cloudwatch:
-          region: ((region))
-          prefix: ((cloudwatch_prefix))
         syslog_tls:
           port: 6972
           ssl_cert: ((ingestor_syslog_server_tls.certificate))
           ssl_key: ((ingestor_syslog_server_tls.private_key))
       logstash_parser:
+        deployment_dictionary:
+        - /var/vcap/packages/base-logstash-filters/deployment_lookup.yml
+        - /var/vcap/jobs/deployment_lookup_config/config/deployment_lookup.yml
+        filters:
+        - logs-for-cf: /var/vcap/packages/cf-logstash-filters/logstash-filters-default.conf
         opensearch:
           data_hosts:
           - localhost
@@ -362,27 +364,51 @@ instance_groups:
             private_key: ((logstash.private_key))
     provides:
       ingestor:
-        as: ingestor_cloudwtch
+        as: ingestor_link
+    release: opensearch
+  - name: deployment_lookup_config
+    release: opensearch
+  persistent_disk_type: logs_opensearch_ingestor
+  stemcell: default
+  azs: [z1]
+  vm_type: t3.medium
+  vm_extensions:
+  - logs-opensearch-ingestor-profile
+  - 15GB_ephemeral_disk
+  networks:
+  - name: services
+
+- name: ingestor_cloudwatch
+  instances: 1
+  jobs:
+  - name: bpm
+    release: bpm
+  - name: opensearch
     release: opensearch
-  - name: ingestor_syslog
     consumes: *consumes-opensearch-manager
+    properties:
+      opensearch:
+        heap_size: 1G
+        http_host: 127.0.0.1
+        jvm_options:
+        - -Dlog4j2.formatMsgNoLookups=true
+  - consumes: *consumes-opensearch-manager
+    name: ingestor_cloudwatch
     properties:
       logstash:
         jvm_options:
         - -Dlog4j2.formatMsgNoLookups=true
         queue:
           max_bytes: 30gb
       logstash_ingestor:
+        cloudwatch:
+          region: ((region))
+          prefix: ((cloudwatch_prefix))
         syslog_tls:
           port: 6972
           ssl_cert: ((ingestor_syslog_server_tls.certificate))
           ssl_key: ((ingestor_syslog_server_tls.private_key))
       logstash_parser:
-        deployment_dictionary:
-        - /var/vcap/packages/base-logstash-filters/deployment_lookup.yml
-        - /var/vcap/jobs/deployment_lookup_config/config/deployment_lookup.yml
-        filters:
-        - logs-for-cf: /var/vcap/packages/cf-logstash-filters/logstash-filters-default.conf
         opensearch:
           data_hosts:
           - localhost
@@ -394,14 +420,14 @@ instance_groups:
             private_key: ((logstash.private_key))
     provides:
       ingestor:
-        as: ingestor_link
+        as: ingestor_cloudwtch
     release: opensearch
   - name: deployment_lookup_config
     release: opensearch
   persistent_disk_type: logs_opensearch_ingestor
   stemcell: default
   azs: [z1]
-  vm_type: t3.medium
+  vm_type: m6i.large
   vm_extensions:
   - logs-opensearch-ingestor-profile
   - 15GB_ephemeral_disk

opensearch-production.yml

@@ -27,6 +27,9 @@ instance_groups:
   instances: 7
   vm_type: r6i.xlarge.logsearch.ingestor
 
+- name: ingestor_cloudwatch
+  instances: 1
+
 - name: maintenance
   vm_type: t3.large
   instances: 1

opensearch-staging.yml

@@ -27,6 +27,9 @@ instance_groups:
   instances: 1
   vm_type: m6i.large
 
+- name: ingestor_cloudwatch
+  instances: 1
+
 - name: maintenance
   vm_type: t3.large
   instances: 1

opsfiles/enable-node-tls.yml

@@ -123,6 +123,24 @@
   path: /instance_groups/name=ingestor/jobs/name=opensearch/properties?/opensearch?/http?/ssl?
   value: *http-tls-properties
 
+# ingestor_cloudwatch
+- type: replace
+  path: /instance_groups/name=ingestor_cloudwatch/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?
+  value: *admin-tls-properties
+
+- type: replace
+  path: /instance_groups/name=ingestor_cloudwatch/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?
+  value: *http-tls-properties
+
+
 # smoke_tests
 # - type: replace
 #   path: /instance_groups/name=maintenance/jobs/name=smoke_tests/properties?/smoke_tests?/opensearch?/ssl?

opsfiles/enable-proxy-auth.yml

@@ -33,7 +33,10 @@
 - type: replace
   path: /instance_groups/name=ingestor/jobs/name=opensearch/properties?/opensearch?/enable_proxy_auth
   value: true
-
+# ingestor_cloudwatch
+- type: replace
+  path: /instance_groups/name=ingestor_cloudwatch/jobs/name=opensearch/properties?/opensearch?/enable_proxy_auth
+  value: true
 # add variable for auth proxy certs
 - type: replace
   path: /variables/name=auth_proxy?