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

[filebeat] using https to connect to elasticsearch #1627

Merged
merged 45 commits into from
Mar 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 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
0235efb
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 18, 2022
c8fd65c
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 21, 2022
c936251
adjusting settings to connect into elasticsearch using https
framsouza Mar 21, 2022
c178fe0
Merge branch 'main' of github.com:elastic/helm-charts into main
framsouza Mar 21, 2022
346041e
Merge branch 'main' into filebeat-ssl-fix
framsouza Mar 21, 2022
869be3f
adjusting tests
framsouza Mar 23, 2022
a89461a
adjusting tests
framsouza Mar 23, 2022
f803d86
adjusting tests
framsouza Mar 23, 2022
8ec2755
adding body, username, password and increasing version upgraded
framsouza Mar 23, 2022
15077fa
Merge remote-tracking branch 'origin/main' into filebeat-ssl-fix
jmlrt Mar 24, 2022
6cbc88f
fix goss syntax
jmlrt Mar 24, 2022
5047b4c
Merge branch 'main' into filebeat-ssl-fix
jmlrt Mar 24, 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
5 changes: 3 additions & 2 deletions filebeat/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ user:
gid: 1000

http:
http://elasticsearch-master:9200/_cat/indices:
https://elasticsearch-master:9200/_cat/indices:
status: 200
timeout: 2000
allow-insecure: true
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"
body:
Expand All @@ -45,4 +46,4 @@ command:
cd /usr/share/filebeat && filebeat test output:
exit-status: 0
stdout:
- "elasticsearch: http://elasticsearch-master:9200"
- "elasticsearch: https://elasticsearch-master:9200"
3 changes: 2 additions & 1 deletion filebeat/examples/deployment/test/goss.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
http:
http://elasticsearch-master:9200/_cat/indices:
https://elasticsearch-master:9200/_cat/indices:
status: 200
allow-insecure: true
timeout: 2000
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"
Expand Down
3 changes: 2 additions & 1 deletion filebeat/examples/oss/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ user:
gid: 1000

http:
http://elasticsearch-master:9200/_cat/indices:
https://elasticsearch-master:9200/_cat/indices:
allow-insecure: true
status: 200
timeout: 2000
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
Expand Down
8 changes: 7 additions & 1 deletion filebeat/examples/oss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@ daemonset:
logs_path: "/var/log/containers/"
output.elasticsearch:
host: '${NODE_NAME}'
hosts: "elasticsearch-master:9200"
hosts: ["https://elasticsearch-master:9200"]
username: '${ELASTICSEARCH_USERNAME}'
password: '${ELASTICSEARCH_PASSWORD}'
index: "filebeat-oss-%{[agent.version]}-%{+yyyy.MM.dd}"
ssl.certificate_authorities:
- /usr/share/filebeat/certs/ca.crt
setup.ilm.enabled: false
setup.template.name: "filebeat"
setup.template.pattern: "filebeat-oss-*"
secretMounts:
- name: elasticsearch-master-certs
secretName: elasticsearch-master-certs
path: /usr/share/filebeat/certs
4 changes: 2 additions & 2 deletions filebeat/examples/upgrade/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ include ../../../helpers/examples.mk

CHART := filebeat
RELEASE := helm-filebeat-upgrade
# K8S 1.22 doesn't support anymore rbac.authorization.k8s.io/v1beta1 used in 7.9.0
FROM := 7.10.0
# upgrade from versions before 7.17.1 isn't compatible with 8.x
FROM := 7.17.1

install:
../../../helpers/upgrade.sh --chart $(CHART) --release $(RELEASE) --from $(FROM)
Expand Down
7 changes: 5 additions & 2 deletions filebeat/examples/upgrade/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ user:
gid: 1000

http:
http://upgrade-master:9200/_cat/indices:
https://upgrade-master:9200/_cat/indices:
status: 200
allow-insecure: true
timeout: 2000
body:
- "filebeat-8.1.0"
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"

file:
/usr/share/filebeat/filebeat.yml:
Expand All @@ -42,4 +45,4 @@ command:
cd /usr/share/filebeat && filebeat test output:
exit-status: 0
stdout:
- "elasticsearch: http://upgrade-master:9200"
- "elasticsearch: https://upgrade-master:9200"
54 changes: 39 additions & 15 deletions filebeat/examples/upgrade/values.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,39 @@
---
daemonset:
extraEnvs:
- name: ELASTICSEARCH_HOSTS
value: upgrade-master:9200
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: password
extraEnvs:
- name: "ELASTICSEARCH_HOSTS"
value: "https://upgrade-master:9200"
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: password
- name: ssl.certificate_authorities
value: "/usr/share/filebeat/certs/ca.crt"
filebeatConfig:
filebeat.yml: |
filebeat.inputs:
- type: container
paths:
- /var/log/containers/*.log
processors:
- add_kubernetes_metadata:
host: ${NODE_NAME}
matchers:
- logs_path:
logs_path: "/var/log/containers/"
output.elasticsearch:
host: '${NODE_NAME}'
hosts: '${ELASTICSEARCH_HOSTS:upgrade-master:9200}'
username: '${ELASTICSEARCH_USERNAME}'
password: '${ELASTICSEARCH_PASSWORD}'
protocol: https
ssl.certificate_authorities:
- /usr/share/filebeat/certs/ca.crt
secretMounts:
- name: upgrade-master-certs
secretName: upgrade-master-certs
path: /usr/share/filebeat/certs
18 changes: 14 additions & 4 deletions filebeat/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,20 @@ daemonset:

output.elasticsearch:
host: '${NODE_NAME}'
hosts: '${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}'
hosts: '["https://${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}"]'
username: '${ELASTICSEARCH_USERNAME}'
password: '${ELASTICSEARCH_PASSWORD}'
protocol: https
ssl.certificate_authorities: ["/usr/share/filebeat/certs/ca.crt"]
# Only used when updateStrategy is set to "RollingUpdate"
maxUnavailable: 1
nodeSelector: {}
# A list of secrets and their paths to mount inside the pod
# This is useful for mounting certificates for security other sensitive values
secretMounts: []
secretMounts:
- name: elasticsearch-master-certs
secretName: elasticsearch-master-certs
path: /usr/share/filebeat/certs/
# - name: filebeat-certificates
# secretName: filebeat-certificates
# path: /usr/share/filebeat/certs
Expand Down Expand Up @@ -117,13 +122,18 @@ deployment:

output.elasticsearch:
host: "${NODE_NAME}"
hosts: "${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}"
hosts: '["https://${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}"]'
username: "${ELASTICSEARCH_USERNAME}"
password: "${ELASTICSEARCH_PASSWORD}"
protocol: https
ssl.certificate_authorities: ["/usr/share/filebeat/certs/ca.crt"]
nodeSelector: {}
# A list of secrets and their paths to mount inside the pod
# This is useful for mounting certificates for security other sensitive values
secretMounts: []
secretMounts:
- name: elasticsearch-master-certs
secretName: elasticsearch-master-certs
path: /usr/share/filebeat/certs/
# - name: filebeat-certificates
# secretName: filebeat-certificates
# path: /usr/share/filebeat/certs
Expand Down