[couchbase] Update Integration Package with SSL Configurations (#4526)

* Update SSL configuration * Update changelog entry * Change to bugfix from enhancement
elastic · Nov 16, 2022 · 4e248fc · 4e248fc
1 parent 0aa29ac
commit 4e248fc
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 12 deletions.
diff --git a/packages/couchbase/changelog.yml b/packages/couchbase/changelog.yml
@@ -1,3 +1,8 @@
+- version: "0.12.1"
+  changes:
+    - description: Update SSL configurations for couchbase integration.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4526
 - version: "0.12.0"
   changes:
     - description: Added infrastructure category.

diff --git a/packages/couchbase/data_stream/bucket/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/bucket/agent/stream/stream.yml.hbs
@@ -5,7 +5,8 @@ hosts:
   - "{{this}}/pools/default/buckets"
 {{/each}}
 {{#if ssl_couchbase}}
-{{ssl_couchbase}}
+ssl:
+  {{ssl_couchbase}}
 {{/if}}
 period: {{period}}
 json.is_array: true

diff --git a/packages/couchbase/data_stream/cache/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/cache/agent/stream/stream.yml.hbs
@@ -8,7 +8,8 @@ metrics_path: /metrics
 metrics_filters:
   include: ["sgw_cache*"]
 {{#if ssl_sync_gateway}}
-{{ssl_sync_gateway}}
+ssl:
+  {{ssl_sync_gateway}}
 {{/if}}
 tags:
 {{#each tags as |tag|}}

diff --git a/packages/couchbase/data_stream/cbl_replication/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/cbl_replication/agent/stream/stream.yml.hbs
@@ -8,7 +8,8 @@ metrics_path: /metrics
 metrics_filters:
   include: ["sgw_replication*"]
 {{#if ssl_sync_gateway}}
-{{ssl_sync_gateway}}
+ssl:
+  {{ssl_sync_gateway}}
 {{/if}}
 tags:
 {{#each tags as |tag|}}

diff --git a/packages/couchbase/data_stream/cluster/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/cluster/agent/stream/stream.yml.hbs
@@ -5,7 +5,8 @@ hosts:
   - "{{this}}/pools/default"
 {{/each}}
 {{#if ssl_couchbase}}
-{{ssl_couchbase}}
+ssl:
+  {{ssl_couchbase}}
 {{/if}}
 period: {{period}}
 json.is_array: false

diff --git a/packages/couchbase/data_stream/database_stats/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/database_stats/agent/stream/stream.yml.hbs
@@ -8,7 +8,8 @@ metrics_path: /metrics
 metrics_filters:
   include: ["sgw_database*"]
 {{#if ssl_sync_gateway}}
-{{ssl_sync_gateway}}
+ssl:
+  {{ssl_sync_gateway}}
 {{/if}}
 tags:
 {{#each tags as |tag|}}

diff --git a/packages/couchbase/data_stream/miscellaneous/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/miscellaneous/agent/stream/stream.yml.hbs
@@ -8,7 +8,8 @@ metrics_path: /metrics
 metrics_filters:
   include: ["sgw_shared_bucket_import*", "sgw_security*", "sgw_gsi_views*", "sgw_delta_sync*"]
 {{#if ssl_sync_gateway}}
-{{ssl_sync_gateway}}
+ssl:
+  {{ssl_sync_gateway}}
 {{/if}}
 tags:
 {{#each tags as |tag|}}

diff --git a/packages/couchbase/data_stream/node/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/node/agent/stream/stream.yml.hbs
@@ -18,5 +18,6 @@ tags:
 publisher_pipeline.disable_host: true
 {{/contains}}
 {{#if processors}}
+processors:
 {{processors}}
 {{/if}}
diff --git a/packages/couchbase/data_stream/query_index/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/query_index/agent/stream/stream.yml.hbs
@@ -7,7 +7,8 @@ hosts:
   - "{{this}}/pools/default/buckets/@query/stats"
 {{/each}}
 {{#if ssl_couchbase}}
-{{ssl_couchbase}}
+ssl:
+  {{ssl_couchbase}}
 {{/if}}
 period: {{period}}
 tags:

diff --git a/packages/couchbase/data_stream/resource/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/resource/agent/stream/stream.yml.hbs
@@ -8,7 +8,8 @@ metrics_path: /metrics
 metrics_filters:
   include: ["sgw_resource_utilization*","go_memstats_last_gc_time_seconds"]
 {{#if ssl_sync_gateway}}
-{{ssl_sync_gateway}}
+ssl:
+  {{ssl_sync_gateway}}
 {{/if}}
 tags:
 {{#each tags as |tag|}}

diff --git a/packages/couchbase/data_stream/xdcr/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/xdcr/agent/stream/stream.yml.hbs
@@ -7,7 +7,8 @@ hosts:
   {{/each}}
 {{/each}}
 {{#if ssl_couchbase}}
-{{ssl_couchbase}}
+ssl:
+  {{ssl_couchbase}}
 {{/if}}
 period: {{period}}
 tags:

diff --git a/packages/couchbase/manifest.yml b/packages/couchbase/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: couchbase
 title: Couchbase
-version: 0.12.0
+version: 0.12.1
 license: basic
 description: Collect metrics from Couchbase databases with Elastic Agent.
 type: integration
@@ -47,7 +47,7 @@ vars:
     type: yaml
     title: SSL Configuration for Couchbase hosts
     default: |
-      # ssl.certificate_authorities:
+      # certificate_authorities:
       # - |
       #   -----BEGIN CERTIFICATE-----
       #   MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT
@@ -90,7 +90,7 @@ vars:
     type: yaml
     title: SSL Configuration for Sync Gateway prometheus exporter hosts
     default: |
-      # ssl.certificate_authorities:
+      # certificate_authorities:
       # - |
       #   -----BEGIN CERTIFICATE-----
       #   MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT