diff options
| -rw-r--r-- | hosts.astana | 2 | ||||
| -rw-r--r-- | hosts.xxg | 2 | ||||
| -rw-r--r-- | hosts.xxg.new | 2 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn0/files/rsyslog.conf | 93 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn0/files/tsg-monitor.sh | 8 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn0/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn1/files/rsyslog.conf | 93 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn1/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn2/files/rsyslog.conf | 93 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn2/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn3/files/rsyslog.conf | 93 | ||||
| -rw-r--r-- | roles/tsg-cli-mcn3/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/tsg-cli-mxn/files/rsyslog.conf | 93 | ||||
| -rw-r--r-- | roles/tsg-cli-mxn/tasks/main.yml | 7 |
14 files changed, 497 insertions, 8 deletions
diff --git a/hosts.astana b/hosts.astana index 68dbd98..54e9340 100644 --- a/hosts.astana +++ b/hosts.astana @@ -1,6 +1,6 @@ [all:vars]
ansible_user=root
-rpm_file_name=tsg-cli-1.0.6-1.el7.x86_64.rpm
+rpm_file_name=tsg-cli-1.0.9.abea4ae-1.el7.x86_64.rpm
[sled-mxn]
10.4.164.23 SN=CBT2201840103110
@@ -1,6 +1,6 @@ [all:vars]
ansible_user=root
-rpm_file_name=tsg-cli-1.0.7-1.el7.x86_64.rpm
+rpm_file_name=tsg-cli-1.0.9.abea4ae-1.el7.x86_64.rpm
[sled-mxn]
192.168.40.165 SN=CBT2201925000001
diff --git a/hosts.xxg.new b/hosts.xxg.new index f915186..0d990a0 100644 --- a/hosts.xxg.new +++ b/hosts.xxg.new @@ -1,6 +1,6 @@ [all:vars] ansible_user=root -rpm_file_name=tsg-cli-1.0.7-1.el7.x86_64.rpm +rpm_file_name=tsg-cli-1.0.9.abea4ae-1.el7.x86_64.rpm [sled-mxn] 192.168.40.25 SN=CBT2201925000002 diff --git a/roles/tsg-cli-mcn0/files/rsyslog.conf b/roles/tsg-cli-mcn0/files/rsyslog.conf new file mode 100644 index 0000000..a84716a --- /dev/null +++ b/roles/tsg-cli-mcn0/files/rsyslog.conf @@ -0,0 +1,93 @@ +# rsyslog configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +# The imjournal module bellow is now used as a message source instead of imuxsock. +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imjournal # provides access to the systemd journal +#$ModLoad imklog # reads kernel messages (the same are read from journald) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Where to place auxiliary files +$WorkDirectory /var/lib/rsyslog + +# Use default timestamp format +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$template tsgformat,"%$NOW% %TIMESTAMP:8:15% %HOSTNAME:F,45:3%:<%PRI%> [%syslogseverity-text%] %msg%\n" +$ActionFileDefaultTemplate tsgformat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + +# Turn off message reception via local log socket; +# local messages are retrieved through imjournal now. +$OmitLocalLogging on + +# File to store the position in the journal +$IMJournalStateFile imjournal.state + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.notice;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +.notice @@192.168.100.5:514 +# ### end of the forwarding rule ### diff --git a/roles/tsg-cli-mcn0/files/tsg-monitor.sh b/roles/tsg-cli-mcn0/files/tsg-monitor.sh index 13b8497..af6854a 100644 --- a/roles/tsg-cli-mcn0/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn0/files/tsg-monitor.sh @@ -13,9 +13,9 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_monit_app killall -9 -q tsg_monit_intercept killall -9 -q tsg_monit_interface - killall -9 -q tsg_monit_protocol_v3 + #killall -9 -q tsg_monit_protocol_v3 killall -9 -q tsg_monit_protocol_v4 - killall -9 -q tsg_monit_stream_v3 + #killall -9 -q tsg_monit_stream_v3 killall -9 -q tsg_monit_stream_v4 } @@ -28,9 +28,9 @@ start_background_cmd(){ /opt/tsg/tsg-monitor/tsg_monit_app > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null & - /opt/tsg/tsg-monitor/tsg_monit_protocol_v3 > /dev/null & + #/opt/tsg/tsg-monitor/tsg_monit_protocol_v3 > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_protocol_v4 > /dev/null & - /opt/tsg/tsg-monitor/tsg_monit_stream_v3 > /dev/null & + #/opt/tsg/tsg-monitor/tsg_monit_stream_v3 > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_stream_v4 > /dev/null & } diff --git a/roles/tsg-cli-mcn0/tasks/main.yml b/roles/tsg-cli-mcn0/tasks/main.yml index b4d2e9c..91be784 100644 --- a/roles/tsg-cli-mcn0/tasks/main.yml +++ b/roles/tsg-cli-mcn0/tasks/main.yml @@ -41,3 +41,7 @@ enabled: yes daemon_reload: yes +- name: "copy rsyslog.conf to destination server" + synchronize: + src: "{{ role_path }}/files/rsyslog.conf" + dest: "/etc/"
\ No newline at end of file diff --git a/roles/tsg-cli-mcn1/files/rsyslog.conf b/roles/tsg-cli-mcn1/files/rsyslog.conf new file mode 100644 index 0000000..a84716a --- /dev/null +++ b/roles/tsg-cli-mcn1/files/rsyslog.conf @@ -0,0 +1,93 @@ +# rsyslog configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +# The imjournal module bellow is now used as a message source instead of imuxsock. +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imjournal # provides access to the systemd journal +#$ModLoad imklog # reads kernel messages (the same are read from journald) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Where to place auxiliary files +$WorkDirectory /var/lib/rsyslog + +# Use default timestamp format +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$template tsgformat,"%$NOW% %TIMESTAMP:8:15% %HOSTNAME:F,45:3%:<%PRI%> [%syslogseverity-text%] %msg%\n" +$ActionFileDefaultTemplate tsgformat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + +# Turn off message reception via local log socket; +# local messages are retrieved through imjournal now. +$OmitLocalLogging on + +# File to store the position in the journal +$IMJournalStateFile imjournal.state + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.notice;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +.notice @@192.168.100.5:514 +# ### end of the forwarding rule ### diff --git a/roles/tsg-cli-mcn1/tasks/main.yml b/roles/tsg-cli-mcn1/tasks/main.yml index b564225..434209a 100644 --- a/roles/tsg-cli-mcn1/tasks/main.yml +++ b/roles/tsg-cli-mcn1/tasks/main.yml @@ -40,3 +40,8 @@ name: tsg-monitor enabled: yes daemon_reload: yes + +- name: "copy rsyslog.conf to destination server" + synchronize: + src: "{{ role_path }}/files/rsyslog.conf" + dest: "/etc/"
\ No newline at end of file diff --git a/roles/tsg-cli-mcn2/files/rsyslog.conf b/roles/tsg-cli-mcn2/files/rsyslog.conf new file mode 100644 index 0000000..a84716a --- /dev/null +++ b/roles/tsg-cli-mcn2/files/rsyslog.conf @@ -0,0 +1,93 @@ +# rsyslog configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +# The imjournal module bellow is now used as a message source instead of imuxsock. +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imjournal # provides access to the systemd journal +#$ModLoad imklog # reads kernel messages (the same are read from journald) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Where to place auxiliary files +$WorkDirectory /var/lib/rsyslog + +# Use default timestamp format +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$template tsgformat,"%$NOW% %TIMESTAMP:8:15% %HOSTNAME:F,45:3%:<%PRI%> [%syslogseverity-text%] %msg%\n" +$ActionFileDefaultTemplate tsgformat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + +# Turn off message reception via local log socket; +# local messages are retrieved through imjournal now. +$OmitLocalLogging on + +# File to store the position in the journal +$IMJournalStateFile imjournal.state + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.notice;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +.notice @@192.168.100.5:514 +# ### end of the forwarding rule ### diff --git a/roles/tsg-cli-mcn2/tasks/main.yml b/roles/tsg-cli-mcn2/tasks/main.yml index b564225..434209a 100644 --- a/roles/tsg-cli-mcn2/tasks/main.yml +++ b/roles/tsg-cli-mcn2/tasks/main.yml @@ -40,3 +40,8 @@ name: tsg-monitor enabled: yes daemon_reload: yes + +- name: "copy rsyslog.conf to destination server" + synchronize: + src: "{{ role_path }}/files/rsyslog.conf" + dest: "/etc/"
\ No newline at end of file diff --git a/roles/tsg-cli-mcn3/files/rsyslog.conf b/roles/tsg-cli-mcn3/files/rsyslog.conf new file mode 100644 index 0000000..a84716a --- /dev/null +++ b/roles/tsg-cli-mcn3/files/rsyslog.conf @@ -0,0 +1,93 @@ +# rsyslog configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +# The imjournal module bellow is now used as a message source instead of imuxsock. +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imjournal # provides access to the systemd journal +#$ModLoad imklog # reads kernel messages (the same are read from journald) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Where to place auxiliary files +$WorkDirectory /var/lib/rsyslog + +# Use default timestamp format +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$template tsgformat,"%$NOW% %TIMESTAMP:8:15% %HOSTNAME:F,45:3%:<%PRI%> [%syslogseverity-text%] %msg%\n" +$ActionFileDefaultTemplate tsgformat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + +# Turn off message reception via local log socket; +# local messages are retrieved through imjournal now. +$OmitLocalLogging on + +# File to store the position in the journal +$IMJournalStateFile imjournal.state + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.notice;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +.notice @@192.168.100.5:514 +# ### end of the forwarding rule ### diff --git a/roles/tsg-cli-mcn3/tasks/main.yml b/roles/tsg-cli-mcn3/tasks/main.yml index b564225..434209a 100644 --- a/roles/tsg-cli-mcn3/tasks/main.yml +++ b/roles/tsg-cli-mcn3/tasks/main.yml @@ -40,3 +40,8 @@ name: tsg-monitor enabled: yes daemon_reload: yes + +- name: "copy rsyslog.conf to destination server" + synchronize: + src: "{{ role_path }}/files/rsyslog.conf" + dest: "/etc/"
\ No newline at end of file diff --git a/roles/tsg-cli-mxn/files/rsyslog.conf b/roles/tsg-cli-mxn/files/rsyslog.conf new file mode 100644 index 0000000..a5127fe --- /dev/null +++ b/roles/tsg-cli-mxn/files/rsyslog.conf @@ -0,0 +1,93 @@ +# rsyslog configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +# The imjournal module bellow is now used as a message source instead of imuxsock. +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imjournal # provides access to the systemd journal +#$ModLoad imklog # reads kernel messages (the same are read from journald) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +$ModLoad imudp +$UDPServerRun 514 + +# Provides TCP syslog reception +$ModLoad imtcp +$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Where to place auxiliary files +$WorkDirectory /var/lib/rsyslog + +# Use default timestamp format +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$template tsgformat,"%$NOW% %TIMESTAMP:8:15% %HOSTNAME:F,45:3%:<%PRI%> [%syslogseverity-text%] %msg%\n" +$ActionFileDefaultTemplate tsgformat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + +# Turn off message reception via local log socket; +# local messages are retrieved through imjournal now. +$OmitLocalLogging on + +# File to store the position in the journal +$IMJournalStateFile imjournal.state + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.notice;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +#*.* @@192.168.40.165:514 +# ### end of the forwarding rule ### diff --git a/roles/tsg-cli-mxn/tasks/main.yml b/roles/tsg-cli-mxn/tasks/main.yml index 6de139d..6c53a62 100644 --- a/roles/tsg-cli-mxn/tasks/main.yml +++ b/roles/tsg-cli-mxn/tasks/main.yml @@ -34,4 +34,9 @@ systemd: name: tsg-monitor enabled: yes - daemon_reload: yes
\ No newline at end of file + daemon_reload: yes + +- name: "copy rsyslog.conf to destination server" + synchronize: + src: "{{ role_path }}/files/rsyslog.conf" + dest: "/etc/"
\ No newline at end of file |