Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use SSL authentication if SSL params are provided #8531

Merged
merged 7 commits into from
Feb 8, 2021
Merged

Use SSL authentication if SSL params are provided #8531

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0bf886c
Raise config options if incorrect ssl configuration
hithwen Feb 4, 2021
56ba875
Update ibm_mq/datadog_checks/ibm_mq/config.py
hithwen Feb 4, 2021
417fc4a
Style fix
hithwen Feb 4, 2021
4dcf014
Use SSL if SSL options are provided
hithwen Feb 5, 2021
aa11bf9
Merge remote-tracking branch 'origin/master' into julia/ibm-mq-ssl-wa…
hithwen Feb 8, 2021
1a20414
Style fix
hithwen Feb 8, 2021
8dcc529
Do not override if specificly disabled
hithwen Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions ibm_mq/datadog_checks/ibm_mq/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# Licensed under a 3-clause BSD style license (see LICENSE)

import datetime as dt
import logging
import re

from dateutil.tz import UTC
from six import iteritems

from datadog_checks.base import AgentCheck, ConfigurationError, is_affirmative
from datadog_checks.base.constants import ServiceCheck
from datadog_checks.base.log import get_check_logger

try:
from typing import Dict, List, Pattern
Expand All @@ -24,9 +24,6 @@
pymqi = None


log = logging.getLogger(__file__)


class IBMMQConfig:
"""
A config object. Parse the instance and return it as an object that can be passed around
Expand All @@ -44,6 +41,7 @@ class IBMMQConfig:
]

def __init__(self, instance):
self.log = get_check_logger()
self.channel = instance.get('channel') # type: str
self.queue_manager_name = instance.get('queue_manager', 'default') # type: str

Expand Down Expand Up @@ -79,7 +77,7 @@ def __init__(self, instance):
) # type: bool

if int(self.auto_discover_queues) + int(bool(self.queue_patterns)) + int(bool(self.queue_regex)) > 1:
log.warning(
self.log.warning(
"Configurations auto_discover_queues, queue_patterns and queue_regex are not intended to be used "
"together."
)
Expand All @@ -102,14 +100,21 @@ def __init__(self, instance):
self.tags_no_channel = tags
self.tags = tags + ["channel:{}".format(self.channel)] # type: List[str]

# SSL options
self.ssl = is_affirmative(instance.get('ssl_auth', False)) # type: bool
self.ssl_cipher_spec = instance.get('ssl_cipher_spec', 'TLS_RSA_WITH_AES_256_CBC_SHA') # type: str

self.ssl_key_repository_location = instance.get(
'ssl_key_repository_location', '/var/mqm/ssl-db/client/KeyringClient'
) # type: str

self.ssl_certificate_label = instance.get('ssl_certificate_label') # type: str
if instance.get('ssl_auth') is None and (
instance.get('ssl_cipher_spec') or instance.get('ssl_key_repository_location') or self.ssl_certificate_label
):
self.log.info(
"ssl_auth has not been explictly enabled but other SSL options have been provided. "
"SSL will be used for connecting"
)
self.ssl = True

self.mq_installation_dir = instance.get('mq_installation_dir', '/opt/mqm/')

Expand Down Expand Up @@ -139,7 +144,7 @@ def _compile_tag_re(self):
try:
queue_tag_list.append([re.compile(regex_str), [t.strip() for t in tags.split(',')]])
except TypeError:
log.warning('%s is not a valid regular expression and will be ignored', regex_str)
self.log.warning('%s is not a valid regular expression and will be ignored', regex_str)
return queue_tag_list

@staticmethod
Expand Down