Skip to content

Commit 642d3bc

Browse files
authored
Reduce log verbosity level for unverified HTTP requests. (#19791)
* Reduce log verbosity level for unverified HTTP requests. * add changelog
1 parent 47c5e75 commit 642d3bc

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Reduce log verbosity level for unverified HTTP requests. WARNING level spams a lot with no evidence that users pay attention. DEBUG will be useful for support cases.

datadog_checks_base/datadog_checks/base/checks/prometheus/mixins.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ def poll(self, endpoint, pFormat=PrometheusFormat.PROTOBUF, headers=None, instan
569569
and not handler.ignore_tls_warning
570570
and not is_affirmative(handler.options.get('ssl_verify', True))
571571
):
572-
self.log.warning(u'An unverified HTTPS request is being made to %s', endpoint)
572+
self.log.debug(u'An unverified HTTPS request is being made to %s', endpoint)
573573

574574
try:
575575
response = handler.get(endpoint, extra_headers=headers, stream=False)

datadog_checks_base/datadog_checks/base/utils/http.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ def _request(self, method, url, options):
394394
new_options = self.populate_options(options)
395395

396396
if url.startswith('https') and not self.ignore_tls_warning and not new_options['verify']:
397-
self.logger.warning(u'An unverified HTTPS request is being made to %s', url)
397+
self.logger.debug(u'An unverified HTTPS request is being made to %s', url)
398398

399399
extra_headers = options.pop('extra_headers', None)
400400
if extra_headers is not None:

datadog_checks_base/tests/base/utils/http/test_tls_and_certs.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ def test_default_no_ignore(self, caplog):
7676

7777
expected_message = 'An unverified HTTPS request is being made to https://www.google.com'
7878
for _, level, message in caplog.record_tuples:
79-
if level == logging.WARNING and message == expected_message:
79+
if level == logging.DEBUG and message == expected_message:
8080
break
8181
else:
82-
raise AssertionError('Expected WARNING log with message `{}`'.format(expected_message))
82+
raise AssertionError('Expected DEBUG log with message `{}`'.format(expected_message))
8383

8484
def test_default_no_ignore_http(self, caplog):
8585
instance = {}
@@ -113,10 +113,10 @@ def test_default_no_ignore_session(self, caplog):
113113

114114
expected_message = 'An unverified HTTPS request is being made to https://www.google.com'
115115
for _, level, message in caplog.record_tuples:
116-
if level == logging.WARNING and message == expected_message:
116+
if level == logging.DEBUG and message == expected_message:
117117
break
118118
else:
119-
raise AssertionError('Expected WARNING log with message `{}`'.format(expected_message))
119+
raise AssertionError('Expected DEBUG log with message `{}`'.format(expected_message))
120120

121121
def test_ignore_session(self, caplog):
122122
instance = {'tls_ignore_warning': True, 'persist_connections': True}
@@ -152,10 +152,10 @@ def test_default_init_no_ignore(self, caplog):
152152

153153
expected_message = 'An unverified HTTPS request is being made to https://www.google.com'
154154
for _, level, message in caplog.record_tuples:
155-
if level == logging.WARNING and message == expected_message:
155+
if level == logging.DEBUG and message == expected_message:
156156
break
157157
else:
158-
raise AssertionError('Expected WARNING log with message `{}`'.format(expected_message))
158+
raise AssertionError('Expected DEBUG log with message `{}`'.format(expected_message))
159159

160160
def test_instance_ignore(self, caplog):
161161
instance = {'tls_ignore_warning': True}
@@ -179,10 +179,10 @@ def test_instance_no_ignore(self, caplog):
179179

180180
expected_message = 'An unverified HTTPS request is being made to https://www.google.com'
181181
for _, level, message in caplog.record_tuples:
182-
if level == logging.WARNING and message == expected_message:
182+
if level == logging.DEBUG and message == expected_message:
183183
break
184184
else:
185-
raise AssertionError('Expected WARNING log with message `{}`'.format(expected_message))
185+
raise AssertionError('Expected DEBUG log with message `{}`'.format(expected_message))
186186

187187

188188
class TestAIAChasing:

0 commit comments

Comments
 (0)