[Feature] Add elasticsearch authentication option in Filebeat output …

…config (#124)
sky-uk · Dec 9, 2022 · 92c3d72 · 92c3d72
1 parent 01d85f8
commit 92c3d72
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/EXAMPLE/cluster_defs/aws/cluster_vars__cloud.yml b/EXAMPLE/cluster_defs/aws/cluster_vars__cloud.yml
@@ -28,4 +28,4 @@ cluster_vars:
 
 # Some of the regions are not available for aws module boto.ec2. If the region definitely exists, you may need to upgrade boto or extend with endpoints_path
 # Adding the below to ec2 invocation fixes the issue
-  aws_endpoint_url: https://ec2.{{region}}.amazonaws.com
+  aws_endpoint_url: https://ec2.{{region}}.amazonaws.com
diff --git a/config/tasks/filebeat.yml b/config/tasks/filebeat.yml
@@ -36,4 +36,4 @@
 
     - deprecate_str: { msg: "beats_target_hosts is deprecated.  Please use beats_config.filebeat.output_logstash_hosts in future", version: "6" }
       when: (beats_target_hosts is defined and (beats_target_hosts | length))
-  when: (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.filebeat.output_logstash_hosts is defined and (beats_config.filebeat.output_logstash_hosts | length))
+  when: (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.filebeat.output_logstash_hosts is defined and (beats_config.filebeat.output_logstash_hosts | length)) or (beats_config.filebeat.output_elasticsearch_hosts is defined and (beats_config.filebeat.output_elasticsearch_hosts | length))
diff --git a/config/tasks/metricbeat.yml b/config/tasks/metricbeat.yml
@@ -43,4 +43,4 @@
 
     - deprecate_str: { msg: "beats_target_hosts is deprecated.  Please use beats_config.metricbeat.output_logstash_hosts in future", version: "6" }
       when: (beats_target_hosts is defined and (beats_target_hosts | length))
-  when: (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.metricbeat.output_logstash_hosts is defined and (beats_config.metricbeat.output_logstash_hosts | length))
+  when: (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.metricbeat.output_logstash_hosts is defined and (beats_config.metricbeat.output_logstash_hosts | length)) or (beats_config.filebeat.output_elasticsearch_hosts is defined and (beats_config.filebeat.output_elasticsearch_hosts | length))
diff --git a/config/templates/etc/filebeat/filebeat.yml.j2 b/config/templates/etc/filebeat/filebeat.yml.j2
@@ -165,12 +165,23 @@ setup.kibana:
 output.elasticsearch:
   # Array of hosts to connect to.
   hosts: {{ beats_config.filebeat.output_elasticsearch_hosts | default(beats_target_hosts) }}
-{% endif %}
+
   # Optional protocol and basic auth credentials.
   #protocol: "https"
-  #username: "elastic"
-  #password: "changeme"
+{% if beats_config.filebeat.es_username is defined and beats_config.filebeat.es_password is defined %}
+  username: "{{ beats_config.filebeat.es_username }}"
+  password: "{{ beats_config.filebeat.es_password }}"
+{% endif %}
+
+{% if beats_config.filebeat.ssl_enabled is defined %}
+  ssl.enabled: {{ beats_config.filebeat.ssl_enabled | bool }}
+{% endif %}
+
+{% if beats_config.filebeat.ssl_verification_mode is defined %}
+  ssl.verification_mode: {{ beats_config.filebeat.ssl_verification_mode }}
+{% endif %}
 
+{% endif %}
 #----------------------------- Logstash output --------------------------------
 {% if (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.filebeat.output_logstash_hosts is defined and (beats_config.filebeat.output_logstash_hosts | length)) %}
 output.logstash:

diff --git a/config/templates/etc/metricbeat/metricbeat.yml.j2 b/config/templates/etc/metricbeat/metricbeat.yml.j2
@@ -94,13 +94,23 @@ setup.kibana:
 output.elasticsearch:
   # Array of hosts to connect to.
   hosts: {{ beats_config.metricbeat.output_elasticsearch_hosts | default(beats_target_hosts) }}
-{% endif %}
 
   # Optional protocol and basic auth credentials.
   #protocol: "https"
-  #username: "elastic"
-  #password: "changeme"
+{% if beats_config.filebeat.es_username is defined and beats_config.filebeat.es_password is defined %}
+  username: "{{ beats_config.filebeat.es_username }}"
+  password: "{{ beats_config.filebeat.es_password }}"
+{% endif %}
+
+{% if beats_config.filebeat.ssl_enabled is defined %}
+  ssl.enabled: {{ beats_config.filebeat.ssl_enabled  | bool }}
+{% endif %}
 
+{% if beats_config.filebeat.ssl_verification_mode is defined %}
+  ssl.verification_mode: {{ beats_config.filebeat.ssl_verification_mode }}
+{% endif %}
+
+{% endif %}
 #----------------------------- Logstash output --------------------------------
 {% if (beats_target_hosts is defined and (beats_target_hosts | length)) or (beats_config.metricbeat.output_logstash_hosts is defined and (beats_config.metricbeat.output_logstash_hosts | length)) %}
 output.logstash: