Skip to content

Commit 76b58b3

Browse files
committed
fix: spacing issues, clean up instructions role
1 parent e46bb36 commit 76b58b3

File tree

2 files changed

+38
-29
lines changed

2 files changed

+38
-29
lines changed

install/roles/fluentd/tasks/main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848

4949
- name: Add Fluentd repository
5050
ansible.builtin.apt_repository:
51-
repo: >-
52-
deb https://packages.treasuredata.com/4/{{ ansible_distribution | lower }}/{{ ansible_distribution_release }}/
53-
{{ ansible_distribution_release }} contrib
54-
state: present
55-
filename: fluentd
51+
repo: >-
52+
deb https://packages.treasuredata.com/4/{{ ansible_distribution | lower }}/{{ ansible_distribution_release }}/
53+
{{ ansible_distribution_release }} contrib
54+
state: present
55+
filename: fluentd
5656

5757
- name: Install fluentd
5858
ansible.builtin.apt:
@@ -95,24 +95,24 @@
9595
line: 'subjectAltName = "IP: {{ ansible_default_ipv4.address }}"'
9696
regexp: '^ Extensions for a typical CA'
9797
insertbefore: '# Extensions for a typical CA'
98-
backup: yes
98+
backup: true
9999
when: subject_alt_name_exists.stdout | int == 0
100100

101101
- name: Install fluentd elasticsearch plugin
102102
community.general.gem:
103103
name: fluent-plugin-elasticsearch
104104
state: latest
105-
include_dependencies: yes
106-
user_install: no
105+
include_dependencies: true
106+
user_install: false
107107
executable: /usr/sbin/td-agent-gem
108108
become: true
109109

110110
- name: Install fluentd beats plugin
111111
community.general.gem:
112112
name: fluent-plugin-beats
113113
state: latest
114-
include_dependencies: yes
115-
user_install: no
114+
include_dependencies: true
115+
user_install: false
116116
executable: /usr/sbin/td-agent-gem
117117
become: true
118118

install/roles/instructions/tasks/main.yml

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,52 @@
44
#
55

66
- name: Print SSL certificate post-setup information
7-
debug: msg="Filebeat SSL Certificate available at http://{{ ansible_fqdn }}:{{ elk_server_ssl_cert_port }}/beat-forwarder.crt"
8-
when: (logging_backend != 'fluentd')
7+
debug:
8+
msg: "Filebeat SSL Certificate available at http://{{ ansible_fqdn }}:{{ elk_server_ssl_cert_port }}/beat-forwarder.crt"
9+
when: logging_backend != 'fluentd'
910

1011
- name: Print SSL key post-setup information
11-
debug: msg="Filebeat SSL Certificate key is located at http://{{ ansible_fqdn }}:{{ elk_server_ssl_cert_port }}/beat-forwarder.key"
12-
when: (logging_backend != 'fluentd')
12+
debug:
13+
msg: "Filebeat SSL Certificate key is located at http://{{ ansible_fqdn }}:{{ elk_server_ssl_cert_port }}/beat-forwarder.key"
14+
when: logging_backend != 'fluentd'
1315

1416
- name: Print post-setup URL for Apache
15-
debug: msg="*** ELK Services available at http://{{ ansible_fqdn }}:{{ www_kibana_port }}/kibana ***"
16-
when: apache_reverse_proxy|bool
17+
debug:
18+
msg: "*** ELK Services available at http://{{ ansible_fqdn }}:{{ www_kibana_port }}/kibana ***"
19+
when: apache_reverse_proxy | bool
1720

1821
- name: Print post-setup URL for nginx
19-
debug: msg="*** ELK Services available at http://{{ ansible_fqdn }}:{{ www_kibana_port }} ***"
20-
when: apache_reverse_proxy|bool
22+
debug:
23+
msg: "*** ELK Services available at http://{{ ansible_fqdn }}:{{ www_kibana_port }} ***"
24+
when: apache_reverse_proxy | bool
2125

2226
- name: Print index creation instructions
23-
debug: msg="*** 1) Navigate to http://{{ ansible_fqdn }}:{{ www_kibana_port }} and login with {{kibana_user}}/{{kibana_password}} ***"
27+
debug:
28+
msg: "*** 1) Navigate to http://{{ ansible_fqdn }}:{{ www_kibana_port }} and login with {{ kibana_user }}/{{ kibana_password }} ***"
2429

2530
- name: Print X-Pack instructions
26-
debug: msg="*** 1A) (X-Pack only) Kibana account credentials login with elastic/{{xpack_elastic_user_password}} ***"
27-
when: install_kibana_xpack|bool
31+
debug:
32+
msg: "*** 1A) (X-Pack only) Kibana account credentials login with elastic/{{ xpack_elastic_user_password }} ***"
33+
when: install_kibana_xpack | bool
2834

2935
- name: Print index creation more instructions
30-
debug: msg="*** 2) Navigate to Discover (left-hand corner) --> Kibana (index patterns) ***"
36+
debug:
37+
msg: "*** 2) Navigate to Discover (left-hand corner) --> Kibana (index patterns) ***"
3138

3239
- name: Print index creation more instructions
33-
debug: msg="*** 3) Type logstash-* into the index creation name and click Next ***"
40+
debug:
41+
msg: "*** 3) Type logstash-* into the index creation name and click Next ***"
3442

3543
- name: Print Index creation more instructions
36-
debug: msg="*** 4) Select '@timestamp' under 'Time-field name' and Create Index Pattern ***"
44+
debug:
45+
msg: "*** 4) Select '@timestamp' under 'Time-field name' and Create Index Pattern ***"
3746

3847
- name: Print Navigation Instructions
39-
debug: msg="*** 5) Click on Discover ***"
48+
debug:
49+
msg: "*** 5) Click on Discover ***"
4050

4151
- name: Print filebeat client setup instructions
4252
debug:
43-
"msg": [
44-
"*** 6) ansible-playbook -i hosts install/elk_client.yml --extra-vars 'elk_server={{ ansible_default_ipv4.address }}' to setup clients",
45-
"*** To add new clients later, running only this command above is needed ***"
46-
]
53+
msg:
54+
- "*** 6) ansible-playbook -i hosts install/elk_client.yml --extra-vars 'elk_server={{ ansible_default_ipv4.address }}' to setup clients"
55+
- "*** To add new clients later, running only this command above is needed ***"

0 commit comments

Comments
 (0)