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

[8.x](backport #6500) Update kubernetes templates for elastic-agent [templates.d] #6514

Merged
merged 1 commit into from
Jan 10, 2025
+987 −951
Merged

[8.x](backport #6500) Update kubernetes templates for elastic-agent [templates.d] #6514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 50 additions & 50 deletions deploy/kubernetes/elastic-agent-standalone/templates.d/activemq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,66 @@
inputs:
- name: activemq/metrics-activemq
id: activemq/metrics-activemq-${kubernetes.hints.container_id}
type: activemq/metrics
use_output: default
streams:
- condition: ${kubernetes.hints.activemq.broker.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.broker
type: metrics
hosts:
- ${kubernetes.hints.activemq.broker.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- broker
password: ${kubernetes.hints.activemq.broker.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.broker.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-broker
username: ${kubernetes.hints.activemq.broker.username|kubernetes.hints.activemq.username|'admin'}
- condition: ${kubernetes.hints.activemq.queue.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.queue
type: metrics
hosts:
- ${kubernetes.hints.activemq.queue.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- queue
password: ${kubernetes.hints.activemq.queue.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.queue.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-queue
username: ${kubernetes.hints.activemq.queue.username|kubernetes.hints.activemq.username|'admin'}
- condition: ${kubernetes.hints.activemq.topic.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.topic
type: metrics
hosts:
- ${kubernetes.hints.activemq.topic.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- topic
password: ${kubernetes.hints.activemq.topic.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.topic.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-topic
username: ${kubernetes.hints.activemq.topic.username|kubernetes.hints.activemq.username|'admin'}
data_stream.namespace: default
- name: filestream-activemq
id: filestream-activemq-${kubernetes.hints.container_id}
type: filestream
use_output: default
streams:
- condition: ${kubernetes.hints.activemq.audit.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
id: filestream-activemq-audit-${kubernetes.hints.container_id}
data_stream:
dataset: activemq.audit
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-activemq-activemq-audit-${kubernetes.hints.container_id}
parsers:
- container:
format: auto
Expand All @@ -28,14 +76,14 @@ inputs:
- forwarded
- activemq-audit
- condition: ${kubernetes.hints.activemq.log.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
id: filestream-activemq-log-${kubernetes.hints.container_id}
data_stream:
dataset: activemq.log
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-activemq-activemq-log-${kubernetes.hints.container_id}
multiline:
match: after
negate: true
Expand All @@ -55,51 +103,3 @@ inputs:
- forwarded
- activemq-log
data_stream.namespace: default
- name: activemq/metrics-activemq
id: activemq/metrics-activemq-${kubernetes.hints.container_id}
type: activemq/metrics
use_output: default
streams:
- condition: ${kubernetes.hints.activemq.broker.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.broker
type: metrics
hosts:
- ${kubernetes.hints.activemq.broker.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- broker
password: ${kubernetes.hints.activemq.broker.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.broker.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-broker
username: ${kubernetes.hints.activemq.broker.username|kubernetes.hints.activemq.username|'admin'}
- condition: ${kubernetes.hints.activemq.queue.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.queue
type: metrics
hosts:
- ${kubernetes.hints.activemq.queue.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- queue
password: ${kubernetes.hints.activemq.queue.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.queue.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-queue
username: ${kubernetes.hints.activemq.queue.username|kubernetes.hints.activemq.username|'admin'}
- condition: ${kubernetes.hints.activemq.topic.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
data_stream:
dataset: activemq.topic
type: metrics
hosts:
- ${kubernetes.hints.activemq.topic.host|kubernetes.hints.activemq.host|'localhost:8161'}
metricsets:
- topic
password: ${kubernetes.hints.activemq.topic.password|kubernetes.hints.activemq.password|'admin'}
path: /api/jolokia/?ignoreErrors=true&canonicalNaming=false
period: ${kubernetes.hints.activemq.topic.period|kubernetes.hints.activemq.period|'10s'}
tags:
- activemq-topic
username: ${kubernetes.hints.activemq.topic.username|kubernetes.hints.activemq.username|'admin'}
data_stream.namespace: default
136 changes: 68 additions & 68 deletions deploy/kubernetes/elastic-agent-standalone/templates.d/apache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,72 @@
inputs:
- name: apache/metrics-apache
id: apache/metrics-apache-${kubernetes.hints.container_id}
type: apache/metrics
use_output: default
streams:
- condition: ${kubernetes.hints.apache.status.enabled} == true or ${kubernetes.hints.apache.enabled} == true
data_stream:
dataset: apache.status
type: metrics
hosts:
- ${kubernetes.hints.apache.status.host|kubernetes.hints.apache.host|'http://127.0.0.1'}
metricsets:
- status
period: ${kubernetes.hints.apache.status.period|kubernetes.hints.apache.period|'30s'}
server_status_path: /server-status
data_stream.namespace: default
- name: filestream-apache
id: filestream-apache-${kubernetes.hints.container_id}
type: filestream
use_output: default
streams:
- condition: ${kubernetes.hints.apache.access.enabled} == true or ${kubernetes.hints.apache.enabled} == true
data_stream:
dataset: apache.access
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-apache-apache-access-${kubernetes.hints.container_id}
parsers:
- container:
format: auto
stream: ${kubernetes.hints.apache.access.stream|'all'}
paths:
- /var/log/containers/*${kubernetes.hints.container_id}.log
prospector:
scanner:
fingerprint:
enabled: true
symlinks: true
tags:
- apache-access
- condition: ${kubernetes.hints.apache.error.enabled} == true or ${kubernetes.hints.apache.enabled} == true
data_stream:
dataset: apache.error
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-apache-apache-error-${kubernetes.hints.container_id}
parsers:
- container:
format: auto
stream: ${kubernetes.hints.apache.error.stream|'all'}
paths:
- /var/log/containers/*${kubernetes.hints.container_id}.log
processors:
- add_locale: null
prospector:
scanner:
fingerprint:
enabled: true
symlinks: true
tags:
- apache-error
data_stream.namespace: default
- name: httpjson-apache
id: httpjson-apache-${kubernetes.hints.container_id}
type: httpjson
Expand Down Expand Up @@ -81,71 +149,3 @@ inputs:
- forwarded
- apache-error
data_stream.namespace: default
- name: apache/metrics-apache
id: apache/metrics-apache-${kubernetes.hints.container_id}
type: apache/metrics
use_output: default
streams:
- condition: ${kubernetes.hints.apache.status.enabled} == true or ${kubernetes.hints.apache.enabled} == true
data_stream:
dataset: apache.status
type: metrics
hosts:
- ${kubernetes.hints.apache.status.host|kubernetes.hints.apache.host|'http://127.0.0.1'}
metricsets:
- status
period: ${kubernetes.hints.apache.status.period|kubernetes.hints.apache.period|'30s'}
server_status_path: /server-status
data_stream.namespace: default
- name: filestream-apache
id: filestream-apache-${kubernetes.hints.container_id}
type: filestream
use_output: default
streams:
- condition: ${kubernetes.hints.apache.access.enabled} == true or ${kubernetes.hints.apache.enabled} == true
id: filestream-apache-access-${kubernetes.hints.container_id}
data_stream:
dataset: apache.access
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
parsers:
- container:
format: auto
stream: ${kubernetes.hints.apache.access.stream|'all'}
paths:
- /var/log/containers/*${kubernetes.hints.container_id}.log
prospector:
scanner:
fingerprint:
enabled: true
symlinks: true
tags:
- apache-access
- condition: ${kubernetes.hints.apache.error.enabled} == true or ${kubernetes.hints.apache.enabled} == true
id: filestream-apache-error-${kubernetes.hints.container_id}
data_stream:
dataset: apache.error
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
parsers:
- container:
format: auto
stream: ${kubernetes.hints.apache.error.stream|'all'}
paths:
- /var/log/containers/*${kubernetes.hints.container_id}.log
processors:
- add_locale: null
prospector:
scanner:
fingerprint:
enabled: true
symlinks: true
tags:
- apache-error
data_stream.namespace: default
2 changes: 1 addition & 1 deletion deploy/kubernetes/elastic-agent-standalone/templates.d/cassandra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ inputs:
use_output: default
streams:
- condition: ${kubernetes.hints.cassandra.log.enabled} == true or ${kubernetes.hints.cassandra.enabled} == true
id: filestream-cassandra-log-${kubernetes.hints.container_id}
data_stream:
dataset: cassandra.log
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-cassandra-cassandra-log-${kubernetes.hints.container_id}
multiline:
match: after
negate: true
Expand Down
44 changes: 22 additions & 22 deletions deploy/kubernetes/elastic-agent-standalone/templates.d/cef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,18 @@
inputs:
- name: tcp-cef
id: tcp-cef-${kubernetes.hints.container_id}
type: tcp
use_output: default
streams:
- condition: ${kubernetes.hints.cef.log.enabled} == true or ${kubernetes.hints.cef.enabled} == true
data_stream:
dataset: cef.log
type: logs
host: localhost:9004
processors:
- rename:
fields:
- from: message
to: event.original
- decode_cef:
field: event.original
tags:
- cef
- forwarded
data_stream.namespace: default
- name: filestream-cef
id: filestream-cef-${kubernetes.hints.container_id}
type: filestream
use_output: default
streams:
- condition: ${kubernetes.hints.cef.log.enabled} == true or ${kubernetes.hints.cef.enabled} == true
id: filestream-cef-log-${kubernetes.hints.container_id}
data_stream:
dataset: cef.log
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-cef-cef-log-${kubernetes.hints.container_id}
parsers:
- container:
format: auto
Expand All @@ -56,6 +35,27 @@ inputs:
- cef
- forwarded
data_stream.namespace: default
- name: tcp-cef
id: tcp-cef-${kubernetes.hints.container_id}
type: tcp
use_output: default
streams:
- condition: ${kubernetes.hints.cef.log.enabled} == true or ${kubernetes.hints.cef.enabled} == true
data_stream:
dataset: cef.log
type: logs
host: localhost:9004
processors:
- rename:
fields:
- from: message
to: event.original
- decode_cef:
field: event.original
tags:
- cef
- forwarded
data_stream.namespace: default
- name: udp-cef
id: udp-cef-${kubernetes.hints.container_id}
type: udp
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/elastic-agent-standalone/templates.d/checkpoint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ inputs:
use_output: default
streams:
- condition: ${kubernetes.hints.checkpoint.firewall.enabled} == true or ${kubernetes.hints.checkpoint.enabled} == true
id: filestream-checkpoint-firewall-${kubernetes.hints.container_id}
data_stream:
dataset: checkpoint.firewall
type: logs
exclude_files:
- .gz$
file_identity:
fingerprint: null
id: filestream-checkpoint-checkpoint-firewall-${kubernetes.hints.container_id}
parsers:
- container:
format: auto
Expand Down
Loading
Loading