External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

more external logging unit test fixups

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-08 14:43:03 -04:00
committed by Christian Adams
parent 39648b4f0b
commit f7dac8e68d
3 changed files with 101 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/tests/functional/api/test_settings.py
View File

@@ -255,6 +255,7 @@ def _mock_logging_defaults():
value = settings_registry.get_setting_field(key).get_default() value = settings_registry.get_setting_field(key).get_default()
setattr(mock_settings_obj, key, value) setattr(mock_settings_obj, key, value)
mock_settings_json[key] = value mock_settings_json[key] = value
setattr(mock_settings_obj, 'MAX_EVENT_RES_DATA', 700000)
return mock_settings_obj, mock_settings_json return mock_settings_obj, mock_settings_json

139
awx/main/tests/unit/api/test_logger.py
View File

@@ -36,44 +36,105 @@ data_loggly = {
# name this whatever you want # name this whatever you want
@pytest.mark.parametrize( @pytest.mark.parametrize(
'enabled, type, host, port, protocol, expected_config', [ 'enabled, type, host, port, protocol, expected_config', [
(True, 'loggly', 'http://logs-01.loggly.com/inputs/1fd38090-2af1-4e1e-8d80-492899da0f71/tag/http/', None, 'https', (
'''$IncludeConfig /etc/rsyslog.conf\ninput(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") True,
template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp") 'loggly',
action(type="omhttp" server="logs-01.loggly.com" serverport="80" usehttps="off" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" ''' + 'http://logs-01.loggly.com/inputs/1fd38090-2af1-4e1e-8d80-492899da0f71/tag/http/',
'errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="inputs/1fd38090-2af1-4e1e-8d80-492899da0f71/tag/http/")'), None,
(True, 'other', 'localhost', 9000, 'udp', 'https',
'''$IncludeConfig /etc/rsyslog.conf '\n'.join([
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") 'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
template(name="awx" type="string" string="%msg%") 'action(type="omhttp" server="logs-01.loggly.com" serverport="80" usehttps="off" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="inputs/1fd38090-2af1-4e1e-8d80-492899da0f71/tag/http/")', # noqa
action(type="omfwd" target="localhost" port="9000" protocol="udp" action.resumeRetryCount="-1" template="awx")'''), ])
(True, 'other', 'localhost', 9000, 'tcp', ),
'''$IncludeConfig /etc/rsyslog.conf (
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") True, # localhost w/ custom UDP port
template(name="awx" type="string" string="%msg%") 'other',
action(type="omfwd" target="localhost" port="9000" protocol="tcp" action.resumeRetryCount="-1" template="awx")'''), 'localhost',
(False, 'loggly', 'http://logs-01.loggly.com/inputs/1fd38090-2af1-4e1e-8d80-492899da0f71/tag/http/', 8080, 'https', 9000,
'''$IncludeConfig /etc/rsyslog.conf'''), 'udp',
(True, 'splunk', 'https://yoursplunk:8088/services/collector/event', None, None, '\n'.join([
'''$IncludeConfig /etc/rsyslog.conf 'template(name="awx" type="string" string="%msg%")',
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") 'action(type="omfwd" target="localhost" port="9000" protocol="udp" action.resumeRetryCount="-1" template="awx")', # noqa
template(name="awx" type="string" string="%msg%") ])
module(load="omhttp") ),
action(type="omhttp" server="yoursplunk" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" ''' + (
'errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")'), True, # localhost w/ custom TCP port
(True, 'splunk', 'https://yoursplunk/services/collector/event', 8088, None, 'other',
'''$IncludeConfig /etc/rsyslog.conf 'localhost',
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") 9000,
template(name="awx" type="string" string="%msg%") 'tcp',
module(load="omhttp") '\n'.join([
action(type="omhttp" server="yoursplunk" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" ''' + 'template(name="awx" type="string" string="%msg%")',
'errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")'), 'action(type="omfwd" target="localhost" port="9000" protocol="tcp" action.resumeRetryCount="-1" template="awx")', # noqa
(True, 'splunk', 'https://yoursplunk/services/collector/event', 8088, 'https', ])
'''$IncludeConfig /etc/rsyslog.conf ),
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") (
template(name="awx" type="string" string="%msg%") True, # https, default port 443
module(load="omhttp") 'splunk',
action(type="omhttp" server="yoursplunk" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" ''' + 'https://yoursplunk/services/collector/event',
'errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")'), None,
None,
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk" serverport="443" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
(
True, # http, default port 80
'splunk',
'http://yoursplunk/services/collector/event',
None,
None,
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk" serverport="80" usehttps="off" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
(
True, # https, custom port in URL string
'splunk',
'https://yoursplunk:8088/services/collector/event',
None,
None,
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
(
True, # https, custom port explicitly specified
'splunk',
'https://yoursplunk/services/collector/event',
8088,
None,
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
(
True, # no scheme specified in URL, default to https, respect custom port
'splunk',
'yoursplunk.org/services/collector/event',
8088,
'https',
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk.org" serverport="8088" usehttps="on" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
(
True, # respect custom http-only port
'splunk',
'http://yoursplunk.org/services/collector/event',
8088,
None,
'\n'.join([
'template(name="awx" type="string" string="%msg%")\nmodule(load="omhttp")',
'action(type="omhttp" server="yoursplunk.org" serverport="8088" usehttps="off" skipverifyhost="off" action.resumeRetryCount="-1" template="awx" errorfile="/var/log/tower/external.err" healthchecktimeout="20000" restpath="services/collector/event")', # noqa
])
),
] ]
) )
def test_rsyslog_conf_template(enabled, type, host, port, protocol, expected_config): def test_rsyslog_conf_template(enabled, type, host, port, protocol, expected_config):
@@ -96,4 +157,4 @@ def test_rsyslog_conf_template(enabled, type, host, port, protocol, expected_con
tmpl = construct_rsyslog_conf_template(mock_settings) tmpl = construct_rsyslog_conf_template(mock_settings)
# check validity of created template # check validity of created template
assert tmpl in expected_config assert expected_config in tmpl

1
awx/main/utils/external_logging.py
View File

@@ -67,7 +67,6 @@ def construct_rsyslog_conf_template(settings=settings):
parts.append( parts.append(
f'action(type="omfwd" target="{host}" port="{port}" protocol="{protocol}" action.resumeRetryCount="-1" template="awx")' # noqa f'action(type="omfwd" target="{host}" port="{port}" protocol="{protocol}" action.resumeRetryCount="-1" template="awx")' # noqa
) )
# parts.append('$IncludeConfig /var/lib/awx/rsyslog/*.conf')
tmpl = '\n'.join(parts) tmpl = '\n'.join(parts)
return tmpl return tmpl