Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/204#discussion_r67669549
--- Diff:
software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java
---
@@ -61,82 +51,17 @@ public void init() {
@Override
protected void connectSensors() {
super.connectSensors();
-
- // Sensors linux-specific
- if (!getMachine().getMachineDetails().getOsDetails().isLinux())
return;
-
- sensorFeed = SshFeed.builder()
- .entity(this)
- .period(Duration.THIRTY_SECONDS)
- .poll(new SshPollConfig<Duration>(UPTIME)
- .command("cat /proc/uptime")
-
.onFailureOrException(Functions.<Duration>constant(null))
- .onSuccess(new Function<SshPollValue, Duration>() {
- @Override
- public Duration apply(SshPollValue input) {
- return Duration.seconds( Double.valueOf(
Strings.getFirstWord(input.getStdout()) ) );
- }
- }))
- .poll(new SshPollConfig<Double>(LOAD_AVERAGE)
- .command("uptime")
- .onFailureOrException(Functions.constant(-1d))
- .onSuccess(new Function<SshPollValue, Double>() {
- @Override
- public Double apply(SshPollValue input) {
- String loadAverage =
Strings.getFirstWordAfter(input.getStdout(), "load average:").replace(",", "");
- return Double.valueOf(loadAverage);
- }
- }))
- .poll(new SshPollConfig<Double>(CPU_USAGE)
- .command("cat /proc/stat")
- .onFailureOrException(Functions.constant(-1d))
- .onSuccess(new Function<SshPollValue, Double>() {
- @Override
- public Double apply(SshPollValue input) {
- List<String> cpuData = Splitter.on("
").omitEmptyStrings().splitToList(Strings.getFirstLine(input.getStdout()));
- Integer system =
Integer.parseInt(cpuData.get(1));
- Integer user =
Integer.parseInt(cpuData.get(3));
- Integer idle =
Integer.parseInt(cpuData.get(4));
- return (double) (system + user) / (double)
(system + user + idle);
- }
- }))
- .poll(new SshPollConfig<Long>(USED_MEMORY)
- .command("free | grep Mem:")
- .onFailureOrException(Functions.constant(-1L))
- .onSuccess(new Function<SshPollValue, Long>() {
- @Override
- public Long apply(SshPollValue input) {
- List<String> memoryData = Splitter.on("
").omitEmptyStrings().splitToList(Strings.getFirstLine(input.getStdout()));
- return Long.parseLong(memoryData.get(2));
- }
- }))
- .poll(new SshPollConfig<Long>(FREE_MEMORY)
- .command("free | grep Mem:")
- .onFailureOrException(Functions.constant(-1L))
- .onSuccess(new Function<SshPollValue, Long>() {
- @Override
- public Long apply(SshPollValue input) {
- List<String> memoryData = Splitter.on("
").omitEmptyStrings().splitToList(Strings.getFirstLine(input.getStdout()));
- return Long.parseLong(memoryData.get(3));
- }
- }))
- .poll(new SshPollConfig<Long>(TOTAL_MEMORY)
- .command("free | grep Mem:")
- .onFailureOrException(Functions.constant(-1L))
- .onSuccess(new Function<SshPollValue, Long>() {
- @Override
- public Long apply(SshPollValue input) {
- List<String> memoryData = Splitter.on("
").omitEmptyStrings().splitToList(Strings.getFirstLine(input.getStdout()));
- return Long.parseLong(memoryData.get(1));
- }
- }))
- .build();
-
+ Maybe<SshMachineLocation> location =
Machines.findUniqueMachineLocation(getLocations(), SshMachineLocation.class);
+ if (location.isPresent() &&
location.get().getOsDetails().isLinux()) {
+ machineMetricsFeed =
AddMachineMetrics.createMachineMetricsFeed(this);
+ AddMachineMetrics.addMachineMetricsEnrichers(this);
--- End diff --
Move this to the `init` method - don't want enrichers added on each startup.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
