Skip to content

Commit d95e932

Browse files
committed
Logstash with filebeat
1 parent f1aac12 commit d95e932

File tree

2 files changed

+23
-32
lines changed

2 files changed

+23
-32
lines changed

terraform/modules/k8s-addons/eks-logstash.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ resource "helm_release" "logstash" {
2020
version = local.logstash.chart_version
2121

2222
namespace = "elk"
23-
timeout = "900"
23+
timeout = "180"
2424
max_history = var.helm_release_history_size
2525

2626
values = compact(

terraform/modules/k8s-addons/elk-templates/logstash-values.yaml

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ logstashConfig:
2323
logstashPipeline:
2424
logstash.conf: |
2525
input {
26-
tcp {
27-
port => 5400
28-
codec => json
29-
}
3026
beats {
3127
port => 5044
3228
}
@@ -38,11 +34,7 @@ logstashPipeline:
3834
user => '$${ELASTICSEARCH_USERNAME}'
3935
password => '$${ELASTICSEARCH_PASSWORD}'
4036
index => "filebeat-%%{+yyyy.MM.dd}-000001"
41-
manage_template => true
42-
template => '/etc/elk/logstash-index-template.json'
43-
template_name => 'filebeat'
44-
template_overwrite => true
45-
action => "create"
37+
manage_template => false
4638
ssl => true
4739
ssl_certificate_verification => false
4840
cacert => '/etc/logstash/certificates/ca.crt'
@@ -52,28 +44,27 @@ logstashPipeline:
5244
5345
# https://www.elastic.co/guide/en/logstash/current/plugins-outputs-elasticsearch.html
5446

55-
secrets:
56-
- name: "index-template"
57-
value:
58-
logstash-index-template.json: |
59-
{
60-
"index_patterns": ["filebeat-*"],
61-
"data_stream": {},
62-
"template": {
63-
"settings": {
64-
"index.refresh_interval": "5s",
65-
"index.mapping.total_fields.limit": 5000,
66-
"index.lifecycle.name": "filebeat-policy",
67-
"number_of_shards": 1,
68-
"number_of_replicas": 1
69-
}
70-
}
71-
}
72-
73-
secretMounts:
74-
- name: logstash-index-template
75-
secretName: logstash-logstash-index-template
76-
path: /etc/elk
47+
#secrets:
48+
# - name: "index-template"
49+
# value:
50+
# logstash-index-template.json: |
51+
# {
52+
# "index_patterns": ["filebeat-*"],
53+
# "template": {
54+
# "settings": {
55+
# "index.refresh_interval": "5s",
56+
# "index.mapping.total_fields.limit": 5000,
57+
# "index.lifecycle.name": "filebeat-policy",
58+
# "number_of_shards": 1,
59+
# "number_of_replicas": 1
60+
# }
61+
# }
62+
# }
63+
#
64+
#secretMounts:
65+
# - name: logstash-index-template
66+
# secretName: logstash-logstash-index-template
67+
# path: /etc/elk
7768

7869
extraPorts:
7970
- name: beats

0 commit comments

Comments
 (0)