Skip to content

Commit 229dce9

Browse files
authored
Merge branch 'master' into noueman/add-teleport-integration
2 parents fb11765 + 58f3ead commit 229dce9

File tree

328 files changed

+8401
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+8401
-977
lines changed

.builders/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from packaging.requirements import InvalidRequirement, Requirement
1515

1616
HERE = Path(__file__).parent
17-
REQUIREMENTS_FILE = HERE.parent / 'datadog_checks_base' / 'datadog_checks' / 'base' / 'data' / 'agent_requirements.in'
17+
REQUIREMENTS_FILE = HERE.parent / 'agent_requirements.in'
1818

1919
if sys.platform == 'win32':
2020

.builders/images/linux-aarch64/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN export LD_LIBRARY_PATH="/opt/python/${PYTHON2_VERSION}/lib:${LD_LIBRARY_PATH
3737
# openssl
3838
RUN yum install -y perl-IPC-Cmd && \
3939
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
40-
VERSION="3.0.12" \
41-
SHA256="f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61" \
40+
VERSION="3.0.13" \
41+
SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
4242
RELATIVE_PATH="openssl-{{version}}" \
4343
# https://docs.python.org/3/using/unix.html#custom-openssl
4444
INSTALL_COMMAND="make install_sw" \
@@ -81,9 +81,9 @@ RUN \
8181

8282
# libxml & libxslt for lxml
8383
RUN \
84-
DOWNLOAD_URL="https://download.gnome.org/sources/libxml2/2.10/libxml2-{{version}}.tar.xz" \
85-
VERSION="2.10.3" \
86-
SHA256="5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c" \
84+
DOWNLOAD_URL="https://download.gnome.org/sources/libxml2/2.12/libxml2-{{version}}.tar.xz" \
85+
VERSION="2.12.6" \
86+
SHA256="889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb" \
8787
RELATIVE_PATH="libxml2-{{version}}" \
8888
bash install-from-source.sh \
8989
--without-iconv \
@@ -99,8 +99,8 @@ RUN \
9999

100100
RUN \
101101
DOWNLOAD_URL="https://download.gnome.org/sources/libxslt/1.1/libxslt-{{version}}.tar.xz" \
102-
VERSION="1.1.37" \
103-
SHA256="3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" \
102+
VERSION="1.1.39" \
103+
SHA256="2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" \
104104
RELATIVE_PATH="libxslt-{{version}}" \
105105
bash install-from-source.sh \
106106
--without-python \

.builders/images/linux-x86_64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RUN /opt/python/${PYTHON2_VERSION}/bin/python -m pip install --no-warn-script-lo
3535
# openssl
3636
RUN yum install -y perl-IPC-Cmd && \
3737
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
38-
VERSION="3.0.12" \
39-
SHA256="f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61" \
38+
VERSION="3.0.13" \
39+
SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
4040
RELATIVE_PATH="openssl-{{version}}" \
4141
# https://docs.python.org/3/using/unix.html#custom-openssl
4242
INSTALL_COMMAND="make install_sw" \

.builders/images/macos-x86_64/builder_setup.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ cp -R /opt/mqm "${DD_PREFIX_PATH}"
2727

2828
# openssl
2929
DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
30-
VERSION="3.0.12" \
31-
SHA256="f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61" \
30+
VERSION="3.0.13" \
31+
SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
3232
RELATIVE_PATH="openssl-{{version}}" \
3333
CONFIGURE_SCRIPT="./config" \
3434
install-from-source \
@@ -45,9 +45,9 @@ RELATIVE_PATH="zlib-{{version}}" \
4545
install-from-source
4646

4747
# libxml & libxslt for lxml
48-
DOWNLOAD_URL="https://download.gnome.org/sources/libxml2/2.10/libxml2-{{version}}.tar.xz" \
49-
VERSION="2.10.3" \
50-
SHA256="5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c" \
48+
DOWNLOAD_URL="https://download.gnome.org/sources/libxml2/2.12/libxml2-{{version}}.tar.xz" \
49+
VERSION="2.12.6" \
50+
SHA256="889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb" \
5151
RELATIVE_PATH="libxml2-{{version}}" \
5252
install-from-source \
5353
--without-iconv \
@@ -62,8 +62,8 @@ RELATIVE_PATH="libxml2-{{version}}" \
6262
--disable-static
6363

6464
DOWNLOAD_URL="https://download.gnome.org/sources/libxslt/1.1/libxslt-{{version}}.tar.xz" \
65-
VERSION="1.1.37" \
66-
SHA256="3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" \
65+
VERSION="1.1.39" \
66+
SHA256="2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" \
6767
RELATIVE_PATH="libxslt-{{version}}" \
6868
install-from-source \
6969
--with-libxml-prefix="${DD_PREFIX_PATH}" \

.builders/lock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
REPO_DIR = BUILDER_DIR.parent
1717
RESOLUTION_DIR = REPO_DIR / '.deps'
1818
LOCK_FILE_DIR = RESOLUTION_DIR / 'resolved'
19-
DIRECT_DEP_FILE = REPO_DIR / 'datadog_checks_base' / 'datadog_checks' / 'base' / 'data' / 'agent_requirements.in'
19+
DIRECT_DEP_FILE = REPO_DIR / 'agent_requirements.in'
2020
CONSTANTS_FILE = REPO_DIR / 'ddev' / 'src' / 'ddev' / 'repo' / 'constants.py'
2121
TARGET_TAG_PATTERNS = {
2222
'linux-x86_64': 'manylinux.*_x86_64|linux_x86_64',

.codecov.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ coverage:
182182
target: 75
183183
flags:
184184
- eks_fargate
185+
ESXi:
186+
target: 75
187+
flags:
188+
- esxi
185189
Elasticsearch:
186190
target: 75
187191
flags:
@@ -912,6 +916,11 @@ flags:
912916
paths:
913917
- envoy/datadog_checks/envoy
914918
- envoy/tests
919+
esxi:
920+
carryforward: true
921+
paths:
922+
- esxi/datadog_checks/esxi
923+
- esxi/tests
915924
etcd:
916925
carryforward: true
917926
paths:

.deps/image_digests.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"linux-aarch64": "sha256:fbee613a648d3c077c9c2b812ba9c27b9ad91b59950f96aa68e133ca190ae482",
3-
"linux-x86_64": "sha256:a5a12e1ab3c3fd7260d8d7fe0cd0022d951c08a797d5118f67f386c69a4e9312",
4-
"windows-x86_64": "sha256:e0edbbe6e1717316e7e91a47c93e80d8c12a7c613016ac5788e262c2a1645b4a"
2+
"linux-aarch64": "sha256:7ba1733954f7c19d2290256f6bae559512a1be971bee7d606c1d9115da2cf7b9",
3+
"linux-x86_64": "sha256:da5a207d11b4298415474208e3383905724b7cabc2fe6ba2ca2dd760d7491fb3",
4+
"windows-x86_64": "sha256:a083c067ae83f04f46c01d57398ed2f16a88a6f261737cb355b9aff6c21f4130"
55
}

.deps/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"sha256": "e140590cc5f0e14143a879debb7b7c9929e7a11bc33843d9c44f0ef77f5a6301"
2+
"sha256": "3039455b74402de2a855bc4e6218a087b5979155d5858c7b693456f1479d3965"
33
}

0 commit comments

Comments
 (0)