Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion client/src/main/java/com/metamx/druid/QueryableNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,19 @@ private void initializeMonitors()
List<Monitor> theMonitors = Lists.newArrayList();
theMonitors.add(new JvmMonitor());
if (Boolean.parseBoolean(props.getProperty("druid.monitoring.monitorSystem", "false"))) {
theMonitors.add(new SysMonitor());
SysMonitor sysMonitor = new SysMonitor();
if (Boolean.parseBoolean(props.getProperty("druid.monitoring.monitorDirs", "false"))) {
String csv = getProps().getProperty("druid.monitoring.dirs");
if (csv != null) {
sysMonitor.addDirectoriesToMonitor(csv.split(","));
} else {
log.warn(
"druid.monitoring.monitorDirs is set to true but no directory path is set to monitor."
+ " Please set it using druid.monitoring.dirs."
);
}
}
theMonitors.add(sysMonitor);
}

setMonitors(theMonitors);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,18 @@ private void initializeMonitors()
if (monitors == null) {
monitors = Lists.newArrayList();
monitors.add(new JvmMonitor());
SysMonitor sysMonitor = new SysMonitor();
if (Boolean.parseBoolean(getProps().getProperty("druid.monitoring.monitorDirs", "false"))) {
String csv = getProps().getProperty("druid.monitoring.dirs");
if (csv != null) {
sysMonitor.addDirectoriesToMonitor(csv.split(","));
} else {
log.warn(
"druid.monitoring.monitorDirs is set to true but no directory path is set to monitor."
+ " Please set it using druid.monitoring.dirs."
);
}
}
monitors.add(new SysMonitor());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,19 @@ private void initializeMonitors()
if (monitors == null) {
monitors = Lists.newArrayList();
monitors.add(new JvmMonitor());
monitors.add(new SysMonitor());
SysMonitor sysMonitor = new SysMonitor();
if (Boolean.parseBoolean(getProps().getProperty("druid.monitoring.monitorDirs", "false"))) {
String csv = getProps().getProperty("druid.monitoring.dirs");
if (csv != null) {
sysMonitor.addDirectoriesToMonitor(csv.split(","));
} else {
log.warn(
"druid.monitoring.monitorDirs is set to true but no directory path is set to monitor."
+ " Please set it using druid.monitoring.dirs."
);
}
}
monitors.add(sysMonitor);
}
}

Expand Down
14 changes: 13 additions & 1 deletion server/src/main/java/com/metamx/druid/http/MasterMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,19 @@ public static void main(String[] args) throws Exception
final List<Monitor> monitors = Lists.newArrayList();
monitors.add(new JvmMonitor());
if (Boolean.parseBoolean(props.getProperty("druid.monitoring.monitorSystem", "false"))) {
monitors.add(new SysMonitor());
SysMonitor sysMonitor = new SysMonitor();
if (Boolean.parseBoolean(props.getProperty("druid.monitoring.monitorDirs", "false"))) {
String csv = props.getProperty("druid.monitoring.dirs");
if (csv != null) {
sysMonitor.addDirectoriesToMonitor(csv.split(","));
} else {
log.warn(
"druid.monitoring.monitorDirs is set to true but no directory path is set to monitor."
+ " Please set it using druid.monitoring.dirs."
);
}
}
monitors.add(sysMonitor);
}

final MonitorScheduler healthMonitor = new MonitorScheduler(
Expand Down