diff --git a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh index ed12a8e7736a1..00252515aa584 100755 --- a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh +++ b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh @@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof # Install librdkafka from source since no binaries are available for the distribution we use on the CI: git clone https://github.com/confluentinc/librdkafka cd librdkafka -git checkout v2.1.1 +git checkout v2.2.0 sudo ./configure --install-deps --prefix=/usr make sudo make install diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d19dc01af1f6e..6f96ba6e4c9b8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -41,9 +41,12 @@ jobs: sudo apt-get update sudo apt-get install -y --no-install-recommends libkrb5-dev - - name: Build documentation + - name: Validate documentation run: ddev -v docs build --check + - name: Build documentation + run: ddev -v docs build + - uses: actions/upload-artifact@v2 with: name: documentation diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 51ee1f47c917b..56d8188877954 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -83,7 +83,7 @@ python-dateutil,PyPI,BSD-3-Clause,Copyright 2017- Paul Ganssle python3-gearman,PyPI,Apache-2.0, pyvmomi,PyPI,Apache-2.0,"Copyright (c) 2005-2021 VMware, Inc. All Rights Reserved." pywin32,PyPI,PSF,Copyright 2002-2003 by Blackdog Software Pty Ltd. -redis,PyPI,MIT,"Copyright (c) 2022, Redis, inc." +redis,PyPI,MIT,"Copyright (c) 2022-2023, Redis, inc." redis,PyPI,MIT,Copyright (c) 2012 Andy McCurdy requests,PyPI,Apache-2.0,Copyright 2019 Kenneth Reitz requests-kerberos,PyPI,ISC,Copyright (c) 2012 Kenneth Reitz diff --git a/amazon_msk/CHANGELOG.md b/amazon_msk/CHANGELOG.md index 8ea732bd1c5d3..946d81e443a62 100644 --- a/amazon_msk/CHANGELOG.md +++ b/amazon_msk/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 4.0.0 / 2023-08-10 ***Changed***: diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index 5aad7f5d1cd88..03592cfe5d0a5 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -40,7 +40,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "boto3==1.17.112; python_version < '3.0'", - "boto3==1.27.0; python_version > '3.0'", + "boto3==1.28.27; python_version > '3.0'", ] [project.urls] diff --git a/datadog_checks_base/CHANGELOG.md b/datadog_checks_base/CHANGELOG.md index 43f893029cfff..533ea488683da 100644 --- a/datadog_checks_base/CHANGELOG.md +++ b/datadog_checks_base/CHANGELOG.md @@ -4,6 +4,7 @@ ***Added***: +* Dependency update for 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) * Improve documentation of APIs ([#15582](https://github.com/DataDog/integrations-core/pull/15582)) ***Fixed***: diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 0ed0ab66b6cb4..8861f1425a1e2 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -5,10 +5,10 @@ beautifulsoup4==4.12.2; python_version > '3.0' beautifulsoup4==4.9.3; python_version < '3.0' binary==1.0.0 boto3==1.17.112; python_version < '3.0' -boto3==1.27.0; python_version > '3.0' +boto3==1.28.27; python_version > '3.0' boto==2.49.0 botocore==1.20.112; python_version < '3.0' -botocore==1.30.0; python_version > '3.0' +botocore==1.31.27; python_version > '3.0' cachetools==3.1.1; python_version < '3.0' cachetools==5.3.1; python_version > '3.0' clickhouse-cityhash==1.0.2.3; python_version < '3.0' @@ -16,7 +16,7 @@ clickhouse-cityhash==1.0.2.4; python_version > '3.0' clickhouse-driver==0.2.0; python_version < '3.0' clickhouse-driver==0.2.3; python_version > '3.0' cm-client==45.0.4 -confluent-kafka==2.1.1; python_version > '3.0' +confluent-kafka==2.2.0; python_version > '3.0' contextlib2==0.6.0.post1; python_version < '3.0' cryptography==3.3.2; python_version < '3.0' cryptography==41.0.3; python_version > '3.0' @@ -35,24 +35,24 @@ jaydebeapi==1.2.3 jellyfish==1.0.0; python_version > '3.0' jpype1==1.4.1; python_version > '3.0' kubernetes==18.20.0; python_version < '3.0' -kubernetes==26.1.0; python_version > '3.0' +kubernetes==27.2.0; python_version > '3.0' ldap3==2.9.1 -lxml==4.9.2 +lxml==4.9.3 lz4==2.2.1; python_version < '3.0' lz4==3.1.3; python_version > '3.0' mmh3==2.5.1; python_version < '3.0' -mmh3==4.0.0; python_version > '3.0' +mmh3==4.0.1; python_version > '3.0' oauthlib==3.1.0; python_version < '3.0' oauthlib==3.2.2; python_version > '3.0' openstacksdk==1.0.1; python_version > '3.0' oracledb==1.3.2; python_version >= '3.8' -orjson==3.9.1; python_version > '3.0' +orjson==3.9.4; python_version > '3.0' packaging==23.1; python_version > '3.0' paramiko==2.12.0; python_version < '3.0' -paramiko==3.2.0; python_version > '3.0' +paramiko==3.3.1; python_version > '3.0' ply==3.11 prometheus-client==0.12.0; python_version < '3.0' -prometheus-client==0.17.0; python_version > '3.0' +prometheus-client==0.17.1; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' protobuf==3.20.2; python_version > '3.0' psutil==5.9.0 @@ -60,9 +60,9 @@ psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64' psycopg[binary]==3.1.10; python_version > '3.0' pyasn1==0.4.6 pycryptodomex==3.10.1 -pydantic==2.0.2; python_version > '3.0' +pydantic==2.1.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' -pyjwt==2.7.0; python_version > '3.0' +pyjwt==2.8.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.9' pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64' pymysql==0.10.1 @@ -80,9 +80,9 @@ pyvmomi==7.0.3 pywin32==228; sys_platform == 'win32' and python_version < '3.0' pywin32==306; sys_platform == 'win32' and python_version > '3.0' pyyaml==5.4.1; python_version < '3.0' -pyyaml==6.0; python_version > '3.0' +pyyaml==6.0.1; python_version > '3.0' redis==3.5.3; python_version < '3.0' -redis==4.6.0; python_version > '3.0' +redis==5.0.0; python_version > '3.0' requests-kerberos==0.12.0; python_version < '3.0' requests-kerberos==0.14.0; python_version > '3.0' requests-ntlm==1.1.0; python_version < '3.0' @@ -109,6 +109,6 @@ tuf==2.0.0; python_version > '3.0' typing==3.10.0.0; python_version < '3.0' uptime==3.0.1 vertica-python==1.2.0; python_version < '3.0' -vertica-python==1.3.2; python_version > '3.0' +vertica-python==1.3.4; python_version > '3.0' win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0' wrapt==1.15.0 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index fd67a34ee0611..ae89572af7668 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -35,7 +35,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] db = [ "mmh3==2.5.1; python_version < '3.0'", - "mmh3==4.0.0; python_version > '3.0'", + "mmh3==4.0.1; python_version > '3.0'", ] deps = [ "binary==1.0.0", @@ -52,15 +52,15 @@ deps = [ "ipaddress==1.0.23; python_version < '3.0'", "jellyfish==1.0.0; python_version > '3.0'", "prometheus-client==0.12.0; python_version < '3.0'", - "prometheus-client==0.17.0; python_version > '3.0'", + "prometheus-client==0.17.1; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", "protobuf==3.20.2; python_version > '3.0'", - "pydantic==2.0.2; python_version > '3.0'", + "pydantic==2.1.1; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", "pyyaml==5.4.1; python_version < '3.0'", - "pyyaml==6.0; python_version > '3.0'", + "pyyaml==6.0.1; python_version > '3.0'", "requests-toolbelt==1.0.0", "requests-unixsocket==0.3.0", "requests==2.27.1; python_version < '3.0'", @@ -74,11 +74,11 @@ deps = [ http = [ "aws-requests-auth==0.4.3", "botocore==1.20.112; python_version < '3.0'", - "botocore==1.30.0; python_version > '3.0'", + "botocore==1.31.27; python_version > '3.0'", "oauthlib==3.1.0; python_version < '3.0'", "oauthlib==3.2.2; python_version > '3.0'", "pyjwt==1.7.1; python_version < '3.0'", - "pyjwt==2.7.0; python_version > '3.0'", + "pyjwt==2.8.0; python_version > '3.0'", "pysocks==1.7.1", "requests-kerberos==0.12.0; python_version < '3.0'", "requests-kerberos==0.14.0; python_version > '3.0'", @@ -88,11 +88,11 @@ http = [ "win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'", ] json = [ - "orjson==3.9.1; python_version > '3.0'", + "orjson==3.9.4; python_version > '3.0'", ] kube = [ "kubernetes==18.20.0; python_version < '3.0'", - "kubernetes==26.1.0; python_version > '3.0'", + "kubernetes==27.2.0; python_version > '3.0'", ] [project.urls] diff --git a/datadog_checks_dev/CHANGELOG.md b/datadog_checks_dev/CHANGELOG.md index 8a3d0f2f6e487..9ab31f79ba2ba 100644 --- a/datadog_checks_dev/CHANGELOG.md +++ b/datadog_checks_dev/CHANGELOG.md @@ -9,6 +9,10 @@ * Remove files in datadog_checks_dev for `validate ci, http, and metadata` ([#15546](https://github.com/DataDog/integrations-core/pull/15546)) * Migrate documentation commands to ddev ([#15582](https://github.com/DataDog/integrations-core/pull/15582)) +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ***Fixed***: * Stop using the TOX_ENV_NAME variable ([#15528](https://github.com/DataDog/integrations-core/pull/15528)) diff --git a/hatch.toml b/hatch.toml index ea86104dbfd74..61747acf9e9a3 100644 --- a/hatch.toml +++ b/hatch.toml @@ -1,11 +1,11 @@ [envs.docs] dependencies = [ - "mkdocs~=1.4.3", - "mkdocs-material~=9.0.0", + "mkdocs~=1.5.2", + "mkdocs-material~=9.2.0b3", # Plugins "mkdocs-minify-plugin~=0.6.4", "mkdocs-git-revision-date-localized-plugin~=1.2.0", - "mkdocstrings-python~=1.2.1", + "mkdocstrings-python~=1.3.0", "mkdocs-redirects~=1.2.1", "mkdocs-glightbox~=0.3.4", "mkdocs-pdf-export-plugin~=0.5.10", @@ -22,7 +22,7 @@ dependencies = [ ] # API & CLI documentation post-install-commands = [ - "pip install -e ./datadog_checks_base[deps,http] -e ./datadog_checks_dev", + "pip install -e ./datadog_checks_base[deps,http] -e ./datadog_checks_dev[cli]", "pip install -e ./ddev", ] [envs.docs.env-vars] diff --git a/ibm_ace/CHANGELOG.md b/ibm_ace/CHANGELOG.md index c8682df4f0e6c..2801b62feed1b 100644 --- a/ibm_ace/CHANGELOG.md +++ b/ibm_ace/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Add hostname as part of the subscription substring ([#15189](https://github.com/DataDog/integrations-core/pull/15189)) + ## 2.0.0 / 2023-08-10 ***Changed***: diff --git a/ibm_ace/datadog_checks/ibm_ace/subscription.py b/ibm_ace/datadog_checks/ibm_ace/subscription.py index d73a23d963c46..d98e074209e11 100644 --- a/ibm_ace/datadog_checks/ibm_ace/subscription.py +++ b/ibm_ace/datadog_checks/ibm_ace/subscription.py @@ -15,6 +15,11 @@ from .flows import get_statistics from .resources import get_resource +try: + import datadog_agent +except ImportError: + from datadog_checks.base.stubs import datadog_agent + # https://www.ibm.com/docs/en/app-connect/12.0?topic=performance-resource-statistics # https://www.ibm.com/docs/en/app-connect/12.0?topic=data-message-flow-accounting-statistics-collection-options SNAPSHOT_UPDATE_INTERVAL = 20 @@ -22,8 +27,9 @@ def get_unique_name(check_id, topic_string): # https://www.ibm.com/docs/en/ibm-mq/9.2?topic=reference-crtmqmsub-create-mq-subscription#q084220___q084220SUBNAME + hostname = datadog_agent.get_hostname() data = topic_string.encode('utf-8') - return f'datadog-{check_id}-{hashlib.sha256(data).hexdigest()}' + return f'datadog-{check_id}-{hostname}-{hashlib.sha256(data).hexdigest()}' class Subscription(ABC): diff --git a/ibm_was/CHANGELOG.md b/ibm_was/CHANGELOG.md index a94a337159328..c1ae0220fe3fb 100644 --- a/ibm_was/CHANGELOG.md +++ b/ibm_was/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 3.0.0 / 2023-08-10 ***Changed***: diff --git a/ibm_was/pyproject.toml b/ibm_was/pyproject.toml index 576311e485330..cc237ed8568ec 100644 --- a/ibm_was/pyproject.toml +++ b/ibm_was/pyproject.toml @@ -35,12 +35,11 @@ dependencies = [ dynamic = [ "version", ] - license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "lxml==4.9.2", + "lxml==4.9.3", ] [project.urls] diff --git a/kafka_consumer/CHANGELOG.md b/kafka_consumer/CHANGELOG.md index eb75c4b2b8415..3a12fc177e92a 100644 --- a/kafka_consumer/CHANGELOG.md +++ b/kafka_consumer/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 4.0.0 / 2023-08-10 ***Changed***: diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml index d67c57988c640..7060276a59b86 100644 --- a/kafka_consumer/hatch.toml +++ b/kafka_consumer/hatch.toml @@ -4,7 +4,7 @@ # If you bump the `confluent-kafka` version, also bump the `librdkafka` version in the `32_install_kerberos.sh` file post-install-commands = [ "python -m pip uninstall -y confluent-kafka", - "python -m pip install --no-binary confluent-kafka confluent-kafka==2.1.1", + "python -m pip install --no-binary confluent-kafka confluent-kafka==2.2.0", ] [envs.default.env-vars] diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml index e9444152c9d57..ffe5867eda508 100644 --- a/kafka_consumer/pyproject.toml +++ b/kafka_consumer/pyproject.toml @@ -32,14 +32,11 @@ dependencies = [ dynamic = [ "version", ] - license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - # confluent-kafka is built in omnibus, so bumping it here will have no real effect - # if you bump this version, also bump the one in the `hatch.toml` file - "confluent-kafka==2.1.1; python_version > '3.0'", + "confluent-kafka==2.2.0; python_version > '3.0'", ] [project.urls] diff --git a/mkdocs.yml b/mkdocs.yml index 3f4a88119543d..28d064a5e5f99 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -22,11 +22,13 @@ theme: palette: - media: "(prefers-color-scheme: dark)" scheme: slate + primary: custom toggle: icon: material/weather-night name: Switch to light mode - media: "(prefers-color-scheme: light)" scheme: default + primary: custom toggle: icon: material/weather-sunny name: Switch to dark mode diff --git a/oracle/datadog_checks/oracle/oracle.py b/oracle/datadog_checks/oracle/oracle.py index 3a07085711afc..776bef7e6c895 100644 --- a/oracle/datadog_checks/oracle/oracle.py +++ b/oracle/datadog_checks/oracle/oracle.py @@ -151,6 +151,7 @@ def check(self, _): def _connection(self): if self._cached_connection is None: if self.can_use_jdbc(): + self.log.debug('Detected that JDBC can be used to connect, will attempt first') try: self._cached_connection = self._jdbc_connect() except Exception as e: @@ -158,6 +159,7 @@ def _connection(self): self._connection_errors += 1 else: if self._use_instant_client: + self.log.debug('Connecting to Oracle using Oracle Instant Client') self.init_instant_client() else: self.log.debug('Connecting to Oracle using the native client') @@ -233,6 +235,7 @@ def _jdbc_connect(self): try: with jdbc_lock: if jpype.isJVMStarted() and not jpype.isThreadAttachedToJVM(): + self.log.debug("JVM started but thread not attached to JVM.") jpype.attachThreadToJVM() jpype.java.lang.Thread.currentThread().setContextClassLoader( jpype.java.lang.ClassLoader.getSystemClassLoader() @@ -240,9 +243,18 @@ def _jdbc_connect(self): connection = jdb.connect( self.ORACLE_DRIVER_CLASS, connect_string, jdbc_connect_properties, self._jdbc_driver ) + if jpype.isJVMStarted() and jpype.isThreadAttachedToJVM(): + jpype.detachThreadFromJVM() + self.log.debug("Detaching thread from JVM after connection") + self.log.debug("Connected to Oracle DB using JDBC connector") + return connection except Exception as e: + if jpype.isJVMStarted() and jpype.isThreadAttachedToJVM(): + jpype.detachThreadFromJVM() + self.log.debug("Thread detached from JVM after JDBC connection failure") + self._connection_errors += 1 if "Class {} not found".format(self.ORACLE_DRIVER_CLASS) in str(e): msg = """Cannot run the Oracle check until either the Oracle instant client or the JDBC Driver diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md index 80810e6594fb2..563e5a0a50abb 100644 --- a/postgres/CHANGELOG.md +++ b/postgres/CHANGELOG.md @@ -6,6 +6,7 @@ * Add schema collection to Postgres integration ([#15484](https://github.com/DataDog/integrations-core/pull/15484)) * Add support for sending `database_instance` metadata ([#15559](https://github.com/DataDog/integrations-core/pull/15559)) +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) ## 14.1.0 / 2023-08-10 diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index a30d50f17ae2b..25548753dc101 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -37,8 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "boto3==1.27.0; python_version > '3.0'", - "cachetools==3.1.1; python_version < '3.0'", + "boto3==1.28.27; python_version > '3.0'", "cachetools==5.3.1; python_version > '3.0'", "psycopg[binary]==3.1.10; python_version > '3.0'", "semver==3.0.1; python_version > '3.0'", diff --git a/redisdb/CHANGELOG.md b/redisdb/CHANGELOG.md index 449ad5deb68e6..46321349ea7a5 100644 --- a/redisdb/CHANGELOG.md +++ b/redisdb/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 5.0.0 / 2023-08-10 ***Changed***: diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml index cc3e42f23c789..bfa898d855005 100644 --- a/redisdb/pyproject.toml +++ b/redisdb/pyproject.toml @@ -40,7 +40,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "redis==3.5.3; python_version < '3.0'", - "redis==4.6.0; python_version > '3.0'", + "redis==5.0.0; python_version > '3.0'", ] [project.urls] diff --git a/sqlserver/CHANGELOG.md b/sqlserver/CHANGELOG.md index 4aa9a1214abf5..fe036c36a083c 100644 --- a/sqlserver/CHANGELOG.md +++ b/sqlserver/CHANGELOG.md @@ -9,6 +9,7 @@ ***Added***: * Add support for sending `database_instance` metadata ([#15562](https://github.com/DataDog/integrations-core/pull/15562)) +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) ## 13.0.0 / 2023-08-10 diff --git a/sqlserver/pyproject.toml b/sqlserver/pyproject.toml index 69af74471de0d..bb50fcf0bf35a 100644 --- a/sqlserver/pyproject.toml +++ b/sqlserver/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "lxml==4.9.2", + "lxml==4.9.3", "pyodbc==4.0.32; sys_platform != 'darwin' or platform_machine != 'arm64'", "pyro4==4.82; sys_platform == 'win32'", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", diff --git a/ssh_check/CHANGELOG.md b/ssh_check/CHANGELOG.md index 6139f93d10e05..b5df2d3dec1cd 100644 --- a/ssh_check/CHANGELOG.md +++ b/ssh_check/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 2.6.0 / 2023-08-10 ***Added***: diff --git a/ssh_check/pyproject.toml b/ssh_check/pyproject.toml index f37428da1fd9d..86731e66febeb 100644 --- a/ssh_check/pyproject.toml +++ b/ssh_check/pyproject.toml @@ -40,7 +40,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "paramiko==2.12.0; python_version < '3.0'", - "paramiko==3.2.0; python_version > '3.0'", + "paramiko==3.3.1; python_version > '3.0'", ] [project.urls] diff --git a/vertica/CHANGELOG.md b/vertica/CHANGELOG.md index cb1c1644b2476..6d087574a1515 100644 --- a/vertica/CHANGELOG.md +++ b/vertica/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Update dependencies for Agent 7.48 ([#15585](https://github.com/DataDog/integrations-core/pull/15585)) + ## 4.0.0 / 2023-08-10 ***Changed***: diff --git a/vertica/pyproject.toml b/vertica/pyproject.toml index 1625937afb0e1..4468e9f16cbdc 100644 --- a/vertica/pyproject.toml +++ b/vertica/pyproject.toml @@ -40,7 +40,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "vertica-python==1.2.0; python_version < '3.0'", - "vertica-python==1.3.2; python_version > '3.0'", + "vertica-python==1.3.4; python_version > '3.0'", ] [project.urls] diff --git a/weaviate/CHANGELOG.md b/weaviate/CHANGELOG.md index fdc6ab8926021..3fd921c2fcd45 100644 --- a/weaviate/CHANGELOG.md +++ b/weaviate/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Added***: + +* Add weaviate.requests metric ([#15583](https://github.com/DataDog/integrations-core/pull/15583)) + ## 2.0.0 / 2023-08-10 ***Changed***: diff --git a/weaviate/datadog_checks/weaviate/metrics.py b/weaviate/datadog_checks/weaviate/metrics.py index 033ec8100581e..8020517bf118b 100644 --- a/weaviate/datadog_checks/weaviate/metrics.py +++ b/weaviate/datadog_checks/weaviate/metrics.py @@ -78,4 +78,6 @@ 'bucket_pause_durations_ms': 'bucket.pause.durations.ms', 'backup_restore_data_transferred': 'backup.restore.data.transferred', 'backup_store_data_transferred': 'backup.store.data.transferred', + # Weaviate 1.20.0+ only + 'requests_total': 'requests', } diff --git a/weaviate/hatch.toml b/weaviate/hatch.toml index 1c3c0be40c2d6..01c031526d4b4 100644 --- a/weaviate/hatch.toml +++ b/weaviate/hatch.toml @@ -5,12 +5,12 @@ DDEV_SKIP_GENERIC_TAGS_CHECK = "true" [[envs.default.matrix]] python = ["3.9"] -version = ["1.19"] +version = ["1.20"] auth = ["no-auth", "auth"] [envs.default.overrides] matrix.version.env-vars = [ - { key = "WEAVIATE_VERSION", value = "1.19.1", if = ["1.19"] }, + { key = "WEAVIATE_VERSION", value = "1.20.0", if = ["1.20"] }, ] matrix.auth.env-vars = [ { key = "USE_AUTH", value = "true", if = ["auth"] }, diff --git a/weaviate/metadata.csv b/weaviate/metadata.csv index 1e7f7bbdc0f6d..4e8127a0546b4 100644 --- a/weaviate/metadata.csv +++ b/weaviate/metadata.csv @@ -77,6 +77,7 @@ weaviate.queries.durations_ms.count,count,,operation,,"The count of operations o weaviate.queries.durations_ms.sum,count,,millisecond,,The sum of query durations in milliseconds,0,weaviate,weaviate queries duration sum, weaviate.queries.filtered.vector.durations_ms.count,count,,,,The count of the duration of queries summary,0,weaviate,weaviate queries filtered vector duration count, weaviate.queries.filtered.vector.durations_ms.sum,count,,millisecond,,The duration of queries in milliseconds,0,weaviate,weaviate queries filtered vector duration sum, +weaviate.requests,gauge,,request,,"The number of requests tagged by a given status(ok, user_error, server_error). Available only on Weaviate version 1.20.0+",0,weaviate,weaviate requests count, weaviate.startup.diskio.throughput.bucket,count,,operation,,"The number of operations observed for the the disk I/O throughput duration by `upper_bound` buckets",0,weaviate,weaviate startup diskio throughput bucket, weaviate.startup.diskio.throughput.count,count,,operation,,"The count of operations observed in the disk I/O throughput duration histogram",0,weaviate,weaviate startup diskio throughput count, weaviate.startup.diskio.throughput.sum,count,,byte,second,"The sum of disk I/O throughput startup operations in bytes/s, such as reading back the HNSW index or recovering LSM segments. The operation itself is defined by the operation label",0,weaviate,weaviate startup diskio throughput sum, diff --git a/weaviate/tests/common.py b/weaviate/tests/common.py index dba7ca68378d6..2e59e3f99e8ef 100644 --- a/weaviate/tests/common.py +++ b/weaviate/tests/common.py @@ -99,6 +99,7 @@ "weaviate.queries.durations_ms.count", "weaviate.queries.durations_ms.sum", "weaviate.query.dimensions.count", + "weaviate.requests", ] API_METRICS = [ diff --git a/weaviate/tests/fixtures/weaviate_openmetrics.txt b/weaviate/tests/fixtures/weaviate_openmetrics.txt index e320c49cad282..7b4f36ca73012 100644 --- a/weaviate/tests/fixtures/weaviate_openmetrics.txt +++ b/weaviate/tests/fixtures/weaviate_openmetrics.txt @@ -733,4 +733,20 @@ vector_index_tombstone_cleaned{class_name="Movies",shard_name="S4Gq0SGpzte6"} 0 vector_index_tombstone_cleanup_threads{class_name="Movies",shard_name="S4Gq0SGpzte6"} 0 # HELP vector_index_tombstones Number of active vector index tombstones # TYPE vector_index_tombstones gauge -vector_index_tombstones{class_name="Movies",shard_name="S4Gq0SGpzte6"} 0 \ No newline at end of file +vector_index_tombstones{class_name="Movies",shard_name="S4Gq0SGpzte6"} 0 +# HELP requests_total Number of all requests made +# TYPE requests_total gauge +requests_total{api="graphql",class_name="n/a",query_type="",status="ok"} 839 +requests_total{api="graphql",class_name="n/a",query_type="",status="user_error"} 3 +requests_total{api="graphql",class_name="n/a",query_type="Aggregate",status="user_error"} 8 +requests_total{api="graphql",class_name="n/a",query_type="Explore",status="user_error"} 3 +requests_total{api="graphql",class_name="n/a",query_type="Get",status="user_error"} 28 +requests_total{api="rest",class_name="n/a",query_type="batch",status="ok"} 1143 +requests_total{api="rest",class_name="n/a",query_type="classification",status="ok"} 9 +requests_total{api="rest",class_name="n/a",query_type="misc",status="ok"} 14 +requests_total{api="rest",class_name="n/a",query_type="nodes",status="ok"} 12 +requests_total{api="rest",class_name="n/a",query_type="objects",status="ok"} 839 +requests_total{api="rest",class_name="n/a",query_type="objects",status="server_error"} 4 +requests_total{api="rest",class_name="n/a",query_type="objects",status="user_error"} 56 +requests_total{api="rest",class_name="n/a",query_type="schema",status="ok"} 552 +requests_total{api="rest",class_name="n/a",query_type="schema",status="user_error"} 55 \ No newline at end of file diff --git a/weaviate/tests/kind/weaviate_auth.yaml b/weaviate/tests/kind/weaviate_auth.yaml index 9e52fb51ba267..8ecba3c48ee6b 100644 --- a/weaviate/tests/kind/weaviate_auth.yaml +++ b/weaviate/tests/kind/weaviate_auth.yaml @@ -95,7 +95,7 @@ spec: terminationGracePeriodSeconds: 600 containers: - name: weaviate - image: 'docker.io/semitechnologies/weaviate:1.19.1' + image: 'docker.io/semitechnologies/weaviate:1.20.0' imagePullPolicy: IfNotPresent command: - /bin/weaviate diff --git a/weaviate/tests/kind/weaviate_install.yaml b/weaviate/tests/kind/weaviate_install.yaml index aa27df1ea4fe8..f02306b236970 100644 --- a/weaviate/tests/kind/weaviate_install.yaml +++ b/weaviate/tests/kind/weaviate_install.yaml @@ -89,7 +89,7 @@ spec: terminationGracePeriodSeconds: 600 containers: - name: weaviate - image: 'docker.io/semitechnologies/weaviate:1.19.1' + image: 'docker.io/semitechnologies/weaviate:1.20.0' imagePullPolicy: IfNotPresent command: - /bin/weaviate