Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[logstash] using https to connect to elasticsearch #1623

Merged
merged 40 commits into from
Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3219977
Adding support to Ingress networking.k8s.io/v1
framsouza Oct 11, 2021
ca298fd
Adjusting ES service name
framsouza Oct 11, 2021
1caaa02
Removing ingress typo & adjusting python test
framsouza Oct 11, 2021
4b2b7bf
Adjusting python tests to use the new ingress version
framsouza Oct 11, 2021
2611e28
fixing conflict
framsouza Oct 12, 2021
3843441
fixing conflict
framsouza Oct 12, 2021
1391790
Merge branch 'elastic-master'
framsouza Oct 12, 2021
af7de17
Adding support to kubernetes ingress v1 & ClassName
framsouza Oct 12, 2021
10ee16d
Adding reformatted files
framsouza Oct 12, 2021
6407ff9
Merge branch 'elastic:master' into master
framsouza Oct 12, 2021
aefb05e
fixing conflict
framsouza Oct 12, 2021
eb96b28
Adding ClassName & Pathtype on ingress settings
framsouza Oct 13, 2021
027448f
Merge branch 'elastic:master' into master
framsouza Oct 13, 2021
a6be99c
Performing syntax adjustments and removing comments
framsouza Oct 13, 2021
795095a
Merge branch 'elastic:main' into main
framsouza Oct 14, 2021
851231c
Merge branch 'elastic:main' into main
framsouza Nov 5, 2021
bdd089b
Merge branch 'elastic:main' into main
framsouza Dec 13, 2021
2ec90eb
Merge branch 'elastic:main' into main
framsouza Dec 16, 2021
5134bfa
Merge branch 'elastic:main' into main
framsouza Dec 21, 2021
3178450
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Dec 21, 2021
ab7da71
Merge branch 'elastic:main' into main
framsouza Jan 5, 2022
e91e90e
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Jan 5, 2022
e3754d0
Merge branch 'elastic:main' into main
framsouza Jan 6, 2022
15cfb6b
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Jan 6, 2022
06dcbbd
Merge branch 'elastic:main' into main
framsouza Jan 17, 2022
c6720a5
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Jan 17, 2022
bb75c11
Merge branch 'elastic:main' into main
framsouza Feb 8, 2022
2c82de1
Merge branch 'main' of github.com:framsouza/helm-charts into main
framsouza Feb 8, 2022
b129f1f
Merge branch 'elastic:main' into main
framsouza Feb 8, 2022
414d047
Merge branch 'main' of github.com:framsouza/helm-charts into main
framsouza Feb 8, 2022
4cf4a52
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Feb 24, 2022
77a2a90
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 15, 2022
6a9c7bd
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 17, 2022
24e7b12
adjusting logstash to connect to elasticsearch using https
framsouza Mar 17, 2022
0235efb
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 18, 2022
1af2b02
Merge branch 'main' into logstash-ssl-fix
framsouza Mar 18, 2022
1fc3556
Adjusting cert generation on es and adding proper logstash settings
framsouza Mar 18, 2022
2e3b0dc
adjusting values to connect into es
framsouza Mar 21, 2022
89ede84
Update logstash/values.yaml
jmlrt Mar 21, 2022
ff8e353
Update logstash/values.yaml
jmlrt Mar 21, 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
4 changes: 4 additions & 0 deletions logstash/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ spec:
env:
- name: LS_JAVA_OPTS
value: "{{ .Values.logstashJavaOpts }}"
- name: xpack.http.ssl.truststore.path
value: /usr/share/logstash/config/certs/tls.crt
- name: xpack.http.ssl.verification_mode
value: "certificate"
framsouza marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.extraEnvs }}
{{ toYaml .Values.extraEnvs | indent 10 }}
{{- end }}
Expand Down
31 changes: 28 additions & 3 deletions logstash/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,18 @@ logstashConfig: {}

# Allows you to add any pipeline files in /usr/share/logstash/pipeline/
### ***warn*** there is a hardcoded logstash.conf in the image, override it first
logstashPipeline: {}
logstashPipeline:
logstash.conf: |
input { exec { command => "uptime" interval => 30 } }
output {
elasticsearch {
hosts => ["https://elasticsearch-master:9200"]
cacert => '/usr/share/logstash/config/certs/ca.crt'
user => '${ELASTICSEARCH_USERNAME}'
password => '${ELASTICSEARCH_PASSWORD}'
index => "logstash"
}
}
framsouza marked this conversation as resolved.
Show resolved Hide resolved
# logstash.conf: |
# input {
# exec {
Expand All @@ -34,7 +45,17 @@ logstashPattern: {}
# Extra environment variables to append to this nodeGroup
# This will be appended to the current 'env:' key. You can use any of the kubernetes env
# syntax here
extraEnvs: []
extraEnvs:
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: elasticsearch-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: elasticsearch-master-credentials
key: password
framsouza marked this conversation as resolved.
Show resolved Hide resolved
# - name: MY_ENVIRONMENT_VAR
# value: the_value_goes_here

Expand Down Expand Up @@ -62,7 +83,11 @@ secrets: []
# cert.key.filepath: "secrets.crt" # The path to file should be relative to the `values.yaml` file.

# A list of secrets and their paths to mount inside the pod
secretMounts: []
secretMounts:
- name: elasticsearch-master-certs
secretName: elasticsearch-master-certs
path: /usr/share/logstash/config/certs

framsouza marked this conversation as resolved.
Show resolved Hide resolved

hostAliases: []
#- ip: "127.0.0.1"
Expand Down