-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Add selected_message_queues
flag to filter message queues and improve performances
#12808
Merged
Merged
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
c8ab31f
Add selected_message_queues flag
amenasria 97e5441
Fix formatting issue
amenasria aee17fc
Fix specs and example conf file
amenasria 1388fce
Fix models for linter
amenasria 5fc95a1
Adding noqa:E501 comments to silence flake8 and keep readability
amenasria 3682dd2
Fix Black linter
amenasria c27507b
Changed configuration structure
amenasria 5c6a6a3
Fix space in sql query more consistency
amenasria 71bdde7
Testing using InstanceConfig
amenasria f5ad13f
Fix tests
amenasria 37a24c1
Fix typos
amenasria 6174dcb
Fix typos
amenasria b1ff2ef
Remove immutable objects
amenasria b490ac1
Enhance documentation
amenasria 5fe81eb
Sync conf.yaml.example file
amenasria bbd23ee
Typos just keep appearing
amenasria a95bd70
Yet another typo
amenasria 7e9f71f
Use pytest parametrize
amenasria 39c9481
Fix style for linter
amenasria f8ddbea
Fix linter
amenasria File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# (C) Datadog, Inc. 2021-present | ||
# All rights reserved | ||
# Licensed under a 3-clause BSD style license (see LICENSE) | ||
|
||
from datadog_checks.ibm_i.config_models import InstanceConfig | ||
from datadog_checks.ibm_i.config_models.instance import MessageQueueInfo | ||
from datadog_checks.ibm_i.queries import query_map | ||
|
||
|
||
def test_get_message_queue_info(): | ||
amenasria marked this conversation as resolved.
Show resolved
Hide resolved
|
||
instance_conf_attr = { | ||
"query_timeout": 1, | ||
"job_query_timeout": 2, | ||
"system_mq_query_timeout": 3, | ||
"severity_threshold": 50, | ||
} | ||
instance_conf = InstanceConfig( | ||
**instance_conf_attr, | ||
message_queue_info=MessageQueueInfo(selected_message_queues=[]), | ||
) | ||
qmap_output = query_map(instance_conf) | ||
assert qmap_output['message_queue_info']['name'] == 'message_queue_info' | ||
assert qmap_output['message_queue_info']['columns'] == [ | ||
{'name': 'message_queue_name', 'type': 'tag'}, | ||
{'name': 'message_queue_library', 'type': 'tag'}, | ||
{'name': 'ibm_i.message_queue.size', 'type': 'gauge'}, | ||
{'name': 'ibm_i.message_queue.critical_size', 'type': 'gauge'}, | ||
] | ||
assert qmap_output['message_queue_info']['query']['text'] == ( | ||
'SELECT MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY, COUNT(*), SUM(CASE WHEN SEVERITY >= 50 THEN 1 ELSE 0 END) ' # noqa:E501 | ||
'FROM QSYS2.MESSAGE_QUEUE_INFO GROUP BY MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY' | ||
) | ||
assert qmap_output['message_queue_info']['query']['timeout'] == 3 | ||
instance_conf = InstanceConfig( | ||
**instance_conf_attr, | ||
message_queue_info=MessageQueueInfo(selected_message_queues=['QSYSOPR']), | ||
) | ||
qmap_output = query_map(instance_conf) | ||
assert qmap_output['message_queue_info']['query']['text'] == ( | ||
'SELECT MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY, COUNT(*), SUM(CASE WHEN SEVERITY >= 50 THEN 1 ELSE 0 END) ' | ||
'FROM QSYS2.MESSAGE_QUEUE_INFO WHERE MESSAGE_QUEUE_NAME IN (\'QSYSOPR\') GROUP BY MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY' # noqa:E501 | ||
) | ||
instance_conf = InstanceConfig( | ||
**instance_conf_attr, | ||
message_queue_info=MessageQueueInfo(selected_message_queues=['QSYSOPR', 'QPGMR', 'CECUSER']), | ||
) | ||
qmap_output = query_map(instance_conf) | ||
assert qmap_output['message_queue_info']['query']['text'] == ( | ||
'SELECT MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY, COUNT(*), SUM(CASE WHEN SEVERITY >= 50 THEN 1 ELSE 0 END) ' | ||
'FROM QSYS2.MESSAGE_QUEUE_INFO WHERE MESSAGE_QUEUE_NAME IN (\'QSYSOPR\', \'QPGMR\', \'CECUSER\') GROUP BY MESSAGE_QUEUE_NAME, MESSAGE_QUEUE_LIBRARY' # noqa:E501 | ||
) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add some tests for this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right ! I just finished adding them ! PTAL