Skip to content

[couchbase] Update Integration Package with SSL Configurations #4526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kush-elastic merged 4 commits into from
Nov 16, 2022
Merged

[couchbase] Update Integration Package with SSL Configurations #4526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d30d55
Update SSL configuration
kush-elastic Nov 1, 2022
7523e41
Update changelog entry
kush-elastic Nov 1, 2022
de25b8e
Merge branch 'main' of https://github.com/kush-elastic/integrations i…
kush-elastic Nov 9, 2022
22f3834
Change to bugfix from enhancement
kush-elastic Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/couchbase/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/bucket/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/cache/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|}}
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/cbl_replication/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|}}
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/cluster/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ hosts:
- "{{this}}/pools/default"
{{/each}}
{{#if ssl_couchbase}}
{{ssl_couchbase}}
ssl:
{{ssl_couchbase}}
{{/if}}
period: {{period}}
json.is_array: false
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/database_stats/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|}}
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/miscellaneous/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|}}
Expand Down
1 change: 1 addition & 0 deletions packages/couchbase/data_stream/node/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ tags:
publisher_pipeline.disable_host: true
{{/contains}}
{{#if processors}}
processors:
{{processors}}
{{/if}}
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/query_index/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ hosts:
- "{{this}}/pools/default/buckets/@query/stats"
{{/each}}
{{#if ssl_couchbase}}
{{ssl_couchbase}}
ssl:
{{ssl_couchbase}}
{{/if}}
period: {{period}}
tags:
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/resource/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|}}
Expand Down
3 changes: 2 additions & 1 deletion packages/couchbase/data_stream/xdcr/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ hosts:
{{/each}}
{{/each}}
{{#if ssl_couchbase}}
{{ssl_couchbase}}
ssl:
{{ssl_couchbase}}
{{/if}}
period: {{period}}
tags:
Expand Down
6 changes: 3 additions & 3 deletions packages/couchbase/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -47,7 +47,7 @@ vars:
type: yaml
title: SSL Configuration for Couchbase hosts
default: |
# ssl.certificate_authorities:
# certificate_authorities:
# - |
# -----BEGIN CERTIFICATE-----
# MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT
Expand Down Expand Up @@ -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
Expand Down