From a4e23e2a9c68e9b323636f863037886a2eb4bdde Mon Sep 17 00:00:00 2001
From: pengln <pengln@amonstack.com>
Date: Tue, 9 Nov 2021 11:11:23 +0800
Subject: [PATCH] =?UTF-8?q?#1001590=20=E5=A2=9E=E5=8A=A0=E9=92=88=E5=AF=B9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=BA=94=E7=94=A8=E6=97=A5=E5=BF=97=E7=9A=84?=
 =?UTF-8?q?=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 playbooks/roles/filebeat/tasks/main.yml       |  7 +--
 .../filebeat-gateway-nginx-template.yml       |  4 +-
 .../templates/filebeat-manager-template.yml   | 54 +++++++++++++++++++
 playbooks/roles/filebeat/vars/main.yml        |  6 ++-
 playbooks/roles/supervisor/tasks/main.yml     |  2 +
 .../roles/supervisor/templates/supervisor.yml |  7 ++-
 playbooks/roles/supervisor/vars/main.yml      |  4 +-
 7 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 playbooks/roles/filebeat/templates/filebeat-manager-template.yml

diff --git a/playbooks/roles/filebeat/tasks/main.yml b/playbooks/roles/filebeat/tasks/main.yml
index 574871d..3b7be72 100644
--- a/playbooks/roles/filebeat/tasks/main.yml
+++ b/playbooks/roles/filebeat/tasks/main.yml
@@ -31,8 +31,9 @@
       
 - name: Render Filebeat Configure File
   ansible.builtin.template:
-    src: filebeat-gateway-nginx-template.yml
-    dest: "{{ work_path }}/filebeat.yml"
+    src: "filebeat-{{ items }}-template.yml"
+    dest: "{{ work_path }}/filebeat_{{ items }}.yml"
     owner: root
     group: root
-    mode: '0644'
\ No newline at end of file
+    mode: '0644'
+  with_items: "{{ config_files }}"
\ No newline at end of file
diff --git a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
index bfaddfd..32cd8cd 100644
--- a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
+++ b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
@@ -22,9 +22,9 @@ filebeat.config.modules:
   #reload.period: 10s
 
 # ======================= Elasticsearch template setting =======================
-setup.ilm.enabled: false
+setup.ilm.enabled: true
 setup.template.name: "gw-nginx-ug10cn"
-setup.template.pattern: "gw-nginx-ug10cn-*"
+setup.template.pattern: "gw-nginx-*"
 
 setup.template.settings:
   index.number_of_shards: 3
diff --git a/playbooks/roles/filebeat/templates/filebeat-manager-template.yml b/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
new file mode 100644
index 0000000..9504320
--- /dev/null
+++ b/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
@@ -0,0 +1,54 @@
+filebeat.registry.path: {{ work_path }}/data/registry/mgr-cp-{{ instance_name }}
+
+filebeat.inputs:
+{% for log in logs %}
+- type: log
+  paths:
+    - {{ log }}
+  multiline.type: pattern
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+  multiline.skip_newline: true
+  fields:
+    source: cp
+{% endfor %}
+
+filebeat.config.modules:
+  # Glob pattern for configuration loading
+  path: ${path.config}/modules.d/*.yml
+
+  # Set to true to enable config reloading
+  reload.enabled: false
+
+  # Period on which files under path should be checked for changes
+  #reload.period: 10s
+
+# ======================= Elasticsearch template setting =======================
+setup.ilm.enabled: true
+setup.template.name: "mgr-cp"
+setup.template.pattern: "mgr-cp-*"
+
+setup.template.settings:
+  index.number_of_shards: 3
+
+setup.kibana:
+  host: "{{ kibana_url }}"
+  space.id: "{{ kibana_space }}"
+
+# ---------------------------- Elasticsearch Output ----------------------------
+output.elasticsearch:
+  hosts: {{ es_hosts }}
+  index: "mgr-{{ instance_name }}-%{[fields.source]}-%{+yyyy.MM.dd}"
+  pipeline: "mgrlogs"
+  username: {{ es_user }}
+  password: {{ es_passwd }}
+
+
+# ================================= Processors =================================
+processors:
+  - add_host_metadata:
+      when.not.contains.tags: forwarded
+  - add_cloud_metadata: ~
+  - add_docker_metadata: ~
+  - add_kubernetes_metadata: ~
diff --git a/playbooks/roles/filebeat/vars/main.yml b/playbooks/roles/filebeat/vars/main.yml
index 61270ff..78bbed0 100644
--- a/playbooks/roles/filebeat/vars/main.yml
+++ b/playbooks/roles/filebeat/vars/main.yml
@@ -2,4 +2,8 @@
 # vars file for filebeat
 filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz"
 work_path: "/data/opt/filebeat/{{ instance_name }}"
-logs: ["api", "cl*", "doc", "download", "gw*", "cp", "pay", "static"]
\ No newline at end of file
+logs: 
+  - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
+config_files:
+  - "gateway-nginx"
+  - "manager"
\ No newline at end of file
diff --git a/playbooks/roles/supervisor/tasks/main.yml b/playbooks/roles/supervisor/tasks/main.yml
index 5b2b97c..8b2747c 100644
--- a/playbooks/roles/supervisor/tasks/main.yml
+++ b/playbooks/roles/supervisor/tasks/main.yml
@@ -12,6 +12,8 @@
     owner: root
     group: root
     mode: '0750'
+  vars:
+    items: "{{ filebeat_configs }}"
 
 - name: Render Supervisor SystemV Script
   ansible.builtin.template:
diff --git a/playbooks/roles/supervisor/templates/supervisor.yml b/playbooks/roles/supervisor/templates/supervisor.yml
index 11cb6fb..16edf0a 100644
--- a/playbooks/roles/supervisor/templates/supervisor.yml
+++ b/playbooks/roles/supervisor/templates/supervisor.yml
@@ -21,10 +21,13 @@ chown = filebeat:filebeat
 username = filebeat
 password = eNlB.UlOrJAnA
 
-[program:filebeat_{{instance_name}}]
-command={{ work_path }}/filebeat -c {{ work_path }}/filebeat.yml
+{% for item in items %}
+[program:filebeat_{{instance_name}}_{{ item }}]
+command={{ work_path }}/filebeat -c {{ work_path }}/filebeat_{{ item }}.yml
 autorestart=true
 
+{% endfor %}
+
 [supervisorctl]
 serverurl = unix:///tmp/supervisord_{{instance_name}}.sock
 username = filebeat
diff --git a/playbooks/roles/supervisor/vars/main.yml b/playbooks/roles/supervisor/vars/main.yml
index 9fcbee7..01819f5 100644
--- a/playbooks/roles/supervisor/vars/main.yml
+++ b/playbooks/roles/supervisor/vars/main.yml
@@ -3,4 +3,6 @@
 pip_bin_path: "/data/opt/python3/bin/pip"
 python_bin_dir: "/data/opt/python3/bin"
 work_path: "/data/opt/filebeat/{{ instance_name }}"
-
+filebeat_configs:
+  - "gateway-nginx"
+  - "manager"