From 1d30d55bf40f4dceaa4c42c85c3e091130691420 Mon Sep 17 00:00:00 2001 From: kush-elastic Date: Tue, 1 Nov 2022 10:45:57 +0530 Subject: [PATCH 1/3] Update SSL configuration --- packages/couchbase/changelog.yml | 5 +++++ .../data_stream/bucket/agent/stream/stream.yml.hbs | 3 ++- .../couchbase/data_stream/cache/agent/stream/stream.yml.hbs | 3 ++- .../data_stream/cbl_replication/agent/stream/stream.yml.hbs | 3 ++- .../data_stream/cluster/agent/stream/stream.yml.hbs | 3 ++- .../data_stream/database_stats/agent/stream/stream.yml.hbs | 3 ++- .../data_stream/miscellaneous/agent/stream/stream.yml.hbs | 3 ++- .../couchbase/data_stream/node/agent/stream/stream.yml.hbs | 1 + .../data_stream/query_index/agent/stream/stream.yml.hbs | 3 ++- .../data_stream/resource/agent/stream/stream.yml.hbs | 3 ++- .../couchbase/data_stream/xdcr/agent/stream/stream.yml.hbs | 3 ++- packages/couchbase/manifest.yml | 6 +++--- 12 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/couchbase/changelog.yml b/packages/couchbase/changelog.yml index 37717e372c3..868984d04a5 100644 --- a/packages/couchbase/changelog.yml +++ b/packages/couchbase/changelog.yml @@ -1,3 +1,8 @@ +- version: "0.11.1" + changes: + - description: Update SSL configurations for couchbase integration. + type: enhancement + link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link - version: "0.11.0" changes: - description: Couchbase integration package with dashboards. diff --git a/packages/couchbase/data_stream/bucket/agent/stream/stream.yml.hbs b/packages/couchbase/data_stream/bucket/agent/stream/stream.yml.hbs index e9828695fcd..7dc086929eb 100644 --- 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 index dbe3595def3..d59dff6ff52 100644 --- 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 index 582afa578d7..d73616df32b 100644 --- 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 index c07b7119e6c..a4fd6213209 100644 --- 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 index 5a4c88d1c1d..4e84aebf58c 100644 --- 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 index b869f57404e..f1142b82a2a 100644 --- 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 index 207c7ceac7b..48d70a82e6c 100644 --- 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 index c896385f349..1cabf63f2f6 100644 --- 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 index d28009b14e2..266753888d2 100644 --- 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 index 57bd6dd0928..2eba7f236ba 100644 --- 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 index f779dc83b02..392d14eb5ec 100644 --- 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.11.0 +version: 0.11.1 license: basic description: Collect metrics from Couchbase databases with Elastic Agent. type: integration @@ -46,7 +46,7 @@ vars: type: yaml title: SSL Configuration for Couchbase hosts default: | - # ssl.certificate_authorities: + # certificate_authorities: # - | # -----BEGIN CERTIFICATE----- # MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT @@ -89,7 +89,7 @@ vars: type: yaml title: SSL Configuration for Sync Gateway prometheus exporter hosts default: | - # ssl.certificate_authorities: + # certificate_authorities: # - | # -----BEGIN CERTIFICATE----- # MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT From 7523e41e12376da8832844140ac4a1106dbbe7d9 Mon Sep 17 00:00:00 2001 From: kush-elastic Date: Tue, 1 Nov 2022 11:57:06 +0530 Subject: [PATCH 2/3] Update changelog entry --- packages/couchbase/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/couchbase/changelog.yml b/packages/couchbase/changelog.yml index 868984d04a5..3a690ea666a 100644 --- a/packages/couchbase/changelog.yml +++ b/packages/couchbase/changelog.yml @@ -2,7 +2,7 @@ changes: - description: Update SSL configurations for couchbase integration. type: enhancement - link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link + link: https://github.com/elastic/integrations/pull/4526 - version: "0.11.0" changes: - description: Couchbase integration package with dashboards. From 22f3834ac71cbea7be20776facd5989566fd3f64 Mon Sep 17 00:00:00 2001 From: kush-elastic Date: Wed, 16 Nov 2022 15:20:10 +0530 Subject: [PATCH 3/3] Change to bugfix from enhancement --- packages/couchbase/changelog.yml | 4 ++-- packages/couchbase/manifest.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/couchbase/changelog.yml b/packages/couchbase/changelog.yml index c42eb64feaf..df7d574c9fd 100644 --- a/packages/couchbase/changelog.yml +++ b/packages/couchbase/changelog.yml @@ -1,7 +1,7 @@ -- version: "0.13.0" +- version: "0.12.1" changes: - description: Update SSL configurations for couchbase integration. - type: enhancement + type: bugfix link: https://github.com/elastic/integrations/pull/4526 - version: "0.12.0" changes: diff --git a/packages/couchbase/manifest.yml b/packages/couchbase/manifest.yml index ec198cec657..dfd511729de 100644 --- 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.13.0 +version: 0.12.1 license: basic description: Collect metrics from Couchbase databases with Elastic Agent. type: integration