diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java index 9b1364c9d..de5cb9b99 100644 --- a/src/main/java/org/datadog/jmxfetch/Instance.java +++ b/src/main/java/org/datadog/jmxfetch/Instance.java @@ -224,8 +224,13 @@ public Instance( } } - loadDefaultConfig("default-jmx-metrics.yaml"); - loadDefaultConfig(gcMetricConfig); + Boolean collectDefaultJvmMetrics = (Boolean) instanceMap.get("collect_default_jvm_metrics"); + if (collectDefaultJvmMetrics == null || collectDefaultJvmMetrics) { + loadDefaultConfig("default-jmx-metrics.yaml"); + loadDefaultConfig(gcMetricConfig); + } else { + log.info("collect_default_jvm_metrics is false - not collecting default JVM metrics"); + } } public static boolean isDirectInstance(Map configInstance) {