Skip to content

Add ssl.certificate_authorities configuration #2613

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
merged 7 commits into from
Feb 2, 2022
Merged

Add ssl.certificate_authorities configuration #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dc565e
add ssl.certificate_authorities configuration
tetianakravchenko Jan 28, 2022
d33b16b
update changelog
tetianakravchenko Jan 28, 2022
f5bb008
set show_user to false for node and namespace fields
tetianakravchenko Jan 28, 2022
4fa740a
Merge branch 'main' into k8s-add-ssl-fields
tetianakravchenko Jan 28, 2022
43825ee
Merge branch 'k8s-add-ssl-fields' of github.com:tetianakravchenko/int…
tetianakravchenko Jan 28, 2022
b39cd81
fix typo
tetianakravchenko Jan 28, 2022
6f48fba
Merge branch 'main' into k8s-add-ssl-fields
tetianakravchenko Feb 2, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/kubernetes/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# newer versions go on top
- version: "1.15.0"
changes:
- description: Add ssl.certificate_authorities configuration
type: enhancement
link: https://github.com/elastic/integrations/pull/2613
- version: "1.14.3"
changes:
- description: Add missing job.name and cronjob.name fields to state_container datastream
type: bugfix
link: https://github.com/elastic/integrations/pull/2613
link: https://github.com/elastic/integrations/pull/2625
- version: "1.14.2"
changes:
- description: Add missing job.name and cronjob.name fields to container related datastreams
Expand Down
6 changes: 6 additions & 0 deletions packages/kubernetes/data_stream/container/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ period: {{period}}
bearer_token_file: {{bearer_token_file}}
ssl.verification_mode: {{ssl.verification_mode}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
6 changes: 6 additions & 0 deletions packages/kubernetes/data_stream/container/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,11 @@ streams:
# include_labels: ["nodelabel2"]
# include_annotations: ["nodeannotation1"]
# deployment: false
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Container metrics
description: Collect Kubernetes Container metrics
6 changes: 6 additions & 0 deletions packages/kubernetes/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 @@ -9,3 +9,9 @@ period: {{period}}
bearer_token_file: {{bearer_token_file}}
ssl.verification_mode: {{ssl.verification_mode}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
6 changes: 6 additions & 0 deletions packages/kubernetes/data_stream/node/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,11 @@ streams:
required: true
show_user: true
default: none
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Node metrics
description: Collect Kubernetes Node metrics
6 changes: 6 additions & 0 deletions packages/kubernetes/data_stream/pod/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ period: {{period}}
bearer_token_file: {{bearer_token_file}}
ssl.verification_mode: {{ssl.verification_mode}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
6 changes: 6 additions & 0 deletions packages/kubernetes/data_stream/pod/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ streams:
required: true
show_user: true
default: none
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
- name: add_resource_metadata_config
type: yaml
title: Add node and namespace metadata
Expand Down
9 changes: 9 additions & 0 deletions packages/kubernetes/data_stream/state_container/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,12 @@ node: {{node}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_container/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,26 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
Copy link
Contributor Author

@tetianakravchenko tetianakravchenko Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not set here a default value, though it is mostly standard - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt (for kubernetes.state_* datasets) just to avoid getting ssl.certificate_authorities setting in final config.
@ChrsMark @MichaelKatsoulis is there any better way to handle it?
Copy link
Member

@ChrsMark ChrsMark Jan 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think leaving it blank is just fine since you have the ifs in the handlebars file (stream.yml.hbs ).
Copy link
Contributor

@MichaelKatsoulis MichaelKatsoulis Jan 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1
- name: add_resource_metadata_config
type: yaml
title: Add node and namespace metadata
Expand Down
9 changes: 9 additions & 0 deletions packages/kubernetes/data_stream/state_cronjob/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ node: {{node}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_cronjob/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,25 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Cronjob metrics
description: Collect Kubernetes Cronjob metrics from kube_state_metrics
9 changes: 9 additions & 0 deletions packages/kubernetes/data_stream/state_daemonset/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ node: {{node}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
18 changes: 16 additions & 2 deletions packages/kubernetes/data_stream/state_daemonset/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,26 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
default: # /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
title: Kubernetes Deamonset metrics
description: Collect Kubernetes Deamonset metrics from kube_state_metrics
11 changes: 10 additions & 1 deletion packages/kubernetes/data_stream/state_deployment/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,13 @@ node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_deployment/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,25 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Deployment metrics
description: Collect Kubernetes Deployment metrics from kube_state_metrics
11 changes: 10 additions & 1 deletion packages/kubernetes/data_stream/state_job/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,13 @@ node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_job/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,25 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Job metrics
description: Collect Kubernetes Job metrics from kube_state_metrics
11 changes: 10 additions & 1 deletion packages/kubernetes/data_stream/state_node/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,13 @@ node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_node/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,25 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes Node metrics
description: Collect Kubernetes Node metrics from kube_state_metrics
9 changes: 9 additions & 0 deletions packages/kubernetes/data_stream/state_persistentvolume/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ node: {{node}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
17 changes: 15 additions & 2 deletions packages/kubernetes/data_stream/state_persistentvolume/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,25 @@ streams:
title: Node to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: true
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
multi: false
required: false
show_user: false
default: /var/run/secrets/kubernetes.io/serviceaccount/token
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
multi: true
required: false
show_user: false
title: Kubernetes PersistentVolume metrics
description: Collect Kubernetes PersistentVolume metrics from kube_state_metrics
11 changes: 10 additions & 1 deletion packages/kubernetes/data_stream/state_persistentvolumeclaim/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,13 @@ node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
Loading