Skip to content
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

Jump to bottom

[Kubernetes] Update namespace filter on data streams #10213

Merged
merged 14 commits into from
Jul 16, 2024
Merged

[Kubernetes] Update namespace filter on data streams #10213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
27d1a53
Update namespace filter
constanca-m Jun 21, 2024
95efd07
Update changelog.
constanca-m Jun 21, 2024
5e5cac0
Update packages/kubernetes/changelog.yml
constanca-m Jun 26, 2024
7f955e8
Add namespace to yml.hbs
constanca-m Jul 2, 2024
d1999d5
Merge branch 'main' into namespace-filter
constanca-m Jul 2, 2024
62c577e
Add namespace to group
constanca-m Jul 2, 2024
cebd37a
Update kibana version
constanca-m Jul 2, 2024
ea8a48e
Merge branch 'main' into namespace-filter
constanca-m Jul 8, 2024
8f52dc9
move namespace to events group
constanca-m Jul 9, 2024
9614a50
Merge branch 'main' into namespace-filter
constanca-m Jul 15, 2024
91c635a
revert change
constanca-m Jul 15, 2024
63e6bee
Merge remote-tracking branch 'origin/namespace-filter' into namespace…
constanca-m Jul 15, 2024
dde85a9
update changelog.yml
constanca-m Jul 15, 2024
5d56ae1
Update packages/kubernetes/changelog.yml
constanca-m Jul 16, 2024
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/kubernetes/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: 1.64.0
changes:
- description: Move namespace filter to the group level configuration
type: enhancement
link: https://github.com/elastic/integrations/pull/10213
- version: 1.63.1
changes:
- description: Fix typo in kubernetes.audit ingest pipeline
Expand Down
3 changes: 3 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 @@ -18,6 +18,9 @@ ssl.certificate_authorities:
- {{this}}
{{/each}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}

{{#if processors}}
processors:
Expand Down
3 changes: 3 additions & 0 deletions packages/kubernetes/data_stream/event/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ condition: ${kubernetes_leaderelection.leader} == true
condition: {{ condition }}
{{/if}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}

{{#if processors}}
processors:
Expand Down
3 changes: 3 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 @@ -18,6 +18,9 @@ ssl.certificate_authorities:
- {{this}}
{{/each}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}

{{#if processors}}
processors:
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_namespace/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
3 changes: 0 additions & 3 deletions 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 @@ -19,9 +19,6 @@ condition: {{ condition }}
{{#if node}}
node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
3 changes: 0 additions & 3 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 @@ -19,9 +19,6 @@ condition: {{ condition }}
{{#if node}}
node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
Expand Down
6 changes: 0 additions & 6 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 @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
Copy link
Contributor

Choose a reason for hiding this comment

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

We needed here and not in the claim right?
See
https://github.com/elastic/beats/pull/39934/files#diff-1d7b17f1ef239e6177db5ee660f2234bfd69c82e93494d4e46ee97f8a8617cfdR285

type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_pod/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_replicaset/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
3 changes: 0 additions & 3 deletions packages/kubernetes/data_stream/state_resourcequota/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ condition: {{ condition }}
{{#if node}}
node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_resourcequota/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
MichaelKatsoulis marked this conversation as resolved.
Show resolved Hide resolved
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_service/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_statefulset/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
constanca-m marked this conversation as resolved.
Show resolved Hide resolved
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
3 changes: 0 additions & 3 deletions packages/kubernetes/data_stream/state_storageclass/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ condition: {{ condition }}
{{#if node}}
node: {{node}}
{{/if}}
{{#if namespace}}
namespace: {{namespace}}
{{/if}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
{{/if}}
Expand Down
6 changes: 0 additions & 6 deletions packages/kubernetes/data_stream/state_storageclass/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ streams:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace to watch resources from for metadata
multi: false
required: false
show_user: false
- name: bearer_token_file
type: text
title: Bearer Token File
Expand Down
24 changes: 23 additions & 1 deletion packages/kubernetes/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 3.1.2
name: kubernetes
title: Kubernetes
version: 1.63.1
version: 1.64.0
description: Collect logs and metrics from Kubernetes clusters with Elastic Agent.
type: integration
categories:
Expand Down Expand Up @@ -46,6 +46,13 @@ policy_templates:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace
description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
multi: false
required: false
show_user: false
icons:
- src: /img/logo_kubernetes.svg
title: Logo Kubernetes
Expand Down Expand Up @@ -88,6 +95,13 @@ policy_templates:
multi: false
required: false
show_user: false
- name: namespace
type: text
title: Namespace
description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
multi: false
required: false
show_user: false
icons:
- src: /img/logo_kubernetes.svg
title: Logo Kubernetes
Expand Down Expand Up @@ -188,6 +202,14 @@ policy_templates:
title: Collect Kubernetes events from Kubernetes API Server
description: Collecting events from Kubernetes API Server
input_group: metrics
vars:
- name: namespace
type: text
title: Namespace
description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
multi: false
required: false
show_user: false
icons:
- src: /img/logo_kubernetes.svg
title: Logo Kubernetes
Expand Down