Cloudwatch upgrades

config/blobs.yml

@@ -210,10 +210,10 @@ logstash/logstash-filter-translate-3.4.2.zip:
   size: 649362
   object_id: e9b87119-265c-43ce-788d-5592aabffcb3
   sha: sha256:f465635431b474abaf61c6673d7c91cb5f62b09a193d45a5622342f5a5b967c6
-logstash/logstash-input-cloudwatch_logs-1.0.5.zip:
-  size: 2153640
-  object_id: e9c13261-22d0-4cfb-6aa7-43e7414f898e
-  sha: sha256:de74e619fcb2a4d46126dd0981023bf5810ca7625580a433628abfaa68a91046
+logstash/logstash-input-cloudwatch_logs-1.1.1.zip:
+  size: 2153736
+  object_id: f2ba9082-05ed-489f-7416-66fa2c0e9ad2
+  sha: sha256:bfb9a285d11f716aada2a5753eb6751edce1f12d750fa0b89bcbd835cb231777
 logstash/logstash-input-relp-3.0.4.zip:
   size: 44725
   object_id: 2e183484-97da-4e51-4311-51e024d0665b

jobs/ingestor_cloudwatch/spec

@@ -20,27 +20,13 @@ templates:
   config/ingestor-pem.erb: config/ssl/ingestor.pem
   config/ca.erb: config/ssl/opensearch.ca
 
-provides:
-- name: ingestor-cloudwatch
-  type: ingestor-cloudwatch
-  properties:
-  - logstash_ingestor.cloudwatch.port
-  - logstash_ingestor.cloudwatch.transport
-  - logstash_ingestor.cloudwatch_tls.port
-  - logstash_ingestor.relp.port
-- name: cloudwatch_forwarder
-  type: cloudwatch_forwarder
-  properties:
-  - logstash_ingestor.cloudwatch.port
+
 consumes:
 - name: opensearch
   type: opensearch
   optional: true
 
 properties:
-  logstash.ssl_client_authentication:
-    description: Controls the servers behavior in regard to requesting a certificate from client connections
-    default: required
   logstash.heap_size:
     description: sets jvm heap sized
   logstash.heap_percentage:
@@ -49,9 +35,6 @@ properties:
   logstash.jvm_options:
     description: additional jvm options
     default: []
-  logstash.metadata_level:
-    description: "Whether to include additional metadata throughout the event lifecycle. NONE = disabled, DEBUG = fully enabled"
-    default: "NONE"
   logstash.log_level:
     description: The default logging level (e.g. WARN, DEBUG, INFO)
     default: info
@@ -91,39 +74,6 @@ properties:
     description: The interval in milliseconds when a checkpoint is forced on the head page.
     default: 1000
 
-  logstash_ingestor.filters:
-    description: Filters to execute on the ingestors
-    default: ""
-
-  logstash_ingestor.cloudwatch.port:
-    description: Port to listen for cloudwatch messages
-  logstash_ingestor.cloudwatch.transport:
-    description: Transport protocol to use
-    default: "tcp"
-  logstash_ingestor.cloudwatch.use_keepalive:
-    description: Instruct the socket to use TCP keep alives
-
-  logstash_ingestor.health.disable_post_start:
-    description: Skip post-start health checks?
-    default: false
-  logstash_ingestor.health.interval:
-    description: Logstash cloudwatch health check interval (seconds)
-    default: 5
-  logstash_ingestor.health.timeout:
-    description: Logstash cloudwatch health check number of attempts (seconds)
-    default: 300
-
-  logstash_ingestor.cloudwatch_tls.port:
-    description: Port to listen for cloudwatch-TLS messages (omit to disable)
-  logstash_ingestor.cloudwatch_tls.ssl_cert:
-    description: cloudwatch-TLS SSL certificate (file contents, not a path) - required if logstash_ingestor.cloudwatch_tls.port set
-  logstash_ingestor.cloudwatch_tls.ssl_key:
-    description: cloudwatch-TLS SSL key (file contents, not a path) - required if logstash_ingestor.cloudwatch_tls.port set
-  logstash_ingestor.cloudwatch_tls.skip_ssl_validation:
-    description: Verify the identity of the other end of the SSL connection against the CA.
-    default: false
-  logstash_ingestor.cloudwatch_tls.use_keepalive:
-    description: Instruct the socket to use TCP keep alives
   logstash_ingestor.cloudwatch.prefix:
     description: "What prefix in cloudwatch you want to pull in"
     default: ["/aws/rds/instance/"]

packages/logstash/packaging

@@ -17,4 +17,4 @@ logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-input-syslo
 logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-input-tcp-6.4.1.zip"
 logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-output-syslog-3.0.5.zip"
 logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-output-opensearch-2.0.2.zip"
-logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-input-cloudwatch_logs-1.0.5.zip"
+logstash-plugin install --no-verify "file://${PWD}/logstash/logstash-input-cloudwatch_logs-1.1.1.zip"

packages/logstash/spec

@@ -13,5 +13,5 @@ files:
   - logstash/logstash-input-tcp-6.4.1.zip
   - logstash/logstash-output-syslog-3.0.5.zip
   - logstash/logstash-output-opensearch-2.0.2.zip
-  - logstash/logstash-input-cloudwatch_logs-1.0.5.zip
+  - logstash/logstash-input-cloudwatch_logs-1.1.1.zip