Ship oracledb with omd

CMK-19517

Change-Id: Ica0bc04a741cef671adb906dc5e19c90db62754b

active_checks/check_sql

@@ -278,10 +278,7 @@ def oracle_connect(host: str, port: int, db_name: str, user: str, pwd: str) -> A
     sys.path.append(
         f"/usr/lib/python{sys.version_info.major}.{sys.version_info.minor}/site-packages"
     )
-    try:
-        import oracledb  # type: ignore[import-not-found] # pylint: disable=import-error,import-outside-toplevel
-    except ImportError as exc:
-        bail_out(3, "%s. Please install it via 'pip install oracledb'." % exc)
+    import oracledb
 
     try:
         oracledb.init_oracle_client()
@@ -303,10 +300,7 @@ def oracle_connect(host: str, port: int, db_name: str, user: str, pwd: str) -> A
 def oracle_execute(
     cursor: Any, cmd: str, inpt: Sequence[str], procedure: bool
 ) -> list[tuple[Any, ...]]:
-    try:
-        import oracledb  # pylint: disable=import-error,import-outside-toplevel
-    except ImportError as exc:
-        bail_out(3, "%s. Please install it via 'pip install oracledb'." % exc)
+    import oracledb
 
     if procedure:
         LOG.info("SQL Procedure Name: %s", cmd)

cmk/requirements.txt

@@ -74,6 +74,7 @@ recurring_ical_events==2.0.2 # used for parsing recurring events in icalendar ob
 netapp-ontap==9.14.1.0 # used by netapp special agent
 redfish~= 3.2.2 # used for management board monitoring via Redfish, used by optional MKP
 robotframework~=7.0 # used for parsing robotmk agent data
+oracledb==2.5.1 # used by active check_sql
 opentelemetry-api==1.29.0 # used for distributed tracing of Checkmk
 opentelemetry-sdk==1.29.0 # used for distributed tracing of Checkmk
 opentelemetry-exporter-otlp==1.29.0 # used for distributed tracing of Checkmk

requirements_all_lock.txt

@@ -565,6 +565,7 @@ cryptography==43.0.3 \
     #   azure-storage-blob
     #   fido2
     #   msal
+    #   oracledb
     #   paramiko
     #   pyghmi
     #   pyjwt
@@ -2182,6 +2183,39 @@ opsgenie-sdk==2.1.5 \
     --hash=sha256:c38a2f0c7acbcbeb9202ced80ec857b5eda2d99919392fed4083bdfa7be32669 \
     --hash=sha256:fe0af399030a91ec5755ecfb899965bf18fcb46e17fd2d3a4d71fa68999947e9
     # via -r requirements_all.txt
+oracledb==2.5.1 \
+    --hash=sha256:0374481329fa873a2af24eb12de4fd597c6c111e148065200562eb75ea0c6be7 \
+    --hash=sha256:05df7a5a61f4d26c986e235fae6f64a81afaac8f1dbef60e2e9ecf9236218e58 \
+    --hash=sha256:0d5974327a1957538a144b073367104cdf8bb39cf056940995b75cb099535589 \
+    --hash=sha256:173b6d132b230f0617380272181e14fc53aec65aaffe68b557a9b6040716a267 \
+    --hash=sha256:44f5eb220945a6e092975ebcb9afc3f1eb10420d04d6bfeace1207ba86d60431 \
+    --hash=sha256:51b3911ee822319e20f2e19d816351aac747591a59a0a96cf891c62c2a5c0c0d \
+    --hash=sha256:541bb5a107917b9d9eba1346318b42f8b6024e7dd3bef1451f0745364f03399c \
+    --hash=sha256:54ea7b4da179eb3fefad338685b44fed657a9cd733fb0bfc09d344cfb266355e \
+    --hash=sha256:63d17ebb95f9129d0ab9386cb632c9e667e3be2c767278cc11a8e4585468de33 \
+    --hash=sha256:66e885de106701d1f2a630d19e183e491e4f1ccb8d78855f60396ba15856fb66 \
+    --hash=sha256:676c221227159d9cee25030c56ff9782f330115cb86164d92d3360f55b07654b \
+    --hash=sha256:6919cb69638a7dda45380d6530b6f2f7fd21ea7bdf8d38936653f9ebc4f7e3d6 \
+    --hash=sha256:730cd03e7fbf05acd32a221ead2a43020b3b91391597eaf728d724548f418b1b \
+    --hash=sha256:7958c7796df9f8c97484768c88817dec5c6d49220fc4cccdfde12a1a883f3d46 \
+    --hash=sha256:7a3115e4d445e3430d6f34083b7eed607309411f41472b66d145508f7b0c3770 \
+    --hash=sha256:7d5efc94ce5bb657a5f43e2683e23cc4b4c53c4783e817759869472a113dac26 \
+    --hash=sha256:85318350fa4837b7b637e436fa5f99c17919d6329065e64d1e18e5a7cae52457 \
+    --hash=sha256:8778daa3f08639232341d802b95ca6da4c0c798c8530e4df331b3286d32e49d5 \
+    --hash=sha256:8a2627a0d29390aaef7211c5b3f7182dfd8e76c969b39d57ee3e43c1057c6fe7 \
+    --hash=sha256:92e0d176e3c76a1916f4e34fc3d84994ad74cce6b8664656c4dbecb8fa7e8c37 \
+    --hash=sha256:934d02da80bfc030c644c5c43fbe58119dc170f15b4dfdb6fe04c220a1f8730d \
+    --hash=sha256:970a9420cc351d650cc6716122e9aa50cfb8c27f425ffc9d83651fd3edff6090 \
+    --hash=sha256:a44613f3dfacb2b9462c3871ee333fa535fbd0ec21942e14019fcfd572487db0 \
+    --hash=sha256:a6788c128af5a3a45689453fc4832f32b4a0dae2696d9917c7631a2e02865148 \
+    --hash=sha256:aa6ce0dfc64dc7b30bcf477f978538ba82fa7060ecd7a1b9227925b471ae3b50 \
+    --hash=sha256:b02b93199a7073e9b5687fe2dfa83d25ea102ab261c577f9d55820d5ef193dda \
+    --hash=sha256:d17c80063375a5d87a7ab57c8343e5434a16ea74f7be3b56f9100300ef0b69d6 \
+    --hash=sha256:e4e884625117e50b619c93828affbcffa594029ef8c8b40205394990e6af65a8 \
+    --hash=sha256:e78c6de57b4b5df7f932337c57e59b62e34fc4527d2460c0cab10c2ab01825f8 \
+    --hash=sha256:f42524b586733daa896f675acad8b9f2fc2f4380656d60a22a109a573861fc93 \
+    --hash=sha256:fcf446f6250d8edad5367ff03ad73dbbe672a2e4b060c51a774821dd723b0283
+    # via -r requirements_all.txt
 packaging==24.2 \
     --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
     --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f

requirements_runtime_lock.txt

@@ -411,6 +411,7 @@ cryptography==43.0.3 \
     #   azure-storage-blob
     #   fido2
     #   msal
+    #   oracledb
     #   paramiko
     #   pyghmi
     #   pyjwt
@@ -1382,6 +1383,39 @@ opsgenie-sdk==2.1.5 \
     --hash=sha256:c38a2f0c7acbcbeb9202ced80ec857b5eda2d99919392fed4083bdfa7be32669 \
     --hash=sha256:fe0af399030a91ec5755ecfb899965bf18fcb46e17fd2d3a4d71fa68999947e9
     # via -r _requirements_runtime.txt
+oracledb==2.5.1 \
+    --hash=sha256:0374481329fa873a2af24eb12de4fd597c6c111e148065200562eb75ea0c6be7 \
+    --hash=sha256:05df7a5a61f4d26c986e235fae6f64a81afaac8f1dbef60e2e9ecf9236218e58 \
+    --hash=sha256:0d5974327a1957538a144b073367104cdf8bb39cf056940995b75cb099535589 \
+    --hash=sha256:173b6d132b230f0617380272181e14fc53aec65aaffe68b557a9b6040716a267 \
+    --hash=sha256:44f5eb220945a6e092975ebcb9afc3f1eb10420d04d6bfeace1207ba86d60431 \
+    --hash=sha256:51b3911ee822319e20f2e19d816351aac747591a59a0a96cf891c62c2a5c0c0d \
+    --hash=sha256:541bb5a107917b9d9eba1346318b42f8b6024e7dd3bef1451f0745364f03399c \
+    --hash=sha256:54ea7b4da179eb3fefad338685b44fed657a9cd733fb0bfc09d344cfb266355e \
+    --hash=sha256:63d17ebb95f9129d0ab9386cb632c9e667e3be2c767278cc11a8e4585468de33 \
+    --hash=sha256:66e885de106701d1f2a630d19e183e491e4f1ccb8d78855f60396ba15856fb66 \
+    --hash=sha256:676c221227159d9cee25030c56ff9782f330115cb86164d92d3360f55b07654b \
+    --hash=sha256:6919cb69638a7dda45380d6530b6f2f7fd21ea7bdf8d38936653f9ebc4f7e3d6 \
+    --hash=sha256:730cd03e7fbf05acd32a221ead2a43020b3b91391597eaf728d724548f418b1b \
+    --hash=sha256:7958c7796df9f8c97484768c88817dec5c6d49220fc4cccdfde12a1a883f3d46 \
+    --hash=sha256:7a3115e4d445e3430d6f34083b7eed607309411f41472b66d145508f7b0c3770 \
+    --hash=sha256:7d5efc94ce5bb657a5f43e2683e23cc4b4c53c4783e817759869472a113dac26 \
+    --hash=sha256:85318350fa4837b7b637e436fa5f99c17919d6329065e64d1e18e5a7cae52457 \
+    --hash=sha256:8778daa3f08639232341d802b95ca6da4c0c798c8530e4df331b3286d32e49d5 \
+    --hash=sha256:8a2627a0d29390aaef7211c5b3f7182dfd8e76c969b39d57ee3e43c1057c6fe7 \
+    --hash=sha256:92e0d176e3c76a1916f4e34fc3d84994ad74cce6b8664656c4dbecb8fa7e8c37 \
+    --hash=sha256:934d02da80bfc030c644c5c43fbe58119dc170f15b4dfdb6fe04c220a1f8730d \
+    --hash=sha256:970a9420cc351d650cc6716122e9aa50cfb8c27f425ffc9d83651fd3edff6090 \
+    --hash=sha256:a44613f3dfacb2b9462c3871ee333fa535fbd0ec21942e14019fcfd572487db0 \
+    --hash=sha256:a6788c128af5a3a45689453fc4832f32b4a0dae2696d9917c7631a2e02865148 \
+    --hash=sha256:aa6ce0dfc64dc7b30bcf477f978538ba82fa7060ecd7a1b9227925b471ae3b50 \
+    --hash=sha256:b02b93199a7073e9b5687fe2dfa83d25ea102ab261c577f9d55820d5ef193dda \
+    --hash=sha256:d17c80063375a5d87a7ab57c8343e5434a16ea74f7be3b56f9100300ef0b69d6 \
+    --hash=sha256:e4e884625117e50b619c93828affbcffa594029ef8c8b40205394990e6af65a8 \
+    --hash=sha256:e78c6de57b4b5df7f932337c57e59b62e34fc4527d2460c0cab10c2ab01825f8 \
+    --hash=sha256:f42524b586733daa896f675acad8b9f2fc2f4380656d60a22a109a573861fc93 \
+    --hash=sha256:fcf446f6250d8edad5367ff03ad73dbbe672a2e4b060c51a774821dd723b0283
+    # via -r _requirements_runtime.txt
 packaging==24.2 \
     --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
     --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f

tests/code_quality/test_requirements.py

@@ -339,6 +339,7 @@ def get_undeclared_dependencies() -> Iterable[Import]:
     "types-python-dateutil",
     "types-markdown",
     "types-pika-ts",
+    "oracledb",  # actually used now by check_sql but those files are not yet checked to to missing .py extension (CMK-21797)
 ]
 
 

tests/integration/omd/test_python.py

@@ -154,8 +154,7 @@ def test_04_pip_user_can_install_non_wheel_packages(site: Site) -> None:
 
 @pytest.mark.parametrize("pip_cmd", SUPPORTED_PIP_CMDS)
 def test_05_pip_user_can_install_wheel_packages(site: Site, pip_cmd: PipCommand) -> None:
-    # We're using here another package which is needed for check_sql but not deployed by us
-    package_name = "oracledb"
+    package_name = "trickkiste"
     if pip_cmd.needs_target_as_commandline:
         command = pip_cmd.command + [
             "install",