From 45df59ed7e954a623a9cb493f9802be787ef3286 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Sat, 11 Aug 2018 23:53:24 -0500 Subject: [PATCH] move the bulk to templates into the new roles This change will help with organization throughout the stack. Change-Id: I2ad865db534ae1d377bbdecd4b421ee0fc802536 Signed-off-by: Kevin Carter --- .../roles/elastic_apm_server/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../_include_elasticsearch_output.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../templates/apm-server.yml.j2 | 0 .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../_include_xpack_elasticsearch_output.yml.j2 | 1 + .../templates/auditbeat.yml.j2 | 0 .../roles/elastic_curator/tasks/main.yml | 18 ++++++++---------- .../templates/curator-actions.yml.j2 | 0 .../elastic_curator}/templates/curator.yml.j2 | 0 .../roles/elastic_dependencies/tasks/main.yml | 7 +++++-- .../templates/jvm.options.j2 | 0 .../templates/logrotate.j2 | 0 .../roles/elastic_filebeat/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../_include_xpack_elasticsearch_output.yml.j2 | 1 + .../templates/filebeat.yml.j2 | 0 .../roles/elastic_heartbeat/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../_include_xpack_elasticsearch_output.yml.j2 | 1 + .../templates/heartbeat.yml.j2 | 0 .../roles/elastic_journalbeat/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../templates/journalbeat.yml.j2 | 0 .../roles/elastic_kibana/tasks/main.yml | 8 ++++---- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../elastic_kibana}/templates/kibana.yml.j2 | 0 .../elastic_kibana}/templates/nginx_default.j2 | 0 .../roles/elastic_logstash/defaults/main.yml | 2 +- .../roles/elastic_logstash/tasks/main.yml | 10 ++++------ .../tasks/systemd.general-overrides.conf.j2 | 1 + .../elastic_logstash}/templates/extras | 0 .../templates/logstash-pipelines.yml.j2 | 1 + .../templates/logstash.yml.j2 | 0 .../roles/elastic_metricbeat/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../_include_xpack_elasticsearch_output.yml.j2 | 1 + .../templates/apache-status.conf.j2 | 0 .../templates/metricbeat.yml.j2 | 0 .../templates/nginx-status.conf.j2 | 0 .../roles/elastic_packetbeat/tasks/main.yml | 4 ++-- .../tasks/systemd.general-overrides.conf.j2 | 1 + .../templates/_include_beat_logging.yml.j2 | 1 + .../templates/_include_kibana_setup.yml.j2 | 1 + .../templates/_include_log_stash_output.yml.j2 | 1 + .../templates/_include_setup_dashboards.yml.j2 | 1 + .../templates/_include_setup_template.yml.j2 | 1 + .../_include_xpack_elasticsearch_output.yml.j2 | 1 + .../templates/packetbeat.yml.j2 | 0 .../roles/elasticsearch/tasks/main.yml | 15 ++++----------- .../templates/elasticsearch.yml.j2 | 0 .../templates/es-log4j2.properties.j2 | 0 .../systemd.elasticsearch-overrides.conf.j2 | 6 ++++++ .../systemd.general-overrides.conf.j2 | 1 + .../systemd.elasticsearch-overrides.conf.j2 | 18 ------------------ elk_metrics_6x/tests/functional.yml | 4 +++- 85 files changed, 98 insertions(+), 65 deletions(-) create mode 120000 elk_metrics_6x/roles/elastic_apm_server/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_apm_server/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_apm_server/templates/_include_elasticsearch_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_apm_server/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_template.yml.j2 rename elk_metrics_6x/{ => roles/elastic_apm_server}/templates/apm-server.yml.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_template.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_auditbeat/templates/_include_xpack_elasticsearch_output.yml.j2 rename elk_metrics_6x/{ => roles/elastic_auditbeat}/templates/auditbeat.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_curator}/templates/curator-actions.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_curator}/templates/curator.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_dependencies}/templates/jvm.options.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_dependencies}/templates/logrotate.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_filebeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_template.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_filebeat/templates/_include_xpack_elasticsearch_output.yml.j2 rename elk_metrics_6x/{ => roles/elastic_filebeat}/templates/filebeat.yml.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_template.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_heartbeat/templates/_include_xpack_elasticsearch_output.yml.j2 rename elk_metrics_6x/{ => roles/elastic_heartbeat}/templates/heartbeat.yml.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_template.yml.j2 rename elk_metrics_6x/{ => roles/elastic_journalbeat}/templates/journalbeat.yml.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_kibana/tasks/systemd.general-overrides.conf.j2 rename elk_metrics_6x/{ => roles/elastic_kibana}/templates/kibana.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_kibana}/templates/nginx_default.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_logstash/tasks/systemd.general-overrides.conf.j2 rename elk_metrics_6x/{ => roles/elastic_logstash}/templates/extras (100%) create mode 120000 elk_metrics_6x/roles/elastic_logstash/templates/logstash-pipelines.yml.j2 rename elk_metrics_6x/{ => roles/elastic_logstash}/templates/logstash.yml.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_template.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_metricbeat/templates/_include_xpack_elasticsearch_output.yml.j2 rename elk_metrics_6x/{ => roles/elastic_metricbeat}/templates/apache-status.conf.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_metricbeat}/templates/metricbeat.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elastic_metricbeat}/templates/nginx-status.conf.j2 (100%) create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/tasks/systemd.general-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_beat_logging.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_kibana_setup.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_log_stash_output.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_dashboards.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_template.yml.j2 create mode 120000 elk_metrics_6x/roles/elastic_packetbeat/templates/_include_xpack_elasticsearch_output.yml.j2 rename elk_metrics_6x/{ => roles/elastic_packetbeat}/templates/packetbeat.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elasticsearch}/templates/elasticsearch.yml.j2 (100%) rename elk_metrics_6x/{ => roles/elasticsearch}/templates/es-log4j2.properties.j2 (100%) create mode 100644 elk_metrics_6x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2 create mode 120000 elk_metrics_6x/roles/elasticsearch/templates/systemd.general-overrides.conf.j2 delete mode 100644 elk_metrics_6x/templates/systemd.elasticsearch-overrides.conf.j2 diff --git a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml index 5970f939..cff5393e 100644 --- a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml @@ -64,8 +64,8 @@ - name: Drop apm-server conf file template: - src: templates/apm-server.yml.j2 - dest: /etc/apm-server/apm-server.yml + src: "apm-server.yml.j2" + dest: "/etc/apm-server/apm-server.yml" notify: - Enable and restart apm server diff --git a/elk_metrics_6x/roles/elastic_apm_server/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_apm_server/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_include_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..46f170b1 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_apm_server/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/apm-server.yml.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/apm-server.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/apm-server.yml.j2 rename to elk_metrics_6x/roles/elastic_apm_server/templates/apm-server.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_auditbeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_auditbeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_xpack_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_xpack_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..c346697f --- /dev/null +++ b/elk_metrics_6x/roles/elastic_auditbeat/templates/_include_xpack_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_xpack_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/auditbeat.yml.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/auditbeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/auditbeat.yml.j2 rename to elk_metrics_6x/roles/elastic_auditbeat/templates/auditbeat.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml index 355e7e8f..1205d33d 100644 --- a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml @@ -79,17 +79,15 @@ - "/var/log/curator" - "/etc/curator" -- name: Drop curator conf file +- name: Drop curator conf file(s) template: - src: templates/curator.yml.j2 - dest: /var/lib/curator/curator.yml - notify: - - Enable and restart curator.timer - -- name: Drop curator action file - template: - src: templates/curator-actions.yml.j2 - dest: /var/lib/curator/actions.yml + src: "{{ item.src }}" + dest: "{{ item.dest }}" + with_items: + - src: "curator.yml.j2" + dest: /var/lib/curator/curator.yml + - src: "curator-actions.yml.j2" + dest: /var/lib/curator/actions.yml notify: - Enable and restart curator.timer diff --git a/elk_metrics_6x/templates/curator-actions.yml.j2 b/elk_metrics_6x/roles/elastic_curator/templates/curator-actions.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/curator-actions.yml.j2 rename to elk_metrics_6x/roles/elastic_curator/templates/curator-actions.yml.j2 diff --git a/elk_metrics_6x/templates/curator.yml.j2 b/elk_metrics_6x/roles/elastic_curator/templates/curator.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/curator.yml.j2 rename to elk_metrics_6x/roles/elastic_curator/templates/curator.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml b/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml index d9ebc090..e549bf57 100644 --- a/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml @@ -52,6 +52,7 @@ - name: Set elastic heap defaults set_fact: elastic_heap_size_default: "{{ _elastic_heap_size_default }}" + elastic_log_rotate_path: "/var/log/{{ service_name }}" - name: Configure systcl vm.max_map_count=262144 on container hosts sysctl: @@ -165,5 +166,7 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - src: templates/jvm.options.j2 - dest: /etc/{{ service_name }}/jvm.options + - src: "jvm.options.j2" + dest: "/etc/{{ service_name }}/jvm.options" + - src: "templates/logrotate.j2" + dest: "/etc/logrotate.d/{{ service_name }}" diff --git a/elk_metrics_6x/templates/jvm.options.j2 b/elk_metrics_6x/roles/elastic_dependencies/templates/jvm.options.j2 similarity index 100% rename from elk_metrics_6x/templates/jvm.options.j2 rename to elk_metrics_6x/roles/elastic_dependencies/templates/jvm.options.j2 diff --git a/elk_metrics_6x/templates/logrotate.j2 b/elk_metrics_6x/roles/elastic_dependencies/templates/logrotate.j2 similarity index 100% rename from elk_metrics_6x/templates/logrotate.j2 rename to elk_metrics_6x/roles/elastic_dependencies/templates/logrotate.j2 diff --git a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml index b89f5fd5..e0eea3ac 100644 --- a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml @@ -174,8 +174,8 @@ - name: Drop Filebeat conf file template: - src: templates/filebeat.yml.j2 - dest: /etc/filebeat/filebeat.yml + src: "filebeat.yml.j2" + dest: "/etc/filebeat/filebeat.yml" notify: - Enable and restart filebeat diff --git a/elk_metrics_6x/roles/elastic_filebeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_filebeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_include_xpack_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_xpack_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..c346697f --- /dev/null +++ b/elk_metrics_6x/roles/elastic_filebeat/templates/_include_xpack_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_xpack_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/filebeat.yml.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/filebeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/filebeat.yml.j2 rename to elk_metrics_6x/roles/elastic_filebeat/templates/filebeat.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml index d5bc52f5..7483ad5f 100644 --- a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml @@ -70,8 +70,8 @@ when: - ansible_service_mgr == 'systemd' with_items: - - src: templates/heartbeat.yml.j2 - dest: /etc/heartbeat/heartbeat.yml + - src: "heartbeat.yml.j2" + dest: "/etc/heartbeat/heartbeat.yml" notify: - Enable and restart heartbeat diff --git a/elk_metrics_6x/roles/elastic_heartbeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_heartbeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_xpack_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_xpack_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..c346697f --- /dev/null +++ b/elk_metrics_6x/roles/elastic_heartbeat/templates/_include_xpack_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_xpack_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/heartbeat.yml.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/heartbeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/heartbeat.yml.j2 rename to elk_metrics_6x/roles/elastic_heartbeat/templates/heartbeat.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml index d4abf0a4..68fbd8f3 100644 --- a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml @@ -112,8 +112,8 @@ dest: "{{ item.dest }}" mode: "0644" with_items: - - src: templates/journalbeat.yml.j2 - dest: /etc/journalbeat/journalbeat.yml + - src: "journalbeat.yml.j2" + dest: "/etc/journalbeat/journalbeat.yml" notify: - Enable and restart journalbeat diff --git a/elk_metrics_6x/roles/elastic_journalbeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_journalbeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_journalbeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/journalbeat.yml.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/journalbeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/journalbeat.yml.j2 rename to elk_metrics_6x/roles/elastic_journalbeat/templates/journalbeat.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml b/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml index ba02a81f..7bba6c9a 100644 --- a/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml @@ -51,8 +51,8 @@ - name: Drop Nginx default conf file template: - src: templates/nginx_default.j2 - dest: /etc/nginx/sites-available/default + src: "nginx_default.j2" + dest: "/etc/nginx/sites-available/default" notify: - Enable and restart services @@ -81,8 +81,8 @@ - name: Drop kibana conf file template: - src: templates/kibana.yml.j2 - dest: /etc/kibana/kibana.yml + src: "kibana.yml.j2" + dest: "/etc/kibana/kibana.yml" mode: "0666" notify: - Enable and restart services diff --git a/elk_metrics_6x/roles/elastic_kibana/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_kibana/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_kibana/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/kibana.yml.j2 b/elk_metrics_6x/roles/elastic_kibana/templates/kibana.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/kibana.yml.j2 rename to elk_metrics_6x/roles/elastic_kibana/templates/kibana.yml.j2 diff --git a/elk_metrics_6x/templates/nginx_default.j2 b/elk_metrics_6x/roles/elastic_kibana/templates/nginx_default.j2 similarity index 100% rename from elk_metrics_6x/templates/nginx_default.j2 rename to elk_metrics_6x/roles/elastic_kibana/templates/nginx_default.j2 diff --git a/elk_metrics_6x/roles/elastic_logstash/defaults/main.yml b/elk_metrics_6x/roles/elastic_logstash/defaults/main.yml index 71b06386..b3e15edd 100644 --- a/elk_metrics_6x/roles/elastic_logstash/defaults/main.yml +++ b/elk_metrics_6x/roles/elastic_logstash/defaults/main.yml @@ -14,7 +14,7 @@ # limitations under the License. temp_dir: /var/lib/logstash/tmp -logstash_pipelines: "{{lookup('template', 'templates/logstash-pipelines.yml.j2') }}" +logstash_pipelines: "{{lookup('template', 'logstash-pipelines.yml.j2') }}" # Set processor cores fact q_storage: "{{ (ansible_processor_cores | int) * (ansible_processor_threads_per_core | int) * 2 }}" diff --git a/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml b/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml index 74f2430f..2f20b343 100644 --- a/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml @@ -96,12 +96,10 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - src: templates/logstash.yml.j2 - dest: /etc/logstash/logstash.yml - - src: templates/logstash-pipelines.yml.j2 - dest: /etc/logstash/pipelines.yml - - src: "templates/logrotate.j2" - dest: "/etc/logrotate.d/logstash" + - src: "logstash.yml.j2" + dest: "/etc/logstash/logstash.yml" + - src: "logstash-pipelines.yml.j2" + dest: "/etc/logstash/pipelines.yml" notify: - Enable and restart logstash tags: diff --git a/elk_metrics_6x/roles/elastic_logstash/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_logstash/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_logstash/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/extras b/elk_metrics_6x/roles/elastic_logstash/templates/extras similarity index 100% rename from elk_metrics_6x/templates/extras rename to elk_metrics_6x/roles/elastic_logstash/templates/extras diff --git a/elk_metrics_6x/roles/elastic_logstash/templates/logstash-pipelines.yml.j2 b/elk_metrics_6x/roles/elastic_logstash/templates/logstash-pipelines.yml.j2 new file mode 120000 index 00000000..c2ae513e --- /dev/null +++ b/elk_metrics_6x/roles/elastic_logstash/templates/logstash-pipelines.yml.j2 @@ -0,0 +1 @@ +../../../templates/logstash-pipelines.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/logstash.yml.j2 b/elk_metrics_6x/roles/elastic_logstash/templates/logstash.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/logstash.yml.j2 rename to elk_metrics_6x/roles/elastic_logstash/templates/logstash.yml.j2 diff --git a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml index 5a4ed81d..ccba51af 100644 --- a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml @@ -230,8 +230,8 @@ when: - ansible_service_mgr == 'systemd' with_items: - - src: templates/metricbeat.yml.j2 - dest: /etc/metricbeat/metricbeat.yml + - src: "metricbeat.yml.j2" + dest: "/etc/metricbeat/metricbeat.yml" notify: - Enable and restart metricbeat diff --git a/elk_metrics_6x/roles/elastic_metricbeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_metricbeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_xpack_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_xpack_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..c346697f --- /dev/null +++ b/elk_metrics_6x/roles/elastic_metricbeat/templates/_include_xpack_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_xpack_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/apache-status.conf.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/apache-status.conf.j2 similarity index 100% rename from elk_metrics_6x/templates/apache-status.conf.j2 rename to elk_metrics_6x/roles/elastic_metricbeat/templates/apache-status.conf.j2 diff --git a/elk_metrics_6x/templates/metricbeat.yml.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/metricbeat.yml.j2 rename to elk_metrics_6x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 diff --git a/elk_metrics_6x/templates/nginx-status.conf.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/nginx-status.conf.j2 similarity index 100% rename from elk_metrics_6x/templates/nginx-status.conf.j2 rename to elk_metrics_6x/roles/elastic_metricbeat/templates/nginx-status.conf.j2 diff --git a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml index 80be5255..51a2dfe7 100644 --- a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml +++ b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml @@ -68,8 +68,8 @@ dest: "{{ item.dest }}" mode: "0644" with_items: - - src: templates/packetbeat.yml.j2 - dest: /etc/packetbeat/packetbeat.yml + - src: "packetbeat.yml.j2" + dest: "/etc/packetbeat/packetbeat.yml" notify: - Enable and restart packetbeat diff --git a/elk_metrics_6x/roles/elastic_packetbeat/tasks/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elastic_packetbeat/tasks/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/tasks/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_beat_logging.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_beat_logging.yml.j2 new file mode 120000 index 00000000..b74520aa --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_beat_logging.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_beat_logging.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_kibana_setup.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_kibana_setup.yml.j2 new file mode 120000 index 00000000..30619052 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_kibana_setup.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_kibana_setup.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_log_stash_output.yml.j2 new file mode 120000 index 00000000..7d60a321 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_log_stash_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_log_stash_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_dashboards.yml.j2 new file mode 120000 index 00000000..705be1a6 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_dashboards.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_dashboards.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_template.yml.j2 new file mode 120000 index 00000000..f3f967e4 --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_setup_template.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_setup_template.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_xpack_elasticsearch_output.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_xpack_elasticsearch_output.yml.j2 new file mode 120000 index 00000000..c346697f --- /dev/null +++ b/elk_metrics_6x/roles/elastic_packetbeat/templates/_include_xpack_elasticsearch_output.yml.j2 @@ -0,0 +1 @@ +../../../templates/_include_xpack_elasticsearch_output.yml.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/packetbeat.yml.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/packetbeat.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/packetbeat.yml.j2 rename to elk_metrics_6x/roles/elastic_packetbeat/templates/packetbeat.yml.j2 diff --git a/elk_metrics_6x/roles/elasticsearch/tasks/main.yml b/elk_metrics_6x/roles/elasticsearch/tasks/main.yml index 8c13ef73..9e9d3200 100644 --- a/elk_metrics_6x/roles/elasticsearch/tasks/main.yml +++ b/elk_metrics_6x/roles/elasticsearch/tasks/main.yml @@ -73,12 +73,10 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - src: templates/elasticsearch.yml.j2 - dest: /etc/elasticsearch/elasticsearch.yml - - src: templates/jvm.options.j2 - dest: /etc/elasticsearch/jvm.options - - src: templates/es-log4j2.properties.j2 - dest: /etc/elasticsearch/log4j2.properties + - src: "elasticsearch.yml.j2" + dest: "/etc/elasticsearch/elasticsearch.yml" + - src: "es-log4j2.properties.j2" + dest: "/etc/elasticsearch/log4j2.properties" notify: - Enable and restart elastic tags: @@ -105,11 +103,6 @@ group: "elasticsearch" mode: "0750" -- name: Create logrotate config - template: - src: "templates/logrotate.j2" - dest: "/etc/logrotate.d/elasticsearch" - - include_tasks: "elasticsearch_nfs_setup.yml" when: - elastic_shared_fs_repos is defined diff --git a/elk_metrics_6x/templates/elasticsearch.yml.j2 b/elk_metrics_6x/roles/elasticsearch/templates/elasticsearch.yml.j2 similarity index 100% rename from elk_metrics_6x/templates/elasticsearch.yml.j2 rename to elk_metrics_6x/roles/elasticsearch/templates/elasticsearch.yml.j2 diff --git a/elk_metrics_6x/templates/es-log4j2.properties.j2 b/elk_metrics_6x/roles/elasticsearch/templates/es-log4j2.properties.j2 similarity index 100% rename from elk_metrics_6x/templates/es-log4j2.properties.j2 rename to elk_metrics_6x/roles/elasticsearch/templates/es-log4j2.properties.j2 diff --git a/elk_metrics_6x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2 b/elk_metrics_6x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2 new file mode 100644 index 00000000..eb68a885 --- /dev/null +++ b/elk_metrics_6x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2 @@ -0,0 +1,6 @@ +{% include 'templates/systemd.general-overrides.conf.j2' %} + +# This first line clears the source ExecStart +ExecStart= +# This runs our ExecStart as an override. +ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/elasticsearch.pid diff --git a/elk_metrics_6x/roles/elasticsearch/templates/systemd.general-overrides.conf.j2 b/elk_metrics_6x/roles/elasticsearch/templates/systemd.general-overrides.conf.j2 new file mode 120000 index 00000000..9ddff7cc --- /dev/null +++ b/elk_metrics_6x/roles/elasticsearch/templates/systemd.general-overrides.conf.j2 @@ -0,0 +1 @@ +../../../templates/systemd.general-overrides.conf.j2 \ No newline at end of file diff --git a/elk_metrics_6x/templates/systemd.elasticsearch-overrides.conf.j2 b/elk_metrics_6x/templates/systemd.elasticsearch-overrides.conf.j2 deleted file mode 100644 index 60428560..00000000 --- a/elk_metrics_6x/templates/systemd.elasticsearch-overrides.conf.j2 +++ /dev/null @@ -1,18 +0,0 @@ -[Service] -# This first line clears the source ExecStart -ExecStart= -# This runs our ExecStart as an override. -ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/elasticsearch.pid - -# This creates a specific slice to operate from. The accounting options give us -# the ability to see resource usage through the `systemd-cgtop` command and -# further isolate this service from the host machine. -Slice=elastic.slice -CPUAccounting=true -BlockIOAccounting=true -MemoryAccounting=true -TasksAccounting=true - -# Sandbox setup -PrivateTmp=true -PrivateDevices={{ ((ansible_os_family | lower) != "redhat") | lower }} diff --git a/elk_metrics_6x/tests/functional.yml b/elk_metrics_6x/tests/functional.yml index 6cf8dd2a..c0f283fe 100644 --- a/elk_metrics_6x/tests/functional.yml +++ b/elk_metrics_6x/tests/functional.yml @@ -111,7 +111,8 @@ args: chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests" when: - - ansible_service_mgr != 'systemd' + - ansible_service_mgr != 'systemd' or + not (contianer_inventory | bool) - name: Run environment setup become: yes @@ -125,6 +126,7 @@ chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests" when: - ansible_service_mgr == 'systemd' + - contianer_inventory | bool - name: Wait 15 seconds command: "sleep 15"