diff --git a/otelcollector/build/linux/Dockerfile b/otelcollector/build/linux/Dockerfile index 66af77ab..6fd4c461 100644 --- a/otelcollector/build/linux/Dockerfile +++ b/otelcollector/build/linux/Dockerfile @@ -113,7 +113,7 @@ COPY --from=fluent-bit-builder /src/out_appinsights.so $tmpdir/fluent-bit/bin/ COPY ./react /static/react COPY ./LICENSE $tmpdir/microsoft COPY ./NOTICE $tmpdir/microsoft -# COPY ./mdsd/envmdsd $tmpdir/ +COPY ./mdsd/envmdsd $tmpdir/ COPY ./build/linux/rpm-repos/ /etc/yum.repos.d/ ARG TARGETARCH @@ -179,7 +179,7 @@ COPY --from=builder /usr/bin/telegraf /usr/bin/telegraf COPY --from=builder /usr/sbin/crond /usr/sbin/crond COPY --from=builder /usr/bin/vim /usr/bin/vim COPY --from=builder /usr/share/vim /usr/share/vim -# COPY --from=builder /usr/sbin/mdsd /usr/sbin/mdsd +COPY --from=builder /usr/sbin/mdsd /usr/sbin/mdsd COPY --from=builder /usr/sbin/logrotate /usr/sbin/logrotate COPY --from=builder /usr/bin/gzip /usr/bin/ COPY --from=builder /usr/bin/curl /usr/bin/ @@ -207,7 +207,8 @@ COPY --from=builder /usr/lib/libyaml-0.so.2 /usr/lib/libsystemd.so.0 /usr/lib/li # telegraf dependencies COPY --from=builder /usr/lib/libresolv.so.2 /usr/lib/libc.so.6 /usr/lib/ # mdsd dependencies -# COPY --from=builder /usr/lib/libdl.so.2 /usr/lib/librt.so.1 /usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libstdc++.so.6 /usr/lib/libgcc_s.so.1 /usr/lib/ +COPY --from=builder /opt/microsoft/azure-mdsd/lib/libtcmalloc_minimal.so.4 /opt/microsoft/azure-mdsd/lib/ +COPY --from=builder /usr/sbin/../lib/libpthread.so.0 /usr/sbin/../lib/libdl.so.2 /usr/sbin/../lib/libsymcrypt.so.103 /usr/sbin/../lib/librt.so.1 /usr/sbin/../lib/libm.so.6 /usr/sbin/../lib/libc.so.6 /usr/sbin/../lib/libstdc++.so.6 /usr/sbin/../lib/libgcc_s.so.1 /usr/sbin/../lib/ # logrotate dependencies COPY --from=builder /usr/lib/libpopt.so.0 /usr/lib/libc.so.6 /usr/lib/ # curl dependencies diff --git a/otelcollector/build/linux/ccp/Dockerfile b/otelcollector/build/linux/ccp/Dockerfile index 5d47a39c..e4805351 100644 --- a/otelcollector/build/linux/ccp/Dockerfile +++ b/otelcollector/build/linux/ccp/Dockerfile @@ -125,9 +125,10 @@ COPY --from=builder /lib/libinotifytools.so.0 /lib/libc.so.6 /lib/ # # metricsextension dependencies # COPY --from=builder /lib/libboost_filesystem.so.1.76.0 /lib/libcpprest.so.2.10 /lib/libstdc++.so.6 /lib/libm.so.6 /lib/libgcc_s.so.1 /lib/libc.so.6 /lib/libbrotlidec.so.1 /lib/libbrotlienc.so.1 /lib/libz.so.1 /lib/libbrotlicommon.so.1 /lib/ # COPY --from=builder /lib64/libuuid.so.1 /lib64 -# # mdsd dependencies -# COPY --from=builder /usr/sbin/mdsd /usr/sbin/mdsd -# COPY --from=builder /usr/lib/libdl.so.2 /usr/lib/librt.so.1 /usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libstdc++.so.6 /usr/lib/libgcc_s.so.1 /usr/lib/ +# mdsd dependencies +COPY --from=builder /usr/sbin/mdsd /usr/sbin/mdsd +COPY --from=builder /opt/microsoft/azure-mdsd/lib/libtcmalloc_minimal.so.4 /opt/microsoft/azure-mdsd/lib/ +COPY --from=builder /usr/sbin/../lib/libpthread.so.0 /usr/sbin/../lib/libdl.so.2 /usr/sbin/../lib/libsymcrypt.so.103 /usr/sbin/../lib/librt.so.1 /usr/sbin/../lib/libm.so.6 /usr/sbin/../lib/libc.so.6 /usr/sbin/../lib/libstdc++.so.6 /usr/sbin/../lib/libgcc_s.so.1 /usr/sbin/../lib/ # debug image # COPY --from=builder /busybin /busybin diff --git a/otelcollector/scripts/ccpsetup.sh b/otelcollector/scripts/ccpsetup.sh index 956171c3..26f33312 100644 --- a/otelcollector/scripts/ccpsetup.sh +++ b/otelcollector/scripts/ccpsetup.sh @@ -27,7 +27,7 @@ sudo tdnf repolist --refresh sudo tdnf install inotify-tools -y echo "Installing mdsd..." -# sudo tdnf install -y azure-mdsd-1.30.3 +sudo tdnf install -y azure-mdsd cp -f $TMPDIR/envmdsd /etc/mdsd.d # Create the following directory for mdsd logs diff --git a/otelcollector/scripts/setup.sh b/otelcollector/scripts/setup.sh index 318a4bcd..96a3c478 100644 --- a/otelcollector/scripts/setup.sh +++ b/otelcollector/scripts/setup.sh @@ -44,7 +44,7 @@ echo "Installing mdsd..." # fi # Install this way once moving to the Mariner published RPMs: -# sudo tdnf install -y azure-mdsd-1.30.3 +sudo tdnf install -y azure-mdsd cp -f $TMPDIR/envmdsd /etc/mdsd.d # Create the following directory for mdsd logs