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

Add Windows support to IBM MQ #10737

Merged
merged 49 commits into from
Dec 23, 2021
Merged

Add Windows support to IBM MQ #10737

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6517d7b
[Release] Bumped ibm_mq version to 3.16.2
hithwen Nov 26, 2021
6806f24
[Release] Update metadata
hithwen Nov 26, 2021
3ed20a7
Include dependency on windows
hithwen Nov 26, 2021
7610258
[Release] Bumped ibm_mq version to 3.16.2-beta
hithwen Nov 26, 2021
137b3a4
[Release] Update metadata
hithwen Nov 26, 2021
3aac77d
[Release] Bumped ibm_mq version to 3.16.2-beta.2
hithwen Nov 26, 2021
54a4cd4
[Release] Update metadata
hithwen Nov 26, 2021
dcbcdfe
Merge remote-tracking branch 'origin/master' into js/FRAGENT-1564-ibm…
hithwen Dec 13, 2021
bd742fe
Merge remote-tracking branch 'origin/master' into js/FRAGENT-1564-ibm…
hithwen Dec 16, 2021
6e2223e
Test in windows
hithwen Dec 16, 2021
77c7f2c
Add install instructions for windows
hithwen Dec 17, 2021
e2fe1f0
Add MQ_FILE_PATH env var to tests
hithwen Dec 17, 2021
9e7cd42
Add artificial change to make it test
hithwen Dec 17, 2021
9cec72c
Add ibm mq to list of changes to check
hithwen Dec 17, 2021
c67ae1f
Add python-dev dependency
hithwen Dec 17, 2021
0f7750f
Add python-dev in requirements-dev
hithwen Dec 17, 2021
57c2e73
Pin python-dev dependency
hithwen Dec 17, 2021
b97c7fd
fix package name
hithwen Dec 17, 2021
7615d5f
Do not run unit & integration tests on windows
hithwen Dec 17, 2021
93aedd7
Remove python-dev dependency
hithwen Dec 17, 2021
4f29b1b
Run e2e even if integration fails
hithwen Dec 17, 2021
5f041d8
Add install script
hithwen Dec 17, 2021
34e57b0
Fix bat script
hithwen Dec 17, 2021
d6eda84
Do not skip tests on windows
hithwen Dec 17, 2021
fa10050
Dir the directory
hithwen Dec 17, 2021
7603702
Provide right path to ps1 script
hithwen Dec 17, 2021
941f23c
Change dir command
hithwen Dec 17, 2021
b10175b
Use just one script
hithwen Dec 20, 2021
0c9e1c1
Add more messages to script
hithwen Dec 20, 2021
38e6cc6
Simpler download and extract script
hithwen Dec 20, 2021
65ce864
Fix variable definition
hithwen Dec 20, 2021
9d805ec
Fix variables
hithwen Dec 20, 2021
4737676
Fix string?
hithwen Dec 20, 2021
0c38008
Create directory
hithwen Dec 20, 2021
27d3d05
Fix variable
hithwen Dec 20, 2021
a2ed0db
Use drive download
hithwen Dec 20, 2021
d19c615
fix url?
hithwen Dec 20, 2021
7918306
try to fix build
ofek Dec 20, 2021
4b9a70f
migrate script to python
hithwen Dec 21, 2021
885cedf
t merge origin/master
hithwen Dec 21, 2021
9d19c25
Fix os separator in conftest
hithwen Dec 21, 2021
e1f2462
Do not install server, skip int tests on windows
hithwen Dec 21, 2021
00a4b1a
Undo pipeline changes
hithwen Dec 21, 2021
c9c174d
Run tests on py2 too
hithwen Dec 21, 2021
2826ca7
Do not run py2 on windows
hithwen Dec 21, 2021
26e7911
add back support for non-CI Windows
ofek Dec 22, 2021
b6dc116
No need to force import on common
hithwen Dec 22, 2021
eb1af7a
Merge remote-tracking branch 'origin/master' into js/FRAGENT-1564-ibm…
hithwen Dec 23, 2021
e5bb452
Merge remote-tracking branch 'origin/master' into js/FRAGENT-1564-ibm…
hithwen Dec 23, 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
2 changes: 1 addition & 1 deletion .in-toto/tag.0244aaa8.link
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datadog_checks_base/datadog_checks/base/data/agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pyhdb==0.3.4
pyjwt==1.7.1; python_version < "3.0"
pyjwt==2.0.1; python_version > "3.0"
pymongo==3.11.4
pymqi==1.12.0; sys_platform != "win32"
pymqi==1.12.0
pymysql==0.9.3
pyodbc==4.0.26
pyro4==4.73; sys_platform == "win32"
Expand Down
6 changes: 6 additions & 0 deletions ibm_mq/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG - IBM MQ

## 3.16.2-beta.2 / 2021-11-26


## 3.16.2-beta / 2021-11-26


## 3.16.1 / 2021-10-04 / Agent 7.32.0

* [Fixed] ibm mq queue pattern should have precedence over autodiscover. See [#10247](https://github.com/DataDog/integrations-core/pull/10247).
Expand Down
2 changes: 1 addition & 1 deletion ibm_mq/datadog_checks/ibm_mq/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Datadog, Inc. 2018-present
# All rights reserved
# Licensed under a 3-clause BSD style license (see LICENSE)
__version__ = '3.16.1'
__version__ = '3.16.2-beta.2'
3 changes: 2 additions & 1 deletion ibm_mq/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"support": "core",
"supported_os": [
"linux",
"mac_os"
"mac_os",
"windows"
],
"public_title": "Datadog-IBM MQ Integration",
"categories": [
Expand Down
2 changes: 1 addition & 1 deletion ibm_mq/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pymqi==1.12.0; sys_platform != 'win32'
pymqi==1.12.0
2 changes: 1 addition & 1 deletion requirements-agent-release.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ datadog-hudi==2.0.0
datadog-hyperv==1.4.0; sys_platform == 'win32'
datadog-ibm-db2==1.9.0
datadog-ibm-i==1.1.0
datadog-ibm-mq==3.16.1; sys_platform != 'win32'
datadog-ibm-mq==3.16.2-beta.2
datadog-ibm-was==1.11.1
datadog-ignite==2.1.1
datadog-iis==2.13.0; sys_platform == 'win32'
Expand Down