Repository: incubator-brooklyn Updated Branches: refs/heads/master 6caee5899 -> 5ef0b61fc
update zabbix for refactored brooklyn Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5ef0b61f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5ef0b61f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5ef0b61f Branch: refs/heads/master Commit: 5ef0b61fcbe39663e07039c76bbe36db603b4832 Parents: 6caee58 Author: Alex Heneveld <[email protected]> Authored: Mon Aug 17 11:06:48 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Aug 17 11:07:51 2015 +0100 ---------------------------------------------------------------------- .../entity/monitoring/zabbix/ZabbixFeed.java | 38 ++++++++++---------- .../monitoring/zabbix/ZabbixMonitored.java | 3 +- .../monitoring/zabbix/ZabbixPollConfig.java | 11 +++--- .../entity/monitoring/zabbix/ZabbixServer.java | 13 +++---- .../monitoring/zabbix/ZabbixServerImpl.java | 26 +++++++------- 5 files changed, 47 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ef0b61f/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index 4347543..5888962 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -29,31 +29,18 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.location.basic.SupportsPortForwarding; import org.apache.http.client.HttpClient; import org.apache.http.impl.NoConnectionReuseStrategy; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityFunctions; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.event.feed.AbstractFeed; -import brooklyn.event.feed.AttributePollHandler; -import brooklyn.event.feed.PollHandler; -import brooklyn.event.feed.Poller; -import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.location.Location; -import brooklyn.location.MachineLocation; -import brooklyn.location.access.BrooklynAccessUtils; -import brooklyn.location.basic.SupportsPortForwarding; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; -import brooklyn.util.net.Cidr; - import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Objects; @@ -70,6 +57,19 @@ import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; import com.google.gson.JsonObject; +import brooklyn.config.ConfigKey; +import brooklyn.entity.basic.Attributes; +import brooklyn.entity.basic.ConfigKeys; +import brooklyn.entity.basic.EntityFunctions; +import brooklyn.event.feed.AbstractFeed; +import brooklyn.event.feed.AttributePollHandler; +import brooklyn.event.feed.PollHandler; +import brooklyn.event.feed.Poller; +import brooklyn.event.feed.http.HttpValueFunctions; +import brooklyn.util.http.HttpTool; +import brooklyn.util.http.HttpToolResponse; +import brooklyn.util.net.Cidr; + public class ZabbixFeed extends AbstractFeed { public static final Logger log = LoggerFactory.getLogger(ZabbixFeed.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ef0b61f/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java index 78e9dfd..e05731e 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.monitoring.zabbix; +import org.apache.brooklyn.api.event.AttributeSensor; + import brooklyn.config.ConfigKey; -import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ef0b61f/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java index a215133..3906b01 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java @@ -20,17 +20,18 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import javax.annotation.Nullable; -import brooklyn.event.AttributeSensor; +import org.apache.brooklyn.api.event.AttributeSensor; + +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.gson.JsonElement; + import brooklyn.event.feed.PollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import brooklyn.util.collections.MutableList; import brooklyn.util.http.HttpToolResponse; -import com.google.common.base.Function; -import com.google.common.base.Preconditions; -import com.google.gson.JsonElement; - public class ZabbixPollConfig<T> extends PollConfig<HttpToolResponse, T, ZabbixPollConfig<T>> { private String itemKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ef0b61f/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java index db287e8..e4c92bc 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java @@ -18,17 +18,18 @@ */ package org.apache.brooklyn.entity.monitoring.zabbix; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.event.AttributeSensor; + +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.flags.SetFromFlag; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; - @ImplementedBy(ZabbixServerImpl.class) public interface ZabbixServer extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ef0b61f/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java index 9ad8ac0..ce003cd 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java @@ -20,22 +20,14 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.location.basic.SshMachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.basic.DynamicGroup; -import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.trait.Startable; -import brooklyn.event.feed.http.HttpFeed; -import brooklyn.event.feed.http.HttpPollConfig; -import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.policy.PolicySpec; - import com.google.common.base.Functions; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -46,6 +38,14 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; +import brooklyn.entity.basic.AbstractEntity; +import brooklyn.entity.basic.DynamicGroup; +import brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import brooklyn.entity.trait.Startable; +import brooklyn.event.feed.http.HttpFeed; +import brooklyn.event.feed.http.HttpPollConfig; +import brooklyn.event.feed.http.HttpValueFunctions; + public class ZabbixServerImpl extends AbstractEntity implements ZabbixServer { private static final Logger log = LoggerFactory.getLogger(ZabbixServerImpl.class);
