brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceeaspb <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request #204: Move machine metrics to SoftwareProcess e...
Date Thu, 16 Jun 2016 10:39:30 GMT
Github user ceeaspb commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/204#discussion_r67323169
  
    --- Diff: software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
---
    @@ -287,6 +299,89 @@ protected void postDriverStart() {
          */
         protected void connectSensors() {
             connectedSensors = true;
    +        boolean retrieveMachineMetrics = config().get(RETRIEVE_MACHINE_METRICS);
    +        if (retrieveMachineMetrics) connectMachineSensors();
    +    }
    +
    +    /**
    +     * Adds sensors returning details about the machine the process is running on.
    +     * <p>
    +     * The machine must be SSHable and running Linux.
    +     */
    +    protected void connectMachineSensors() {
    +        Maybe<SshMachineLocation> location = Machines.findUniqueMachineLocation(getLocations(),
SshMachineLocation.class);
    +        if (location.isPresent() && location.get().getOsDetails().isLinux())
{
    +            machineSensorFeed = SshFeed.builder()
    +                    .entity(this)
    +                    .period(Duration.THIRTY_SECONDS)
    +                    .poll(SshPollConfig.forSensor(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(SshPollConfig.forSensor(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(SshPollConfig.forSensor(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);
    --- End diff --
    
    the divisor total time is missing some fields new in 2.6.3* and later kernels, eg. see

    http://procps.cvs.sourceforge.net/viewvc/procps/procps/vmstat.c
    eg.
    Div= duse+dsys+didl+diow+dstl;


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message