You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/08/31 14:13:29 UTC
[brooklyn-server] branch master updated: add better default names for common feeds
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 044f809af3 add better default names for common feeds
044f809af3 is described below
commit 044f809af367ef8dcf97724b7a04029734364175
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Wed Aug 31 15:13:14 2022 +0100
add better default names for common feeds
---
.../org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java | 1 +
.../java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java | 1 +
.../main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java | 7 ++++++-
core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java | 7 +++++++
.../org/apache/brooklyn/policy/InvokeEffectorOnSensorChange.java | 2 +-
.../java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java | 1 +
.../apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java | 1 +
7 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java b/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
index 0c6932badc..042f86d034 100644
--- a/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
+++ b/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
@@ -133,6 +133,7 @@ public class HttpRequestSensor<T> extends AbstractAddTriggerableSensor<T> {
standardPollConfig(entity, initParams(), pollConfig);
HttpFeed.Builder httpRequestBuilder = HttpFeed.builder().entity(entity)
+ .name("HTTP Sensor Feed: "+initParam(SENSOR_NAME))
.baseUri(uri)
.credentialsIfNotNull(username, password)
.preemptiveBasicAuth(Boolean.TRUE.equals(preemptiveBasicAuth))
diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java b/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
index fb8ad88bb9..ecfa002429 100644
--- a/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
+++ b/core/src/main/java/org/apache/brooklyn/core/sensor/ssh/SshCommandSensor.java
@@ -140,6 +140,7 @@ public final class SshCommandSensor<T> extends AbstractAddTriggerableSensor<T> {
standardPollConfig(entity, initParams(), pollConfig);
SshFeed.Builder feedBuilder = SshFeed.builder()
+ .name("SSH Sensor Feed: "+initParam(SENSOR_NAME))
.entity(entity)
.onlyIfServiceUp(Maybe.ofDisallowingNull(EntityInitializers.resolve(params, ONLY_IF_SERVICE_UP)).or(true))
.poll(pollConfig);
diff --git a/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java b/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
index 75d8f71443..e1ba2af6ab 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
@@ -113,6 +113,7 @@ public abstract class AbstractCommandFeed extends AbstractFeed {
"polls");
public static abstract class Builder<T extends AbstractCommandFeed, B extends Builder<T, B>> {
+ private String name;
private Entity entity;
private boolean onlyIfServiceUp = false;
private Supplier<MachineLocation> machine;
@@ -121,7 +122,11 @@ public abstract class AbstractCommandFeed extends AbstractFeed {
private String uniqueTag;
private String commandUrlToInstallAndRun;
private volatile boolean built;
-
+
+ public B name(String val) {
+ this.name = val;
+ return self();
+ }
public B entity(Entity val) {
this.entity = val;
return self();
diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
index 8af0dcfd86..0590450bbc 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
@@ -126,6 +126,7 @@ public class HttpFeed extends AbstractFeed {
}
public static class Builder {
+ private String name;
private Entity entity;
private boolean onlyIfServiceUp = false;
private Supplier<URI> baseUriProvider;
@@ -141,6 +142,10 @@ public class HttpFeed extends AbstractFeed {
private Boolean preemptiveBasicAuth;
private volatile boolean built;
+ public Builder name(String val) {
+ this.name = val;
+ return this;
+ }
public Builder entity(Entity val) {
this.entity = val;
return this;
@@ -329,6 +334,8 @@ public class HttpFeed extends AbstractFeed {
}
protected HttpFeed(Builder builder) {
+ if (builder.name!=null) setDisplayName(builder.name);
+
config().set(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp);
Map<String,String> baseHeaders = builder.buildBaseHeaders();
diff --git a/core/src/main/java/org/apache/brooklyn/policy/InvokeEffectorOnSensorChange.java b/core/src/main/java/org/apache/brooklyn/policy/InvokeEffectorOnSensorChange.java
index e52dd52706..ad54f534fa 100644
--- a/core/src/main/java/org/apache/brooklyn/policy/InvokeEffectorOnSensorChange.java
+++ b/core/src/main/java/org/apache/brooklyn/policy/InvokeEffectorOnSensorChange.java
@@ -97,7 +97,7 @@ public class InvokeEffectorOnSensorChange extends AbstractInvokeEffectorPolicy i
final Object currentSensorValue = getProducer().sensors().get(sensor);
setMoreUpdatesComing(event.getTimestamp(), event.getValue(), currentSensorValue);
}
- highlightAction("Invoking effector due to "+event,invoke(eff, MutableMap.<String, Object>of()));
+ highlightAction("Invoking effector "+eff.getName()+" due to "+event, invoke(eff, MutableMap.<String, Object>of()));
}
private AttributeSensor<Object> getSensor() {
diff --git a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java
index a757c239e8..240550513b 100644
--- a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java
+++ b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java
@@ -69,6 +69,7 @@ public class ContainerSensor<T> extends AbstractAddTriggerableSensor<T> implemen
standardPollConfig(entity, configBag, poll);
((EntityInternal) entity).feeds().add(FunctionFeed.builder()
+ .name("Container Sensor Feed: "+initParam(SENSOR_NAME))
.entity(entity)
.onlyIfServiceUp(Maybe.ofDisallowingNull(EntityInitializers.resolve(initParams(), ONLY_IF_SERVICE_UP)).or(false))
.poll(poll)
diff --git a/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java b/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
index 8e86435d96..9cc8dee42c 100644
--- a/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
+++ b/software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java
@@ -136,6 +136,7 @@ public final class WinRmCommandSensor<T> extends AbstractAddTriggerableSensor<T>
standardPollConfig(entity, initParams(), pollConfig);
CmdFeed feed = CmdFeed.builder()
+ .name("WinRM Sensor Feed: "+initParam(SENSOR_NAME))
.entity(entity)
.onlyIfServiceUp(Maybe.ofDisallowingNull(EntityInitializers.resolve(initParams(), ONLY_IF_SERVICE_UP)).or(true))
.poll(pollConfig)