diff --git a/.gitlab/tagger/build-packages.sh b/.gitlab/tagger/build-packages.sh index bc73a9e30d1ef..f88515599b364 100755 --- a/.gitlab/tagger/build-packages.sh +++ b/.gitlab/tagger/build-packages.sh @@ -4,7 +4,7 @@ set -euxo pipefail IFS=$'\n\t' curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=master \ - --form variables[ORIG_CI_BUILD_REF]=$CI_BUILD_REF \ + --form variables[ORIG_CI_BUILD_REF]=$CI_COMMIT_SHA \ --form variables[ROOT_LAYOUT_TYPE]=core \ --form variables[REPO_NAME]=integrations-core \ https://gitlab.ddbuild.io/api/v4/projects/138/trigger/pipeline diff --git a/.in-toto/tag.ec45eb9d.link b/.in-toto/tag.ec45eb9d.link index 7398c00ad9e30..840fc26ffc0f4 100644 --- a/.in-toto/tag.ec45eb9d.link +++ b/.in-toto/tag.ec45eb9d.link @@ -1 +1 @@ -{"signatures":[{"keyid":"ec45eb9dac9d6ba1bcd131314583c67851bebf0d","other_headers":"04000108001d162104ec45eb9dac9d6ba1bcd131314583c67851bebf0d0502644292d0","signature":"341f54ec59bb1e9eb9887a4010a92021f5f3116434bfef4cbf073e57b0b1639d55550cfe3490c3b5e5b298be060379fac590a53e15817b940a7aa1ed7f9c198bc5152a0f222cda4efe70ff957847f55e8cbf963132175efd885e4af2233199ce33b66f7c822dfdaeec3a9fd78ca318d3317b95ea68f2dee081a3cd7161e4eef82f2b6be007f98eb5e87685e42dce592387df399a8997bc623258e37633674ec32bf126b804ac9251a00ba2eb5c26c3e175e073162659a15563444e42faefc88597438f70da788ecf9d591466d62b56263bf4c741caa3794cbc9945c05776146cba078894e2dfb7512b44ce9426587b072003996087d30ef4994141353a8802a29ddc2e1333376481c832f9436acb5dd2c729fae99847fe6031172a6d3eeb455dc8edad6e27199826192fcae7cdeff037d1391afc97be3e82119f78c8b70e60711d9fee2c387e03a21430b87af32860c7667511a4f4dd37dcd93518f1983a745b26998880c5e30380c0410ac371ce27b29d97dd0601b30feb8d3be3c75d3c275c77e99cb8209d4f4665717123a9cc8d1deffc4a2d009cce2df94bf87fe25c46f123f0863f2e462a2e2c70d6aa5f664fa255dae69316579c37a737cca6fc1121b76ad648999f1b3b9859b252b8e8adb5f9093d8db5ddbe2140fa7135645a8f347be71a5dd9cc46619a9109d4067e1d8083d59a7dbbf124c119d10596a52b92fed2"}],"signed":{"_type":"link","byproducts":{},"command":[],"environment":{},"materials":{},"name":"tag","products":{"gitlab/datadog_checks/__init__.py":{"sha256":"9a3c64b8b00c94da4b4f34618d803d3255808caf21b8afa9195c84b61da66b6a"},"gitlab/datadog_checks/gitlab/__about__.py":{"sha256":"99de42e506b6a61ac5b54cd1f7979537ca135c85018ba62a99ba0fa5237e39d0"},"gitlab/datadog_checks/gitlab/__init__.py":{"sha256":"7e2ca759129ff547ba34900d2cba739046888edd36fc5716f3dbb01d0a00372d"},"gitlab/datadog_checks/gitlab/common.py":{"sha256":"e4709efcdeda37972873ccf50a24154b5232c945e416f3957e0843ecf9403aad"},"gitlab/datadog_checks/gitlab/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"gitlab/datadog_checks/gitlab/config_models/defaults.py":{"sha256":"90fcf6a403f6d4f9b1c8658227028744f70af24a8a4e41f21e2f0c9f8cc4de0f"},"gitlab/datadog_checks/gitlab/config_models/instance.py":{"sha256":"08a30efae0cb19cff9eeb5dcfb9d89848dd5f20564ab645a6914dcb7f61e2571"},"gitlab/datadog_checks/gitlab/config_models/shared.py":{"sha256":"ff48a3fd24b23705bb1558f4df0e03ed77d565fc9a0cde059113e3c6f2d8f18c"},"gitlab/datadog_checks/gitlab/config_models/validators.py":{"sha256":"0424fe17778b76e1b589b9564d0d543d1b71dba1edd6e5d71a7c528dddf68e0b"},"gitlab/datadog_checks/gitlab/data/conf.yaml.example":{"sha256":"85a1ab3e094a0eeb21d7bb752aad681d43d614603ee716ee3b70e2409880b609"},"gitlab/datadog_checks/gitlab/gitlab.py":{"sha256":"625f7c8b491dbbfe6a647f7d1b5891b359ce69a50a112d73fc30edd9cd309104"},"gitlab/datadog_checks/gitlab/gitlab_v2.py":{"sha256":"f604b04f9a0e72266c2d8546e31ed1f279ac39bd53b5f383bf4c9ee3cdebbd32"},"gitlab/datadog_checks/gitlab/metrics.py":{"sha256":"ddd4b0306cf08936bc19ad600dce017002f8dce337043908cf20d8473ecdede8"},"gitlab/pyproject.toml":{"sha256":"57be80dbe7cc4e43cfeba240440868f13873232b3dac21a5f5bfdf4508501c16"},"gitlab/setup.py":{"sha256":"6072000497f9fbae9689583aa4294996c368c5a25c4fc5d6e7c1ce3cad16f856"},"kafka_consumer/datadog_checks/__init__.py":{"sha256":"9a3c64b8b00c94da4b4f34618d803d3255808caf21b8afa9195c84b61da66b6a"},"kafka_consumer/datadog_checks/kafka_consumer/__about__.py":{"sha256":"c0d0d4f1cf6c1cb6d33cb4d8b4ff01414154a62c76dca52cc6cac692a979fde2"},"kafka_consumer/datadog_checks/kafka_consumer/__init__.py":{"sha256":"5d5a2f991c64a95c96c8713f3179f9d0944682b6bed037b8c34d9f85463ca57c"},"kafka_consumer/datadog_checks/kafka_consumer/client.py":{"sha256":"9bf9561f7ce4e892074d552b2521a212a569b7cbba994dbc6411e3c83454344c"},"kafka_consumer/datadog_checks/kafka_consumer/config.py":{"sha256":"dd5e960e2d498a61877fcc9989501577c975c8947a4db5f325d881fb3beaa72f"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py":{"sha256":"5c46e0f757deee89e8ffb54fb9c06fb21ddb7fdbf253dcf80f42ae63e0c516fa"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py":{"sha256":"10ad3f00ae389d32c47d79d2be6de4e85f6d33d616afda64b4220be45ced9be1"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/shared.py":{"sha256":"aaac974b2272d540203aa9822a55bf3601c3d824e03e6ea9bb0ffa3bc316e76a"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/validators.py":{"sha256":"0424fe17778b76e1b589b9564d0d543d1b71dba1edd6e5d71a7c528dddf68e0b"},"kafka_consumer/datadog_checks/kafka_consumer/constants.py":{"sha256":"b57d98ed87808dafe5b26be9d5896e3915eb8db21498e401bcf1e3774e5091c0"},"kafka_consumer/datadog_checks/kafka_consumer/data/conf.yaml.example":{"sha256":"3ae4bb0653c82faa90e2d883a59c559cef1a8f95c3b440f52d4c23505f9c98ce"},"kafka_consumer/datadog_checks/kafka_consumer/kafka_consumer.py":{"sha256":"63c95a463986cb85695b4e65e25f721d2ab71e99c018817e1b00383dfb297047"},"kafka_consumer/pyproject.toml":{"sha256":"dde2f1b102b7bdcd30eaed60d532f13ac67165a26bbc2cd728d8516a47a8d74f"},"mysql/datadog_checks/__init__.py":{"sha256":"9a3c64b8b00c94da4b4f34618d803d3255808caf21b8afa9195c84b61da66b6a"},"mysql/datadog_checks/mysql/__about__.py":{"sha256":"16da6883c8781a8f4ac4b0a3992a669d52b31acd4ba5ce2a031f12f5bb145006"},"mysql/datadog_checks/mysql/__init__.py":{"sha256":"4c8b91ad58403cc613a89e3e3aff174eabc45c5c3341eed2097b92140e14c5b9"},"mysql/datadog_checks/mysql/activity.py":{"sha256":"0209a4253163800b8d4c2505090dc35dc3cf56b67a8808d493be7f26cdb9ef84"},"mysql/datadog_checks/mysql/collection_utils.py":{"sha256":"271fb527672016e0edc77d14bcfe71b4a0b242b9c639d343b12bbb1ce10b7cf7"},"mysql/datadog_checks/mysql/config.py":{"sha256":"ae89a54d85a71dd8e046ab00257d2dc23063b96ffee6910e6ac1a3de430fb53c"},"mysql/datadog_checks/mysql/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"mysql/datadog_checks/mysql/config_models/defaults.py":{"sha256":"a6085c7683d52b784c07cfcffea03af8d7c4b009a0393e8b88fcbf57b3120fed"},"mysql/datadog_checks/mysql/config_models/instance.py":{"sha256":"c8995178d718fcd5b0275e0907cfda95a469001d78d0af76e818dec4fa67500e"},"mysql/datadog_checks/mysql/config_models/shared.py":{"sha256":"50e1bd92923890c0bf0689416fdb1f5192e49202c10f6798ab5e0e613fe6ede8"},"mysql/datadog_checks/mysql/config_models/validators.py":{"sha256":"9beccee4f007680175106485383200d3b84d198897f0af516b91097f5794586e"},"mysql/datadog_checks/mysql/const.py":{"sha256":"78e1aa8e85be4b8ba1f44bc96f67dc80b8acda2871ae1ba512bc2e66ad1ceba8"},"mysql/datadog_checks/mysql/data/conf.yaml.example":{"sha256":"6dfbbb9423d4dd6758bd77d8ced62c3cf8cfa88c85004801fd65d6d02f027956"},"mysql/datadog_checks/mysql/innodb_metrics.py":{"sha256":"bfd88e338995a7f4ad31d7da0ee8459cc4646842244c29fafa392e2d4cf9a9cc"},"mysql/datadog_checks/mysql/mysql.py":{"sha256":"81d7c3a364b99027308be571850f99146c1ff1c7db00f63cd7a6fc0ef4cc58a7"},"mysql/datadog_checks/mysql/queries.py":{"sha256":"a0dd214a5699c4122ed681dd5f789bb5f979e3afceb2bbc7daea0b5dd5644590"},"mysql/datadog_checks/mysql/statement_samples.py":{"sha256":"c5a0f6befd5141eaceef1f3e0c7211127fa793fa04842995cc7ac1c2f194201b"},"mysql/datadog_checks/mysql/statements.py":{"sha256":"0a2a6c857cf3fadcc321465029f61c93328d92ad6d88afbbf43726c3d6d70dd1"},"mysql/datadog_checks/mysql/util.py":{"sha256":"f79d39b5d7420119d0b3247d45dfae9e287a71426d4c35df9f1cef1bc796b8bb"},"mysql/datadog_checks/mysql/version_utils.py":{"sha256":"393097b6536264021b4421ed8adccbfece01202671cd371409b7a7656b8570c4"},"mysql/pyproject.toml":{"sha256":"5775c7a52ee5f05a0a85ed75df17f339016ae936ba686160f0516ea68b7a080a"},"mysql/setup.py":{"sha256":"50c0c6130948f1edcbddb6e1a984dc0e59fbd14024bb0dff479c8faef180dac3"}}}} \ No newline at end of file +{"signatures":[{"keyid":"ec45eb9dac9d6ba1bcd131314583c67851bebf0d","other_headers":"04000108001d162104ec45eb9dac9d6ba1bcd131314583c67851bebf0d05026557a9f6","signature":"8cc65483ec0d932c6f8653f46b99d4025b707f22529475d60cd8209942c66d76cb59e470523ebc4c4298f5a0e6db6e3d0ee94fca6363bfdd37c92c9d7f7bbf1f20060dbed2e361f659d284a19f53bc07c41c7cb9aaeb167211e681db93ee970d7596c14321ccef083f3d87da477b3770f83ae288fc6348f27690cf25349fb0eb43fc14af08926ebcbeef4ea4c0375c7e4ffa9291b0cae6ac68aa2da8cbe8bab645f2de983a5323efca7f90645bf27f14d8edd47973b9eed34462595186c404c6a5614d1017e75d1b3f50e250c334f0caef4695fd9acf4dd212f4bd839a090821d7f6001982c3cee8fbaa0888f63a0ad8796fe610f8e5afa5c7a3da6cd41a86557e03747400cee4773681e277722200b0e68d54234535c41fcfd03fe1af58ea64ef4bce07ea7d7235dc5bd2887b97708177cdc920fe291e2d0c0f0a531dc8e932dc25a52a4c0751b0bb73d49908a1e025f778c3d72bdf4beb47d51663a1fa5678d3c10eefb195bb668d6e369e401299b9305bcabc16a5be62ef7dcf4a93ea1846baef31f4019968d632121df5c8fe2e65166a9614a82a48919af86fa9b8196615b995c505ffba805c30a1c440c7defd993140fdc886bdb23b3d96b10c01d1b9dc9b178a3d0b64bf380f7b3d5aff672ff5a15ee4ee3d13853cf31ef6cb6886315cd682b824249b4ed37f2cca402bfde25f0702810e8478c88be9f321591b129440"}],"signed":{"_type":"link","byproducts":{},"command":[],"environment":{},"materials":{},"name":"tag","products":{"silk/datadog_checks/__init__.py":{"sha256":"9bf116cc5e14139f58802ece354b270c165226e0cd229e867e2cb291b6855643"},"silk/datadog_checks/silk/__about__.py":{"sha256":"3fa6fb1135e0a53456323096a8dbff6a1e5d1af046f5040af0a77ef8b93ae5ec"},"silk/datadog_checks/silk/__init__.py":{"sha256":"d2a12d0771d2a633dc18914ef285ed03686b5c1f917d039a0706a2296081420b"},"silk/datadog_checks/silk/check.py":{"sha256":"d1a09e6a377de706b6e3ca78af6444e0e92e3398d7d6ab7fe7e33ab559d3a10a"},"silk/datadog_checks/silk/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"silk/datadog_checks/silk/config_models/defaults.py":{"sha256":"1f20d07d53c608977016c4d0c611ebc23f83d273afb1961018842588654ccd6d"},"silk/datadog_checks/silk/config_models/instance.py":{"sha256":"2f42d7615570628b6bcea64fa0cfec904b244d68548a0d0c0678ecc6ed6fee26"},"silk/datadog_checks/silk/config_models/shared.py":{"sha256":"ff48a3fd24b23705bb1558f4df0e03ed77d565fc9a0cde059113e3c6f2d8f18c"},"silk/datadog_checks/silk/config_models/validators.py":{"sha256":"eadaef467b48130997d3dbd2d0b9ac825f61f9b633a35365faa981784faca56e"},"silk/datadog_checks/silk/constants.py":{"sha256":"b02c32310c21e7afbe1e2e5bee5495172ecf4cc5691ec20bf39bec20a6b3f88a"},"silk/datadog_checks/silk/data/conf.yaml.example":{"sha256":"941eda3d2b3349a0de097aa21c4d2b8e1a63478cbaf8110c915a73c08c211544"},"silk/datadog_checks/silk/events.py":{"sha256":"4bda932ebd8af66b2c73e409dd15c415bb9eee76c68f731f6426efdb892031e1"},"silk/datadog_checks/silk/metrics.py":{"sha256":"24940638752a5a9aabbbc47b60725d26da28e022c3888e9f8b7e84894b2d79fb"},"silk/pyproject.toml":{"sha256":"997971481cdfedd6c67dc70fd0c294907f16f2af041ebfaf8d8c20684e8574e5"},"silk/setup.py":{"sha256":"477fc150abb9eeff2fd38c7825ac0c5bbf1dc23f8861316c794432bbf5ca4610"}}}} \ No newline at end of file diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt index 66c9a5cac9963..b708e59b989e0 100644 --- a/requirements-agent-release.txt +++ b/requirements-agent-release.txt @@ -132,7 +132,7 @@ datadog-riakcs==2.9.0 datadog-sap-hana==2.2.1 datadog-scylla==2.3.0 datadog-sidekiq==1.3.0 -datadog-silk==1.2.2 +datadog-silk==1.2.3-beta.2 datadog-singlestore==1.3.1 datadog-snmp==5.11.0 datadog-snowflake==4.5.2 diff --git a/silk/CHANGELOG.md b/silk/CHANGELOG.md index 6e7752169be4c..6ca3c8ed32242 100644 --- a/silk/CHANGELOG.md +++ b/silk/CHANGELOG.md @@ -2,6 +2,10 @@ ## 1.2.2 / 2023-04-14 +## 1.2.3-beta.2 / 2023-11-16 + +## 1.2.3-beta.1 / 2023-11-16 + * [Fixed] Fix duplicate events bug. See [#14020](https://github.com/DataDog/integrations-core/pull/14020). ## 1.2.1 / 2023-03-03 diff --git a/silk/datadog_checks/silk/__about__.py b/silk/datadog_checks/silk/__about__.py index 85be9b3963a69..6bf2d62a6e045 100644 --- a/silk/datadog_checks/silk/__about__.py +++ b/silk/datadog_checks/silk/__about__.py @@ -1,4 +1,4 @@ # (C) Datadog, Inc. 2021-present # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = '1.2.2' +__version__ = '1.2.3-beta.2' diff --git a/silk/datadog_checks/silk/check.py b/silk/datadog_checks/silk/check.py index 4d4d481b3682b..93688ed11f542 100644 --- a/silk/datadog_checks/silk/check.py +++ b/silk/datadog_checks/silk/check.py @@ -212,6 +212,9 @@ def collect_events(self, system_tags): # Use `self.latest_event_query` as starting time and `collect_events_timestamp` as ending time event_query = EVENT_PATH.format(int(self.latest_event_query), int(collect_events_timestamp)) raw_events, _ = self._get_data(event_query) + + self.debug.log("Received %s events.", len(raw_events)) + self.debug.log("Events: %s", raw_events) for event in raw_events: try: