summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Rayner <adam.rayner@gmail.com>2022-06-20 20:06:35 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-06-20 20:38:07 +0000
commit451d1b53f1993bef6293de321d807f99778a848d (patch)
tree98e0a807dcb6aa77e1745217d30328a33c8e2046
parent77ee09ff95f6f51483ed1cde01198879adaa71ad (diff)
downloadmongo-451d1b53f1993bef6293de321d807f99778a848d.tar.gz
SERVER-65733: remove SNMP module
-rw-r--r--buildscripts/antithesis/base_images/mongo_binaries/Dockerfile2
-rw-r--r--buildscripts/antithesis/base_images/workload/Dockerfile2
-rwxr-xr-xbuildscripts/packager_enterprise.py6
-rw-r--r--buildscripts/packaging/msi/mongod.yaml2
-rw-r--r--buildscripts/resmokeconfig/suites/snmp.yml11
-rw-r--r--etc/evergreen.yml29
-rw-r--r--src/mongo/db/SConscript12
-rw-r--r--src/mongo/db/initialize_snmp.cpp48
-rw-r--r--src/mongo/db/initialize_snmp.h52
-rw-r--r--src/mongo/db/mongod_main.cpp3
-rw-r--r--src/mongo/db/stats/counters.h2
-rw-r--r--src/mongo/installer/msi/SConscript1
-rw-r--r--src/mongo/installer/msi/wxs/BinaryFragment.wxs39
-rw-r--r--src/mongo/installer/msi/wxs/Installer_64.wxs1
-rw-r--r--src/mongo/util/procparser_test.cpp19
15 files changed, 13 insertions, 216 deletions
diff --git a/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile b/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
index 5390f8b9ddb..ad0709286ed 100644
--- a/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
+++ b/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
@@ -12,7 +12,7 @@ RUN mkdir -p /scripts
# Install dependencies of MongoDB Server
RUN apt-get update
-RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit snmp openssl liblzma5 python3
+RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit openssl liblzma5 python3
# -------------------
# Everything above this line should be common image setup
diff --git a/buildscripts/antithesis/base_images/workload/Dockerfile b/buildscripts/antithesis/base_images/workload/Dockerfile
index 01017d51c61..b8d46508252 100644
--- a/buildscripts/antithesis/base_images/workload/Dockerfile
+++ b/buildscripts/antithesis/base_images/workload/Dockerfile
@@ -14,7 +14,7 @@ RUN debconf-set-selections /tmp/preseed.txt
RUN rm /tmp/preseed.txt
RUN apt-get update
-RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit snmp openssl liblzma5 libssl-dev build-essential software-properties-common
+RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit openssl liblzma5 libssl-dev build-essential software-properties-common
RUN add-apt-repository ppa:deadsnakes/ppa
RUN apt-get update
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index fcc260c86be..b8f042f6cf9 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -24,7 +24,7 @@
# * Before you run the program on a new host, these are the
# prerequisites:
#
-# apt-get install dpkg-dev rpm debhelper fakeroot ia32-libs createrepo git-core libsnmp15
+# apt-get install dpkg-dev rpm debhelper fakeroot ia32-libs createrepo git-core
# echo "Now put the dist gnupg signing keys in ~root/.gnupg"
import errno
@@ -228,7 +228,7 @@ def unpack_binaries_into(build_os, arch, spec, where):
try:
packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
release_dir = glob('mongodb-linux-*')[0]
- for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2":
+ for releasefile in "bin", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2":
os.rename("%s/%s" % (release_dir, releasefile), releasefile)
os.rmdir(release_dir)
except Exception:
@@ -257,7 +257,7 @@ def make_package(distro, build_os, arch, spec, srcdir):
"(cd \"%s\" && git archive %s %s/ ) | (cd \"%s\" && tar xvf -)" %
(srcdir, spec.metadata_gitspec(), pkgdir, sdir)
])
- # Splat the binaries and snmp files under sdir. The "build" stages of the
+ # Splat the binaries under sdir. The "build" stages of the
# packaging infrastructure will move the files to wherever they
# need to go.
unpack_binaries_into(build_os, arch, spec, sdir)
diff --git a/buildscripts/packaging/msi/mongod.yaml b/buildscripts/packaging/msi/mongod.yaml
index ba10e7517ef..dd4bdb39011 100644
--- a/buildscripts/packaging/msi/mongod.yaml
+++ b/buildscripts/packaging/msi/mongod.yaml
@@ -36,5 +36,3 @@ net:
## Enterprise-Only Options:
#auditLog:
-
-#snmp:
diff --git a/buildscripts/resmokeconfig/suites/snmp.yml b/buildscripts/resmokeconfig/suites/snmp.yml
deleted file mode 100644
index a462da0b7af..00000000000
--- a/buildscripts/resmokeconfig/suites/snmp.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-test_kind: js_test
-
-selector:
- roots:
- - src/mongo/db/modules/*/jstests/snmp/*.js
-
-# snmp tests start their own mongod's.
-executor:
- config:
- shell_options:
- nodb: ''
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 6f1ee2f0dde..fddf2ff64ab 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -78,7 +78,7 @@ variables:
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi
exe: ".exe"
content_type: application/zip
- compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10
+ compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10
num_scons_link_jobs_available: 0.5
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@@ -115,7 +115,6 @@ variables:
- name: sasl
- name: sharding_auth_gen
- name: sharding_auth_audit_gen
- - name: snmp
# TODO: SERVER-XYZ remove this duplicate task definition.
- &enterprise-rhel-70-64-bit-template
@@ -183,7 +182,6 @@ variables:
- name: search_ssl
- name: sharding_auth_audit_gen
- name: sharding_auth_gen
- - name: snmp
- name: .stitch
- name: .crypt
- name: .publish_crypt
@@ -436,7 +434,6 @@ buildvariants:
- name: sharding_api_version_jscore_passthrough_gen
- name: .sharding .txns !.multiversion
- name: .sharding .common !.multiversion
- - name: snmp
- name: .stitch
- name: secondary_reads_passthrough_gen
- name: server_discovery_and_monitoring_json_test_TG
@@ -547,7 +544,6 @@ buildvariants:
#- name: session_jscore_passthrough
#- name: .sharding .jscore !.wo_snapshot
#- name: .sharding .common
- #- name: snmp
#- name: update_fuzzer_gen
- name: enterprise-rhel-80-64-bit-coverage-clang
@@ -786,7 +782,7 @@ buildvariants:
exe: ".exe"
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug
content_type: application/zip
- compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
+ compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@@ -848,7 +844,6 @@ buildvariants:
- name: sharding_auth_audit_gen
- name: sharding_ese_gen
- name: sharding_opportunistic_secondary_targeting_gen
- - name: snmp
- name: unittest_shell_hang_analyzer_gen
- <<: *enterprise-windows-required-template
@@ -860,7 +855,7 @@ buildvariants:
exe: ".exe"
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug
content_type: application/zip
- compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
+ compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@@ -919,7 +914,6 @@ buildvariants:
- name: sharding_auth_gen
- name: sharding_auth_audit_gen
- name: sharding_ese_gen
- - name: snmp
# Disabling as the following tests are not aware of feature flags.
# - name: buildscripts_test
# - name: unittest_shell_hang_analyzer_gen
@@ -935,7 +929,7 @@ buildvariants:
modules:
- enterprise
expansions:
- compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
+ compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
tasks:
- name: compile_ninja_next_TG
distros:
@@ -955,7 +949,7 @@ buildvariants:
exe: ".exe"
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug
content_type: application/zip
- compile_flags: --dbg=on --opt=on --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 --cxx-std=20
+ compile_flags: --dbg=on --opt=on --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 --cxx-std=20
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@@ -1010,7 +1004,7 @@ buildvariants:
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
exe: ".exe"
content_type: application/zip
- compile_flags: --dbg=on --opt=off --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
+ compile_flags: --dbg=on --opt=off --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@@ -1350,7 +1344,6 @@ buildvariants:
- name: .sharding .txns
- name: .sharding .common
- name: sharding_opportunistic_secondary_targeting_gen
- - name: snmp
- name: .stitch
- name: .crypt
distros:
@@ -1501,7 +1494,6 @@ buildvariants:
- name: .sharding .txns
- name: .sharding .common
- name: sharded_multi_stmt_txn_jscore_passthrough
- - name: snmp
- name: .stitch
- name: .crypt
distros:
@@ -1635,7 +1627,6 @@ buildvariants:
- rhel80-xlarge
- name: session_jscore_passthrough
- name: sharding_api_version_jscore_passthrough_gen
- - name: snmp
- name: test_api_version_compatibility
- name: unittest_shell_hang_analyzer_gen
@@ -1902,7 +1893,6 @@ buildvariants:
- name: search_ssl
- name: sharding_auth_audit_gen
- name: sharding_auth_gen
- - name: snmp
- name: .stitch
- name: test_packages
distros:
@@ -1992,7 +1982,6 @@ buildvariants:
- name: search_ssl
- name: sharding_auth_audit_gen
- name: sharding_auth_gen
- - name: snmp
- name: .stitch
- name: ubuntu1804-sbe-yielding-debug
@@ -2259,7 +2248,6 @@ buildvariants:
- name: session_jscore_passthrough
- name: .sharding .jscore !.wo_snapshot
- name: .sharding .common !.csrs
- - name: snmp
- name: .serverless
- name: .watchdog
- name: .stitch
@@ -2341,7 +2329,6 @@ buildvariants:
- name: session_jscore_passthrough
- name: .sharding .jscore !.wo_snapshot
- name: .sharding .common !.csrs
- - name: snmp
- name: .watchdog
- name: .stitch
- name: .serverless
@@ -2414,7 +2401,6 @@ buildvariants:
- name: session_jscore_passthrough
- name: .sharding .jscore !.wo_snapshot
- name: .sharding .common !.csrs
- - name: snmp
- name: .stitch
- name: .serverless
- name: .updatefuzzer
@@ -2489,7 +2475,6 @@ buildvariants:
- name: session_jscore_passthrough
- name: .sharding .jscore !.wo_snapshot
- name: .sharding .common !.csrs
- - name: snmp
- name: .stitch
- name: .updatefuzzer
- name: .serverless
@@ -2984,7 +2969,7 @@ buildvariants:
expansions:
# --link-model=dynamic is set by visiblity_test's task_compile_flags
# expansion
- compile_flags: CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10
+ compile_flags: CPPPATH="c:/sasl/include" LIBPATH="c:/sasl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
has_packages: false
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 88a299aa8e1..ea0817030cc 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -108,16 +108,6 @@ env.Library(
)
env.Library(
- target='initialize_snmp',
- source=[
- 'initialize_snmp.cpp',
- ],
- LIBDEPS=[
- '$BUILD_DIR/mongo/base',
- ],
-)
-
-env.Library(
target="dbmessage",
source=[
"dbmessage.cpp",
@@ -2441,7 +2431,6 @@ env.Library(
'index/index_access_methods',
'index/index_descriptor',
'index_builds_coordinator_mongod',
- 'initialize_snmp',
'introspect',
'keys_collection_client_direct',
'kill_sessions_local',
@@ -2551,7 +2540,6 @@ env.Library(
'index/index_access_method_factory',
'index/index_access_methods',
'index_builds_coordinator_mongod',
- 'initialize_snmp',
'keys_collection_client_direct',
'kill_sessions',
'kill_sessions_local',
diff --git a/src/mongo/db/initialize_snmp.cpp b/src/mongo/db/initialize_snmp.cpp
deleted file mode 100644
index c623b8c91f7..00000000000
--- a/src/mongo/db/initialize_snmp.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (C) 2018-present MongoDB, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the Server Side Public License in all respects for
- * all of the code used other than as permitted herein. If you modify file(s)
- * with this exception, you may extend this exception to your version of the
- * file(s), but you are not obligated to do so. If you do not wish to do so,
- * delete this exception statement from your version. If you delete this
- * exception statement from all source files in the program, then also delete
- * it in the license file.
- */
-
-#include "mongo/db/initialize_snmp.h"
-#include "mongo/util/assert_util.h"
-
-namespace mongo {
-namespace {
-bool initSet = false;
-std::function<void()> snmpInitializer = [] {};
-} // namespace
-} // namespace mongo
-
-void mongo::registerSNMPInitializer(std::function<void()> init) {
- invariant(!initSet);
- snmpInitializer = std::move(init);
- initSet = true;
-}
-
-void mongo::initializeSNMP() {
- return snmpInitializer();
-}
diff --git a/src/mongo/db/initialize_snmp.h b/src/mongo/db/initialize_snmp.h
deleted file mode 100644
index 5fb85193b43..00000000000
--- a/src/mongo/db/initialize_snmp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (C) 2018-present MongoDB, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the Server Side Public License in all respects for
- * all of the code used other than as permitted herein. If you modify file(s)
- * with this exception, you may extend this exception to your version of the
- * file(s), but you are not obligated to do so. If you do not wish to do so,
- * delete this exception statement from your version. If you delete this
- * exception statement from all source files in the program, then also delete
- * it in the license file.
- */
-
-
-#pragma once
-
-#include <functional>
-
-namespace mongo {
-/**
- * Registers the specified initializer function `init` as the initialization handler for SNMP
- * enterprise modules.
- *
- * NOTE: This function may only be called once.
- * NOTE: This function is not multithread safe.
- */
-void registerSNMPInitializer(std::function<void()> init);
-
-/**
- * Performs initialization for SNMP enterprise modules, if present, otherwise does nothing.
- *
- * This will call the function registered by `registerSNMPInitializer`. It is safe to call when no
- * function has been registered.
- */
-void initializeSNMP();
-} // namespace mongo
diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index b47ed584b9b..92601ca6a5d 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -89,7 +89,6 @@
#include "mongo/db/index_builds_coordinator_mongod.h"
#include "mongo/db/index_names.h"
#include "mongo/db/initialize_server_global_state.h"
-#include "mongo/db/initialize_snmp.h"
#include "mongo/db/internal_transactions_reap_service.h"
#include "mongo/db/introspect.h"
#include "mongo/db/json.h"
@@ -543,8 +542,6 @@ ExitCode _initAndListen(ServiceContext* serviceContext, int listenPort) {
startMongoDFTDC();
- initializeSNMP();
-
if (mongodGlobalParams.scriptingEnabled) {
ScriptEngine::setup();
}
diff --git a/src/mongo/db/stats/counters.h b/src/mongo/db/stats/counters.h
index 3d054806f46..cbf429127f6 100644
--- a/src/mongo/db/stats/counters.h
+++ b/src/mongo/db/stats/counters.h
@@ -113,7 +113,7 @@ public:
_checkWrap(&OpCounters::_acceptableErrorInCommand, 1);
}
- // thse are used by snmp, and other things, do not remove
+ // thse are used by metrics things, do not remove
const AtomicWord<long long>* getInsert() const {
return &*_insert;
}
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index 9bc64115bde..a0d68195d88 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -121,7 +121,6 @@ candle_targets = env.Command(
' -dTargetExt=.msi'
' -dTargetFileName=${SERVER_ARCHIVE}'
r' -dSaslSource=c:\sasl\bin'
- r' -dSnmpSource=c:\snmp\bin'
r' -dSslSource=' + env['WINDOWS_OPENSSL_BIN'] + ' -out ' + buildDir + r'\msi\\'
' -arch ' + msi_platform + ' -ext "$WIXUIEXT"'
' -ext "$WIXUTILEXT"'
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
index d82cbb04536..c0e2ad23db8 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -72,14 +72,6 @@
<File Id="f_saslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb"
DiskId="1" KeyPath="yes" />
</Component>
- <Component Id="c_snmp" Guid="F5E5A889-FC9F-4B9A-BEFD-C8ABC9A92D8D">
- <File Id="f_ssnmp" Name="netsnmp.dll" Source="$(var.SnmpSource)\netsnmp.dll"
- DiskId="1" KeyPath="yes" />
- </Component>
- <Component Id="c_snmpPdb" Guid="6AAB0ACE-C354-4D3A-B490-2AA235647AB3">
- <File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"
- DiskId="1" KeyPath="yes" />
- </Component>
<Component Id="c_mongocryptd" Guid="D243D194-B765-4DF8-BC67-8F4C329AD1B5">
<File Id="f_mongocryptd" Name="mongocryptd.exe" Source="$(var.BinarySource)\mongocryptd.exe"
DiskId ="1" KeyPath="yes"/>
@@ -90,30 +82,6 @@
</Component>
<?endif ?>
</DirectoryRef>
- <?if $(var.Edition) = Enterprise ?>
- <DirectoryRef Id="SNMP">
- <Component Id="c_snmpReadme" Guid="B968FBAC-1813-4039-9FED-A607A0E4CBB3">
- <File Id="f_snmpReadme" Name="README-snmp.txt" Source="$(var.EnterpriseBase)\docs\snmp\README-snmp.txt"
- DiskId="1" KeyPath="yes" />
- </Component>
- <Component Id="c_snmpConfMaster" Guid="0C8CAA6C-1473-4B14-9EE5-AF5A35B1DD8D">
- <File Id="f_snmpConfMaster" Name="mongod.conf.master" Source="$(var.EnterpriseBase)\docs\snmp\mongod.conf.master"
- DiskId="1" KeyPath="yes" />
- </Component>
- <Component Id="c_snmpConfSubagent" Guid="6FB66102-41A7-41BD-BB1F-1987E150FA78">
- <File Id="f_snmpConfSubagent" Name="mongod.conf.subagent" Source="$(var.EnterpriseBase)\docs\snmp\mongod.conf.subagent"
- DiskId="1" KeyPath="yes" />
- </Component>
- <Component Id="c_snmpMongodMib" Guid="F3E98C6B-FE42-44E7-8A1F-E47BDDD0A3D7">
- <File Id="f_snmpMongodMib" Name="MONGOD-MIB.txt" Source="$(var.EnterpriseBase)\docs\snmp\MONGOD-MIB.txt"
- DiskId="1" KeyPath="yes" />
- </Component>
- <Component Id="c_snmpMongodbincMib" Guid="58c6bd8e-a785-48a0-af48-42f6bf9f68b4">
- <File Id="f_snmpMongodbincMib" Name="MONGODBINC-MIB.txt" Source="$(var.EnterpriseBase)\docs\snmp\MONGODBINC-MIB.txt"
- DiskId="1" KeyPath="yes" />
- </Component>
- </DirectoryRef>
- <?endif ?>
<DirectoryRef Id="MONGO_DATA_PATH" >
<Component Id="c_MONGO_DATA_PATH" Guid="F695F048-E262-4871-A31B-0E2361BB4BCB">
<CreateFolder Directory="MONGO_DATA_PATH" >
@@ -143,13 +111,6 @@
</ComponentGroup>
<ComponentGroup Id="cg_EnterpriseServer">
<ComponentGroupRef Id="cg_EnterpriseBase" />
- <ComponentRef Id="c_snmp" />
- <ComponentRef Id="c_snmpPdb" />
- <ComponentRef Id="c_snmpReadme" />
- <ComponentRef Id="c_snmpConfMaster" />
- <ComponentRef Id="c_snmpConfSubagent" />
- <ComponentRef Id="c_snmpMongodMib" />
- <ComponentRef Id="c_snmpMongodbincMib" />
</ComponentGroup>
<?endif ?>
</Fragment>
diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs
index 1eb5266fe3f..96f87899f1c 100644
--- a/src/mongo/installer/msi/wxs/Installer_64.wxs
+++ b/src/mongo/installer/msi/wxs/Installer_64.wxs
@@ -47,7 +47,6 @@
<Directory Id="BIN" Name="bin" />
<Directory Id="MONGO_DATA_PATH" Name="data" />
<Directory Id="MONGO_LOG_PATH" Name="log" />
- <Directory Id="SNMP" Name="snmp" />
</Directory>
</Directory>
</Directory>
diff --git a/src/mongo/util/procparser_test.cpp b/src/mongo/util/procparser_test.cpp
index 08db075dbf7..f2cda841579 100644
--- a/src/mongo/util/procparser_test.cpp
+++ b/src/mongo/util/procparser_test.cpp
@@ -510,25 +510,6 @@ TEST(FTDCProcNetstat, TestLocalNetstat) {
ASSERT_KEY("IpExt:InOctets");
}
-// Test we can parse the /proc/net/snmp on this machine and assert we have some expected fields
-// Some keys can vary between distros, so we test only for the existence of a few basic ones
-TEST(FTDCProcNetstat, TestLocalNetSnmp) {
-
- BSONObjBuilder builder;
-
- std::vector<StringData> keys{"Tcp:"_sd, "Ip:"_sd};
-
- ASSERT_OK(procparser::parseProcNetstatFile(keys, "/proc/net/snmp", &builder));
-
- BSONObj obj = builder.obj();
- auto stringMap = toStringMap(obj);
- LOGV2(23367, "OBJ:{obj}", "obj"_attr = obj);
- ASSERT_KEY("Ip:InReceives");
- ASSERT_KEY("Ip:OutRequests");
- ASSERT_KEY("Tcp:InSegs");
- ASSERT_KEY("Tcp:OutSegs");
-}
-
TEST(FTDCProcNetstat, TestLocalNonExistentNetstat) {
std::vector<StringData> keys{};
BSONObjBuilder builder;