From 9fb9563f746efb14e0662723f10578ac1c18ee7c Mon Sep 17 00:00:00 2001 From: pengln Date: Mon, 8 Nov 2021 17:01:14 +0800 Subject: [PATCH] =?UTF-8?q?#1001565=20=E9=92=88=E5=AF=B9nginx=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbooks/install_filebeat.yml | 51 ++---------------- playbooks/roles/filebeat/.travis.yml | 29 +++++++++++ playbooks/roles/filebeat/README.md | 38 ++++++++++++++ playbooks/roles/filebeat/defaults/main.yml | 2 + playbooks/roles/filebeat/handlers/main.yml | 2 + playbooks/roles/filebeat/meta/main.yml | 52 +++++++++++++++++++ playbooks/roles/filebeat/tasks/main.yml | 38 ++++++++++++++ .../filebeat-gateway-nginx-template.yml | 0 playbooks/roles/filebeat/tests/inventory | 2 + playbooks/roles/filebeat/tests/test.yml | 5 ++ playbooks/roles/filebeat/vars/main.yml | 5 ++ playbooks/roles/supervisor/.travis.yml | 29 +++++++++++ playbooks/roles/supervisor/README.md | 38 ++++++++++++++ playbooks/roles/supervisor/defaults/main.yml | 2 + playbooks/roles/supervisor/handlers/main.yml | 2 + playbooks/roles/supervisor/meta/main.yml | 52 +++++++++++++++++++ playbooks/roles/supervisor/tasks/main.yml | 39 ++++++++++++++ .../supervisor}/templates/supervisor.sh | 19 ++++--- .../roles/supervisor/templates/supervisor.yml | 35 +++++++++++++ playbooks/roles/supervisor/tests/inventory | 2 + playbooks/roles/supervisor/tests/test.yml | 5 ++ playbooks/roles/supervisor/vars/main.yml | 6 +++ playbooks/templates/supervisor.yml | 30 ----------- playbooks/vars/main.yml | 4 -- 24 files changed, 395 insertions(+), 92 deletions(-) create mode 100644 playbooks/roles/filebeat/.travis.yml create mode 100644 playbooks/roles/filebeat/README.md create mode 100644 playbooks/roles/filebeat/defaults/main.yml create mode 100644 playbooks/roles/filebeat/handlers/main.yml create mode 100644 playbooks/roles/filebeat/meta/main.yml create mode 100644 playbooks/roles/filebeat/tasks/main.yml rename playbooks/{ => roles/filebeat}/templates/filebeat-gateway-nginx-template.yml (100%) create mode 100644 playbooks/roles/filebeat/tests/inventory create mode 100644 playbooks/roles/filebeat/tests/test.yml create mode 100644 playbooks/roles/filebeat/vars/main.yml create mode 100644 playbooks/roles/supervisor/.travis.yml create mode 100644 playbooks/roles/supervisor/README.md create mode 100644 playbooks/roles/supervisor/defaults/main.yml create mode 100644 playbooks/roles/supervisor/handlers/main.yml create mode 100644 playbooks/roles/supervisor/meta/main.yml create mode 100644 playbooks/roles/supervisor/tasks/main.yml rename playbooks/{ => roles/supervisor}/templates/supervisor.sh (88%) create mode 100644 playbooks/roles/supervisor/templates/supervisor.yml create mode 100644 playbooks/roles/supervisor/tests/inventory create mode 100644 playbooks/roles/supervisor/tests/test.yml create mode 100644 playbooks/roles/supervisor/vars/main.yml delete mode 100644 playbooks/templates/supervisor.yml delete mode 100644 playbooks/vars/main.yml diff --git a/playbooks/install_filebeat.yml b/playbooks/install_filebeat.yml index 98dddc2..0007fe8 100644 --- a/playbooks/install_filebeat.yml +++ b/playbooks/install_filebeat.yml @@ -1,53 +1,8 @@ - name: "Install Filebeat Instance <{{ instance_name }}>" hosts: filebeats - tasks: - - name: Install Filebeat - ansible.builtin.unarchive: - src: "{{ filebeat_download_url }}" - dest: "/data/opt/filebeat/{{ instance_name }}" - remote_src: yes - extra_opts: - - --strip-components=1 + roles: + - filebeat + - supervisor - - name: Install Supervisor - ansible.builtin.pip: - name: supervisor - executable: "{{ pip_bin_path }}" - - - name: Render Filebeat Configure File - ansible.builtin.template: - src: filebeat.yml - dest: "/data/opt/filebeat/{{ instance_name }}/filebeat.yml" - owner: root - group: root - mode: '0640' - - - name: Render Supervisor Configure File - ansible.builtin.template: - src: supervisor.yml - dest: "/data/opt/filebeat/filebeat_{{ instance_name }}/supervisor.yml" - owner: root - group: root - mode: '0750' - vars: - work_path: "/data/opt/filebeat/filebeat_{{ instance_name }}" - - - name: Render Supervisor SystemV Script - ansible.builtin.template: - src: supervisor.sh - dest: "/etc/init.d/filebeat_{{ instance_name }}" - owner: root - group: root - mode: '0750' - vars: - config_file_path: "/data/opt/filebeat/filebeat_{{ instance_name }}/supervisor.yml" - work_path: "/data/opt/filebeat/filebeat_{{ instance_name }}" - - - name: Start Filebeat Service - ansible.builtin.service: - name: "filebeat_{{ instance_name }}" - state: restarted - enabled: true - diff --git a/playbooks/roles/filebeat/.travis.yml b/playbooks/roles/filebeat/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/playbooks/roles/filebeat/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/playbooks/roles/filebeat/README.md b/playbooks/roles/filebeat/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/playbooks/roles/filebeat/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/playbooks/roles/filebeat/defaults/main.yml b/playbooks/roles/filebeat/defaults/main.yml new file mode 100644 index 0000000..4a9a7a6 --- /dev/null +++ b/playbooks/roles/filebeat/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for filebeat diff --git a/playbooks/roles/filebeat/handlers/main.yml b/playbooks/roles/filebeat/handlers/main.yml new file mode 100644 index 0000000..40c1d20 --- /dev/null +++ b/playbooks/roles/filebeat/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for filebeat diff --git a/playbooks/roles/filebeat/meta/main.yml b/playbooks/roles/filebeat/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/playbooks/roles/filebeat/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/playbooks/roles/filebeat/tasks/main.yml b/playbooks/roles/filebeat/tasks/main.yml new file mode 100644 index 0000000..304590e --- /dev/null +++ b/playbooks/roles/filebeat/tasks/main.yml @@ -0,0 +1,38 @@ +--- +- name: Make Work directory + ansible.builtin.file: + path: "{{ work_path }}" + owner: filebeat + group: filebeat + state: directory + mode: '0755' + +- name: Create Filebeat Group + ansible.builtin.group: + name: filebeat + state: present + gid: 1802 + +- name: Create Filebeat User + ansible.builtin.user: + name: filebeat + group: filebeat + shell: /sbin/nologin + state: present + uid: 1802 + +- name: Install Filebeat + ansible.builtin.unarchive: + src: "{{ filebeat_download_url }}" + dest: "{{ work_path }}" + remote_src: yes + extra_opts: + - --strip-components=1 + +- name: Render Filebeat Configure File + ansible.builtin.template: + src: filebeat-gateway-nginx-template.yml + dest: "{{ work_path }}/filebeat.yml" + owner: root + group: root + mode: '0644' \ No newline at end of file diff --git a/playbooks/templates/filebeat-gateway-nginx-template.yml b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml similarity index 100% rename from playbooks/templates/filebeat-gateway-nginx-template.yml rename to playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml diff --git a/playbooks/roles/filebeat/tests/inventory b/playbooks/roles/filebeat/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/playbooks/roles/filebeat/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/playbooks/roles/filebeat/tests/test.yml b/playbooks/roles/filebeat/tests/test.yml new file mode 100644 index 0000000..12223ca --- /dev/null +++ b/playbooks/roles/filebeat/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - filebeat diff --git a/playbooks/roles/filebeat/vars/main.yml b/playbooks/roles/filebeat/vars/main.yml new file mode 100644 index 0000000..61270ff --- /dev/null +++ b/playbooks/roles/filebeat/vars/main.yml @@ -0,0 +1,5 @@ +--- +# 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 diff --git a/playbooks/roles/supervisor/.travis.yml b/playbooks/roles/supervisor/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/playbooks/roles/supervisor/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/playbooks/roles/supervisor/README.md b/playbooks/roles/supervisor/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/playbooks/roles/supervisor/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/playbooks/roles/supervisor/defaults/main.yml b/playbooks/roles/supervisor/defaults/main.yml new file mode 100644 index 0000000..f9d0587 --- /dev/null +++ b/playbooks/roles/supervisor/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for supervisor diff --git a/playbooks/roles/supervisor/handlers/main.yml b/playbooks/roles/supervisor/handlers/main.yml new file mode 100644 index 0000000..c9b6637 --- /dev/null +++ b/playbooks/roles/supervisor/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for supervisor diff --git a/playbooks/roles/supervisor/meta/main.yml b/playbooks/roles/supervisor/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/playbooks/roles/supervisor/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/playbooks/roles/supervisor/tasks/main.yml b/playbooks/roles/supervisor/tasks/main.yml new file mode 100644 index 0000000..5b2b97c --- /dev/null +++ b/playbooks/roles/supervisor/tasks/main.yml @@ -0,0 +1,39 @@ +--- +# tasks file for supervisor +- name: Install Supervisor + ansible.builtin.pip: + name: supervisor + executable: "{{ pip_bin_path }}" + +- name: Render Supervisor Configure File + ansible.builtin.template: + src: supervisor.yml + dest: "{{ work_path }}/supervisor.yml" + owner: root + group: root + mode: '0750' + +- name: Render Supervisor SystemV Script + ansible.builtin.template: + src: supervisor.sh + dest: "{{ work_path }}/supervisor_initd.sh" + owner: root + group: root + mode: '0750' + vars: + config_file_path: "{{ work_path }}/supervisor.yml" + +- name: Symlink SystemV Script + ansible.builtin.file: + src: "{{ work_path }}/supervisor_initd.sh" + dest: "/etc/init.d/filebeat_{{ instance_name }}" + owner: "root" + state: link + +- name: Start Filebeat Service + ansible.builtin.service: + name: "filebeat_{{ instance_name }}" + state: restarted + enabled: true + sleep: 30 + use: sysvinit \ No newline at end of file diff --git a/playbooks/templates/supervisor.sh b/playbooks/roles/supervisor/templates/supervisor.sh similarity index 88% rename from playbooks/templates/supervisor.sh rename to playbooks/roles/supervisor/templates/supervisor.sh index 830b914..f59089a 100644 --- a/playbooks/templates/supervisor.sh +++ b/playbooks/roles/supervisor/templates/supervisor.sh @@ -1,11 +1,13 @@ #!/bin/bash +# chkconfig: 345 83 04 + set -o nounset . /etc/rc.d/init.d/functions RETVAL=0 -PIDFILE="{{ work_path }}/supervisord.pid" -LOCKFILE="{{ work_path }}/supervisord.lock" +PIDFILE="/tmp/supervisord_{{instance_name}}.pid" +LOCKFILE="/tmp/supervisord.lock" OPTIONS="-c {{ config_file_path }}" WAIT_FOR_SUBPROCESSES="yes" @@ -13,7 +15,7 @@ start() { echo "Starting supervisord: " if [ -e $PIDFILE ]; then echo "ALREADY STARTED" - return 1 + return 0 fi {{ python_bin_dir }}/supervisord $OPTIONS @@ -24,6 +26,7 @@ start() { } stop() { + total_sleep=0 echo -n "Stopping supervisord: " {{ python_bin_dir }}/supervisorctl $OPTIONS shutdown if [ -n "$WAIT_FOR_SUBPROCESSES" ]; then @@ -33,7 +36,7 @@ stop() { echo "Supervisord exited as expected in under $total_sleep seconds" break else - if [[ $sleep -eq "last" ]] ; then + if [[ $sleep == "last" ]] ; then echo "Supervisord still working on shutting down. We've waited roughly 60 seconds, we'll let it do its thing from here" return 1 else @@ -63,16 +66,12 @@ case "$1" in stop RETVAL=$? ;; - restart|force-reload) - restart - RETVAL=$? - ;; reload) /usr/bin/supervisorctl $OPTIONS reload RETVAL=$? ;; - condrestart) - [ -f $LOCKFILE ] && restart + restart) + [ -f $LOCKFILE ] && restart || start RETVAL=$? ;; status) diff --git a/playbooks/roles/supervisor/templates/supervisor.yml b/playbooks/roles/supervisor/templates/supervisor.yml new file mode 100644 index 0000000..11cb6fb --- /dev/null +++ b/playbooks/roles/supervisor/templates/supervisor.yml @@ -0,0 +1,35 @@ +[supervisord] +logfile = /tmp/supervisord_{{instance_name}}.log +logfile_maxbytes = 50MB +logfile_backups=5 +loglevel = debug +pidfile = /tmp/supervisord_{{instance_name}}.pid +nodaemon = false +minfds = 1024 +minprocs = 200 +umask = 022 +user = filebeat +identifier = supervisor_{{instance_name}} +directory = {{ work_path }} +nocleanup = true +strip_ansi = false + +[unix_http_server] +file = /tmp/supervisord_{{instance_name}}.sock +chmod = 0777 +chown = filebeat:filebeat +username = filebeat +password = eNlB.UlOrJAnA + +[program:filebeat_{{instance_name}}] +command={{ work_path }}/filebeat -c {{ work_path }}/filebeat.yml +autorestart=true + +[supervisorctl] +serverurl = unix:///tmp/supervisord_{{instance_name}}.sock +username = filebeat +password = eNlB.UlOrJAnA +prompt = filebeat_{{instance_name}} + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface \ No newline at end of file diff --git a/playbooks/roles/supervisor/tests/inventory b/playbooks/roles/supervisor/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/playbooks/roles/supervisor/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/playbooks/roles/supervisor/tests/test.yml b/playbooks/roles/supervisor/tests/test.yml new file mode 100644 index 0000000..faaf7b6 --- /dev/null +++ b/playbooks/roles/supervisor/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - supervisor diff --git a/playbooks/roles/supervisor/vars/main.yml b/playbooks/roles/supervisor/vars/main.yml new file mode 100644 index 0000000..9fcbee7 --- /dev/null +++ b/playbooks/roles/supervisor/vars/main.yml @@ -0,0 +1,6 @@ +--- +# vars file for supervisor +pip_bin_path: "/data/opt/python3/bin/pip" +python_bin_dir: "/data/opt/python3/bin" +work_path: "/data/opt/filebeat/{{ instance_name }}" + diff --git a/playbooks/templates/supervisor.yml b/playbooks/templates/supervisor.yml deleted file mode 100644 index 20892c7..0000000 --- a/playbooks/templates/supervisor.yml +++ /dev/null @@ -1,30 +0,0 @@ -[supervisord] -logfile = /var/log/supervisord_{{instance_name}}.log -logfile_maxbytes = 50MB -logfile_backups=5 -loglevel = info -pidfile = {{ work_path }}/supervisord.pid -nodaemon = false -minfds = 1024 -minprocs = 200 -umask = 022 -user = filebeat -identifier = supervisor_{{instance_name}} -directory = {{ work_path }} -nocleanup = true -strip_ansi = false - -[unix_http_server] -file = /tmp/supervisor_{{instance_name}}.sock -chmod = 0777 -chown= nobody:nogroup -username = filebeat -password = eNlB.UlOrJAnA - -[program:example] - -[supervisorctl] -serverurl = unix:///tmp/supervisor_{{instance_name}}.sock -username = filebeat -password = eNlB.UlOrJAnA -prompt = supervisor_{{instance_name}} \ No newline at end of file diff --git a/playbooks/vars/main.yml b/playbooks/vars/main.yml deleted file mode 100644 index bb8adb1..0000000 --- a/playbooks/vars/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz" -pip_bin_path: "/data/opt/python3/bin/pip" -python_bin_dir: "/data/opt/python3/bin" -