You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/12/22 09:03:18 UTC
[incubator-streampipes-extensions] branch edge-extensions updated
(57f8231 -> ba134bc)
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a change to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git.
from 57f8231 Merge branch 'dev' into edge-extensions
new d443c0e [WIP] initial commit containing some minor adoptions
add 4c932f0 image cropper forwards also class index and score as property
add c85f56e Merge pull request #34 from bossenti/STREAMPIPES-266
new ba134bc Merge branch 'dev' into edge-extensions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.idea/runConfigurations/all_pe_jvm__edge_01_.xml | 15 +--
.idea/runConfigurations/all_pe_jvm__edge_02_.xml | 4 +-
.idea/runConfigurations/all_pe_jvm__fog_.xml | 4 +-
...adapters.xml => connect_adapters__edge_01_.xml} | 9 +-
...adapters.xml => connect_adapters__primary_.xml} | 6 +-
...ll_jvm.xml => extensions_all_jvm__edge_01_.xml} | 17 ++-
.idea/runConfigurations/node_controller_cloud.xml | 21 +--
.../runConfigurations/node_controller_edge_01.xml | 21 +--
.../runConfigurations/node_controller_edge_02.xml | 21 +--
.idea/runConfigurations/node_controller_fog.xml | 21 +--
.../streampipes/connect/ConnectAdapterInit.java | 7 +-
.../streampipes/connect/config/ConfigKeys.java | 4 +-
.../connect/config/ConnectWorkerConfig.java | 64 ++++-----
.../extensions/all/jvm/AllExtensionsInit.java | 148 ++++++++++-----------
.../all/jvm/config/AllExtensionsConfig.java | 30 +++--
.../extensions/all/jvm/config/ConfigKeys.java | 23 ++--
.../jvm/processor/imagecropper/ImageCropper.java | 2 +
.../imagecropper/ImageCropperController.java | 6 +-
18 files changed, 198 insertions(+), 225 deletions(-)
copy .idea/runConfigurations/{connect_adapters.xml => connect_adapters__edge_01_.xml} (52%)
copy .idea/runConfigurations/{connect_adapters.xml => connect_adapters__primary_.xml} (65%)
copy .idea/runConfigurations/{extensions_all_jvm.xml => extensions_all_jvm__edge_01_.xml} (55%)
[incubator-streampipes-extensions] 02/02: Merge branch 'dev' into
edge-extensions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit ba134bcbe101f88a09edc0bc438f2e1f44fb18dc
Merge: d443c0e c85f56e
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Dec 22 10:01:56 2020 +0100
Merge branch 'dev' into edge-extensions
.../imageprocessing/jvm/processor/imagecropper/ImageCropper.java | 2 ++
.../jvm/processor/imagecropper/ImageCropperController.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
[incubator-streampipes-extensions] 01/02: [WIP] initial commit
containing some minor adoptions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit d443c0ee089c11190d7565e21bdd4e95187f1720
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Dec 22 10:01:43 2020 +0100
[WIP] initial commit containing some minor adoptions
---
.idea/runConfigurations/all_pe_jvm__edge_01_.xml | 15 +--
.idea/runConfigurations/all_pe_jvm__edge_02_.xml | 4 +-
.idea/runConfigurations/all_pe_jvm__fog_.xml | 4 +-
.../connect_adapters__edge_01_.xml | 20 +++
.../connect_adapters__primary_.xml | 17 +++
.../extensions_all_jvm__edge_01_.xml | 28 ++++
.idea/runConfigurations/node_controller_cloud.xml | 21 +--
.../runConfigurations/node_controller_edge_01.xml | 21 +--
.../runConfigurations/node_controller_edge_02.xml | 21 +--
.idea/runConfigurations/node_controller_fog.xml | 21 +--
.../streampipes/connect/ConnectAdapterInit.java | 7 +-
.../streampipes/connect/config/ConfigKeys.java | 4 +-
.../connect/config/ConnectWorkerConfig.java | 64 ++++-----
.../extensions/all/jvm/AllExtensionsInit.java | 148 ++++++++++-----------
.../all/jvm/config/AllExtensionsConfig.java | 30 +++--
.../extensions/all/jvm/config/ConfigKeys.java | 23 ++--
16 files changed, 239 insertions(+), 209 deletions(-)
diff --git a/.idea/runConfigurations/all_pe_jvm__edge_01_.xml b/.idea/runConfigurations/all_pe_jvm__edge_01_.xml
index 189f50b..374b136 100644
--- a/.idea/runConfigurations/all_pe_jvm__edge_01_.xml
+++ b/.idea/runConfigurations/all_pe_jvm__edge_01_.xml
@@ -12,22 +12,11 @@
<env name="SP_BACKEND_HOST" value="localhost" />
<env name="SP_BACKEND_PORT" value="8030" />
<env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
- <env name="SP_NODE_CONTROLLER_HOST" value="edge01.example.de" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7077" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7077" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
<module name="streampipes-pipeline-elements-all-jvm" />
- <extension name="net.ashald.envfile">
- <option name="IS_ENABLED" value="true" />
- <option name="IS_SUBST" value="false" />
- <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
- <option name="IS_IGNORE_MISSING_FILES" value="false" />
- <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
- <ENTRIES>
- <ENTRY IS_ENABLED="true" PARSER="runconfig" />
- <ENTRY IS_ENABLED="true" PARSER="env" PATH="streampipes-pipeline-elements-all-jvm/development/env.secondary" />
- </ENTRIES>
- </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
diff --git a/.idea/runConfigurations/all_pe_jvm__edge_02_.xml b/.idea/runConfigurations/all_pe_jvm__edge_02_.xml
index c0a17c8..c513687 100644
--- a/.idea/runConfigurations/all_pe_jvm__edge_02_.xml
+++ b/.idea/runConfigurations/all_pe_jvm__edge_02_.xml
@@ -12,8 +12,8 @@
<env name="SP_BACKEND_HOST" value="localhost" />
<env name="SP_BACKEND_PORT" value="8030" />
<env name="SP_NODE_CONTROLLER_ID" value="edge-02.node-controller" />
- <env name="SP_NODE_CONTROLLER_HOST" value="edge02.example.de" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7078" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge02.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7078" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
<module name="streampipes-pipeline-elements-all-jvm" />
diff --git a/.idea/runConfigurations/all_pe_jvm__fog_.xml b/.idea/runConfigurations/all_pe_jvm__fog_.xml
index 6c45460..8c32d9f 100644
--- a/.idea/runConfigurations/all_pe_jvm__fog_.xml
+++ b/.idea/runConfigurations/all_pe_jvm__fog_.xml
@@ -12,8 +12,8 @@
<env name="SP_BACKEND_HOST" value="localhost" />
<env name="SP_BACKEND_PORT" value="8030" />
<env name="SP_NODE_CONTROLLER_ID" value="fog.node-controller" />
- <env name="SP_NODE_CONTROLLER_HOST" value="fog01.example.de" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7079" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="fog01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7079" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
<module name="streampipes-pipeline-elements-all-jvm" />
diff --git a/.idea/runConfigurations/connect_adapters__edge_01_.xml b/.idea/runConfigurations/connect_adapters__edge_01_.xml
new file mode 100644
index 0000000..b1fa7eb
--- /dev/null
+++ b/.idea/runConfigurations/connect_adapters__edge_01_.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="connect-adapters (edge-01)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_HOST" value="edge01.example.de" />
+ <env name="SP_PORT" value="8097" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7077" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_DATA_LOCATION" value="./test_data/" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_DEBUG_CONNECT" value="false" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.connect.ConnectAdapterInit" />
+ <module name="streampipes-connect-adapters" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/connect_adapters__primary_.xml b/.idea/runConfigurations/connect_adapters__primary_.xml
new file mode 100644
index 0000000..9ac0fc1
--- /dev/null
+++ b/.idea/runConfigurations/connect_adapters__primary_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="connect-adapters (primary)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_HOST" value="host.docker.internal" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_DATA_LOCATION" value="./test_data/" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_DEBUG_CONNECT" value="false" />
+ <env name="SP_PORT" value="8098" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.connect.ConnectAdapterInit" />
+ <module name="streampipes-connect-adapters" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/extensions_all_jvm__edge_01_.xml b/.idea/runConfigurations/extensions_all_jvm__edge_01_.xml
new file mode 100644
index 0000000..080a153
--- /dev/null
+++ b/.idea/runConfigurations/extensions_all_jvm__edge_01_.xml
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="extensions-all-jvm (edge-01)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_HOST" value="edge01.example.de" />
+ <env name="SP_PORT" value="7024" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7077" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_BACKEND_PORT" value="8030" />
+ <env name="SP_DATA_LOCATION" value="./test_data/" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_DEBUG_CONNECT" value="false" />
+ <env name="SP_COUCHDB_HOST" value="localhost" />
+ <env name="SP_JMS_HOST" value="localhost" />
+ <env name="SP_JMS_PORT" value="61616" />
+ <env name="SP_DATA_LAKE_HOST" value="localhost" />
+ <env name="SP_DATA_LAKE_PORT" value="8086" />
+ <env name="SP_DATA_LAKE_HOST" value="localhost" />
+ <env name="SP_DATA_LAKE_PORT" value="8086" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.extensions.all.jvm.AllExtensionsInit" />
+ <module name="streampipes-extensions-all-jvm" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_cloud.xml b/.idea/runConfigurations/node_controller_cloud.xml
index 2b27229..28d49df 100644
--- a/.idea/runConfigurations/node_controller_cloud.xml
+++ b/.idea/runConfigurations/node_controller_cloud.xml
@@ -1,29 +1,22 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="node-controller-cloud" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
<module name="streampipes-node-controller-container" />
- <extension name="net.ashald.envfile">
- <option name="IS_ENABLED" value="true" />
- <option name="IS_SUBST" value="false" />
- <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
- <option name="IS_IGNORE_MISSING_FILES" value="false" />
- <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
- <ENTRIES>
- <ENTRY IS_ENABLED="true" PARSER="runconfig" />
- <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
- </ENTRIES>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" />
<option name="ALTERNATIVE_JRE_PATH" />
<envs>
<env name="SP_BACKEND_HOST" value="host.docker.internal" />
<env name="CONSUL_LOCATION" value="host.docker.internal" />
- <env name="SP_NODE_CONTROLLER_ID" value="cloud.node-controller" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7080" />
<env name="SP_NODE_HOST" value="cloud.example.de" />
<env name="SP_NODE_TYPE" value="cloud" />
+ <env name="SP_NODE_CONTROLLER_ID" value="cloud.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="cloud.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7080" />
+ <env name="SP_NODE_BROKER_CONTAINER_HOST" value="localhost" />
+ <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1888" />
<env name="SP_NODE_HAS_GPU" value="true" />
<env name="SP_NODE_LOCATION_CLOUD" value="aws" />
<env name="SP_DEBUG" value="true" />
+ <env name="SP_VERSION" value="0.68.0-SNAPSHOT" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/node_controller_edge_01.xml b/.idea/runConfigurations/node_controller_edge_01.xml
index 90bb656..f722968 100644
--- a/.idea/runConfigurations/node_controller_edge_01.xml
+++ b/.idea/runConfigurations/node_controller_edge_01.xml
@@ -1,31 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="node-controller-edge-01" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
<module name="streampipes-node-controller-container" />
- <extension name="net.ashald.envfile">
- <option name="IS_ENABLED" value="true" />
- <option name="IS_SUBST" value="false" />
- <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
- <option name="IS_IGNORE_MISSING_FILES" value="false" />
- <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
- <ENTRIES>
- <ENTRY IS_ENABLED="true" PARSER="runconfig" />
- <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
- </ENTRIES>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" />
<option name="ALTERNATIVE_JRE_PATH" />
<envs>
<env name="SP_BACKEND_HOST" value="host.docker.internal" />
<env name="CONSUL_LOCATION" value="host.docker.internal" />
- <env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7077" />
<env name="SP_NODE_HOST" value="edge01.example.de" />
<env name="SP_NODE_TYPE" value="edge" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7077" />
+ <env name="SP_NODE_BROKER_CONTAINER_HOST" value="localhost" />
+ <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1884" />
<env name="SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ROS" value="ros;universalrobot;k3s-pi1.example.de;network" />
<env name="SP_NODE_HAS_GPU" value="false" />
<env name="SP_NODE_LOCATION_BUILDING" value="holl" />
<env name="SP_NODE_LOCATION_MACHINE" value="UR" />
<env name="SP_DEBUG" value="true" />
+ <env name="SP_VERSION" value="0.68.0-SNAPSHOT" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/node_controller_edge_02.xml b/.idea/runConfigurations/node_controller_edge_02.xml
index 8aa9891..96b1b63 100644
--- a/.idea/runConfigurations/node_controller_edge_02.xml
+++ b/.idea/runConfigurations/node_controller_edge_02.xml
@@ -1,30 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="node-controller-edge-02" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
<module name="streampipes-node-controller-container" />
- <extension name="net.ashald.envfile">
- <option name="IS_ENABLED" value="true" />
- <option name="IS_SUBST" value="false" />
- <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
- <option name="IS_IGNORE_MISSING_FILES" value="false" />
- <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
- <ENTRIES>
- <ENTRY IS_ENABLED="true" PARSER="runconfig" />
- <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
- </ENTRIES>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" />
<option name="ALTERNATIVE_JRE_PATH" />
<envs>
<env name="SP_BACKEND_HOST" value="host.docker.internal" />
<env name="CONSUL_LOCATION" value="host.docker.internal" />
- <env name="SP_NODE_CONTROLLER_ID" value="edge-02.node-controller" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7078" />
<env name="SP_NODE_HOST" value="edge02.example.de" />
<env name="SP_NODE_TYPE" value="edge" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-02.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="edge02.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7078" />
+ <env name="SP_NODE_BROKER_CONTAINER_HOST" value="localhost" />
+ <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1887" />
<env name="SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ZED" value="zed;sensor;/dev/video1;usb" />
<env name="SP_NODE_HAS_GPU" value="true" />
<env name="SP_NODE_LOCATION_BUILDING" value="holl" />
<env name="SP_DEBUG" value="true" />
+ <env name="SP_VERSION" value="0.68.0-SNAPSHOT" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/node_controller_fog.xml b/.idea/runConfigurations/node_controller_fog.xml
index a22be7b..0bdad2c 100644
--- a/.idea/runConfigurations/node_controller_fog.xml
+++ b/.idea/runConfigurations/node_controller_fog.xml
@@ -1,29 +1,22 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="node-controller-fog" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
<module name="streampipes-node-controller-container" />
- <extension name="net.ashald.envfile">
- <option name="IS_ENABLED" value="true" />
- <option name="IS_SUBST" value="false" />
- <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
- <option name="IS_IGNORE_MISSING_FILES" value="false" />
- <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
- <ENTRIES>
- <ENTRY IS_ENABLED="true" PARSER="runconfig" />
- <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
- </ENTRIES>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" />
<option name="ALTERNATIVE_JRE_PATH" />
<envs>
<env name="SP_BACKEND_HOST" value="host.docker.internal" />
<env name="CONSUL_LOCATION" value="host.docker.internal" />
- <env name="SP_NODE_CONTROLLER_ID" value="fog.node-controller" />
- <env name="SP_NODE_CONTROLLER_PORT" value="7079" />
<env name="SP_NODE_HOST" value="fog01.example.de" />
<env name="SP_NODE_TYPE" value="fog" />
+ <env name="SP_NODE_CONTROLLER_ID" value="fog.node-controller" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="fog01.example.de" />
+ <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7079" />
+ <env name="SP_NODE_BROKER_CONTAINER_HOST" value="localhost" />
+ <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1886" />
<env name="SP_NODE_HAS_GPU" value="true" />
<env name="SP_NODE_LOCATION_BUILDING" value="main" />
<env name="SP_DEBUG" value="true" />
+ <env name="SP_VERSION" value="0.68.0-SNAPSHOT" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index 53784f8..1ca09d6 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -98,11 +98,6 @@ public class ConnectAdapterInit extends AdapterWorkerContainer {
.add(new IssAdapter())
.add(new FlicMQTTAdapter());
- String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
- String backendUrl = ConnectWorkerConfig.INSTANCE.getBackendUrl();
- Integer workerPort = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerPort();
-
- new ConnectAdapterInit().init(workerUrl, backendUrl, workerPort);
-
+ new ConnectAdapterInit().init(ConnectWorkerConfig.INSTANCE);
}
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
index 97dbf27..87eb2a7 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
@@ -22,8 +22,8 @@ public class ConfigKeys {
final static String KAFKA_HOST = "SP_KAFKA_HOST";
final static String KAFKA_PORT = "SP_KAFKA_PORT";
- final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
- final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
+ final static String SP_HOST = "SP_HOST";
+ final static String SP_PORT = "SP_PORT";
final static String BACKEND_HOST = "SP_BACKEND_HOST";
final static String BACKEND_PORT = "SP_BACKEND_PORT";
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
index 0ec5bab..a32f4b9 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
@@ -20,59 +20,51 @@ package org.apache.streampipes.connect.config;
import org.apache.streampipes.config.SpConfig;
+import org.apache.streampipes.container.model.ExtensionsConfig;
-public enum ConnectWorkerConfig {
+public enum ConnectWorkerConfig implements ExtensionsConfig {
INSTANCE;
-
- private SpConfig config;
+ private static final String CONNECT_ID = "connect/org.apache.streampipes.connect.adapter";
+ private final static String SERVICE_CONTAINER_NAME = "connect-worker-main";
+ private final SpConfig config;
ConnectWorkerConfig() {
- String name = "connect-worker-main";
- config = SpConfig.getSpConfig("connect-worker-main");
-
- config.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka");
- config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka");
-
- config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, 8098, "The port of the connect container");
- config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, name, "The hostname of the connect container");
-
- config.register(ConfigKeys.BACKEND_HOST, "backend", "The host of the backend to register the worker");
- config.register(ConfigKeys.BACKEND_PORT, 8030, "The port of the backend to register the worker");
-
- }
+ config = SpConfig.getSpConfig(CONNECT_ID);
- public String getConnectContainerWorkerUrl() {
- return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT) + "/";
+ config.register(ConfigKeys.SP_HOST, SERVICE_CONTAINER_NAME, "Connect container host");
+ config.register(ConfigKeys.SP_PORT, 8098, "Connect container port");
+ config.register(ConfigKeys.BACKEND_HOST, "backend", "Backend host");
+ config.register(ConfigKeys.BACKEND_PORT, 8030, "Backend port");
}
- public String getBackendUrl() {
- return "http://" + config.getString(ConfigKeys.BACKEND_HOST) + ":" + config.getInteger(ConfigKeys.BACKEND_PORT) + "/streampipes-backend";
+ @Override
+ public String getId() {
+ return CONNECT_ID;
}
- public String getKafkaHost() {
- return config.getString(ConfigKeys.KAFKA_HOST);
+ @Override
+ public String getHost() {
+ return config.getString(ConfigKeys.SP_HOST);
}
- public int getKafkaPort() {
- return config.getInteger(ConfigKeys.KAFKA_PORT);
+ @Override
+ public int getPort() {
+ return config.getInteger(ConfigKeys.SP_PORT);
}
- public String getKafkaUrl() {
- return getKafkaHost() + ":" + getKafkaPort();
+ @Override
+ public String getName() {
+ return null;
}
- public void setKafkaHost(String s) {
- config.setString(ConfigKeys.KAFKA_HOST, s);
+ @Override
+ public String getBackendHost() {
+ return config.getString(ConfigKeys.BACKEND_HOST);
}
-
- public String getConnectContainerWorkerHost() {
- return config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST);
+ @Override
+ public int getBackendPort() {
+ return config.getInteger(ConfigKeys.BACKEND_PORT);
}
-
- public Integer getConnectContainerWorkerPort() {
- return config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT);
- }
-
}
diff --git a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
index ec738e7..97793b5 100644
--- a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
+++ b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
@@ -145,31 +145,31 @@ public class AllExtensionsInit extends ExtensionsModelSubmitter {
.add(new ComposeController())
.add(new NumericalTextFilterController())
// streampipes-processors-filers-siddhi
- .add(new TrendController())
- .add(new StreamStopController())
- .add(new FrequencyController())
- .add(new FrequencyChangeController())
+// .add(new TrendController())
+// .add(new StreamStopController())
+// .add(new FrequencyController())
+// .add(new FrequencyChangeController())
// streampipes-processors-geo-jvm
- .add(new DistanceCalculatorController())
- .add(new GoogleMapsGeocodingController())
- .add(new StaticGoogleMapsGeocodingController())
- .add(new ReverseGeocodingController())
- .add(new SetEpsgController())
- .add(new LatLngToGeoController())
- .add(new SpeedCalculatorController())
- .add(new StaticDistanceCalculatorController())
+// .add(new DistanceCalculatorController())
+// .add(new GoogleMapsGeocodingController())
+// .add(new StaticGoogleMapsGeocodingController())
+// .add(new ReverseGeocodingController())
+// .add(new SetEpsgController())
+// .add(new LatLngToGeoController())
+// .add(new SpeedCalculatorController())
+// .add(new StaticDistanceCalculatorController())
// streampipes-processors-image-processing-jvm
- .add(new ImageEnrichmentController())
- .add(new ImageCropperController())
- .add(new QrCodeReaderController())
- .add(new GenericImageClassificationController())
+// .add(new ImageEnrichmentController())
+// .add(new ImageCropperController())
+// .add(new QrCodeReaderController())
+// .add(new GenericImageClassificationController())
// streampipes-processors-text-mining-jvm
- .add(new LanguageDetectionController())
- .add(new TokenizerController())
- .add(new PartOfSpeechController())
- .add(new ChunkerController())
- .add(new NameFinderController())
- .add(new SentenceDetectionController())
+// .add(new LanguageDetectionController())
+// .add(new TokenizerController())
+// .add(new PartOfSpeechController())
+// .add(new ChunkerController())
+// .add(new NameFinderController())
+// .add(new SentenceDetectionController())
// streampipes-processors-transformation-jvm
.add(new CountArrayController())
.add(new SplitArrayController())
@@ -191,33 +191,33 @@ public class AllExtensionsInit extends ExtensionsModelSubmitter {
.add(new TransformToBooleanController())
.add(new StringCounterController())
.add(new StringTimerController())
- .add(new NumberLabelerController())
- // streampipes-sinks-brokers-jvm
- .add(new KafkaController())
- .add(new JmsController())
- .add(new RestController())
- .add(new BufferRestController())
- .add(new RabbitMqController())
- .add(new PulsarController())
- .add(new MqttController())
- // streampipes-sinks-databases-jvm
- .add(new CouchDbController())
- .add(new InfluxDbController())
- .add(new UpcUaController())
- .add(new PostgreSqlController())
- .add(new IotDbController())
- .add(new DittoController())
- .add(new RedisController())
- .add(new MysqlController())
- // streampipes-sinks-internal-jvm
- .add(new NotificationController())
- .add(new DataLakeController())
- .add(new DashboardController())
- // streampipes-sinks-notifications-jvm
- .add(new EmailController())
- .add(new TelegramController())
- .add(new OneSignalController())
- .add(new SlackNotificationController());
+ .add(new NumberLabelerController());
+// // streampipes-sinks-brokers-jvm
+// .add(new KafkaController())
+// .add(new JmsController())
+// .add(new RestController())
+// .add(new BufferRestController())
+// .add(new RabbitMqController())
+// .add(new PulsarController())
+// .add(new MqttController())
+// // streampipes-sinks-databases-jvm
+// .add(new CouchDbController())
+// .add(new InfluxDbController())
+// .add(new UpcUaController())
+// .add(new PostgreSqlController())
+// .add(new IotDbController())
+// .add(new DittoController())
+// .add(new RedisController())
+// .add(new MysqlController())
+// // streampipes-sinks-internal-jvm
+// .add(new NotificationController())
+// .add(new DataLakeController())
+// .add(new DashboardController())
+// // streampipes-sinks-notifications-jvm
+// .add(new EmailController())
+// .add(new TelegramController())
+// .add(new OneSignalController())
+// .add(new SlackNotificationController());
AdapterDeclarerSingleton.getInstance()
// Protocols
@@ -230,31 +230,31 @@ public class AllExtensionsInit extends ExtensionsModelSubmitter {
.add(new HttpStreamProtocol())
.add(new PulsarProtocol())
// Specific Adapters
- .add(new GdeltAdapter())
- .add(new CoindeskBitcoinAdapter())
- .add(new IexCloudNewsAdapter())
- .add(new IexCloudStockAdapter())
- .add(new MySqlStreamAdapter())
- .add(new MySqlSetAdapter())
- .add(new RandomDataSetAdapter())
- .add(new RandomDataStreamAdapter())
- .add(new MachineDataStreamAdapter())
- .add(new SlackAdapter())
- .add(new WikipediaEditedArticlesAdapter())
- .add(new WikipediaNewArticlesAdapter())
- .add(new RosBridgeAdapter())
- .add(new OpcUaAdapter())
- .add(new InfluxDbStreamAdapter())
- .add(new InfluxDbSetAdapter())
- .add(new TISensorTag())
- .add(new NetioRestAdapter())
- .add(new NetioMQTTAdapter())
- .add(new Plc4xS7Adapter())
- .add(new Plc4xModbusAdapter())
- .add(new ImageStreamAdapter())
- .add(new ImageSetAdapter())
- .add(new IssAdapter())
- .add(new FlicMQTTAdapter());
+// .add(new GdeltAdapter())
+// .add(new CoindeskBitcoinAdapter())
+// .add(new IexCloudNewsAdapter())
+// .add(new IexCloudStockAdapter())
+// .add(new MySqlStreamAdapter())
+// .add(new MySqlSetAdapter())
+// .add(new RandomDataSetAdapter())
+// .add(new RandomDataStreamAdapter())
+ .add(new MachineDataStreamAdapter());
+// .add(new SlackAdapter())
+// .add(new WikipediaEditedArticlesAdapter())
+// .add(new WikipediaNewArticlesAdapter())
+// .add(new RosBridgeAdapter())
+// .add(new OpcUaAdapter())
+// .add(new InfluxDbStreamAdapter())
+// .add(new InfluxDbSetAdapter())
+// .add(new TISensorTag())
+// .add(new NetioRestAdapter())
+// .add(new NetioMQTTAdapter())
+// .add(new Plc4xS7Adapter())
+// .add(new Plc4xModbusAdapter())
+// .add(new ImageStreamAdapter())
+// .add(new ImageSetAdapter())
+// .add(new IssAdapter())
+// .add(new FlicMQTTAdapter());
new AllExtensionsInit().init(AllExtensionsConfig.INSTANCE);
}
diff --git a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java
index 631f2a2..fb61312 100644
--- a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java
+++ b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java
@@ -18,32 +18,34 @@
package org.apache.streampipes.extensions.all.jvm.config;
import org.apache.streampipes.config.SpConfig;
+import org.apache.streampipes.container.model.EdgeExtensionsConfig;
import org.apache.streampipes.container.model.ExtensionsConfig;
-public enum AllExtensionsConfig implements ExtensionsConfig {
+public enum AllExtensionsConfig implements EdgeExtensionsConfig {
INSTANCE;
private final SpConfig peConfig;
private final SpConfig adapterConfig;
- private final static String PE_ID = "pe/org.apache.streampipes.extensions.all.jvm";
+ private final static String PE_ID = "pe/org.apache.streampipes.processors.all.jvm";
+ private final static String CONNECT_ID = "connect/org.apache.streampipes.connect.adapter";
private final static String SERVICE_NAME = "StreamPipes Extensions (JVM)";
private final static String SERVICE_CONTAINER_NAME = "extensions-all-jvm";
AllExtensionsConfig() {
// TODO: harmonize config
peConfig = SpConfig.getSpConfig(PE_ID);
- adapterConfig = SpConfig.getSpConfig("connect-worker-main");
+ adapterConfig = SpConfig.getSpConfig(CONNECT_ID);
peConfig.register(ConfigKeys.HOST, SERVICE_CONTAINER_NAME, "Host for extensions");
peConfig.register(ConfigKeys.PORT, 8090, "Port for extensions");
peConfig.register(ConfigKeys.SERVICE_NAME_KEY, SERVICE_NAME, "Service name");
- adapterConfig.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka");
- adapterConfig.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka");
- adapterConfig.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, 8090, "The port of the connect container");
- adapterConfig.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, SERVICE_CONTAINER_NAME, "The hostname of the connect container");
- adapterConfig.register(ConfigKeys.BACKEND_HOST, "backend", "The host of the backend to register the worker");
- adapterConfig.register(ConfigKeys.BACKEND_PORT, 8030, "The port of the backend to register the worker");
+ // TODO: del when working
+ adapterConfig.register(ConfigKeys.BACKEND_HOST, "backend", "backend host");
+ adapterConfig.register(ConfigKeys.BACKEND_PORT, 8030, "backed port");
+
+ adapterConfig.register(ConfigKeys.NODE_CONTROLLER_CONTAINER_HOST, "node-controller", "node controller host");
+ adapterConfig.register(ConfigKeys.NODE_CONTROLLER_CONTAINER_PORT, 7077, "node controller port");
}
@Override
@@ -67,6 +69,16 @@ public enum AllExtensionsConfig implements ExtensionsConfig {
}
@Override
+ public String getNodeControllerHost() {
+ return adapterConfig.getString(ConfigKeys.NODE_CONTROLLER_CONTAINER_HOST);
+ }
+
+ @Override
+ public int getNodeControllerPort() {
+ return adapterConfig.getInteger(ConfigKeys.NODE_CONTROLLER_CONTAINER_PORT);
+ }
+
+ @Override
public String getBackendHost() {
return adapterConfig.getString(ConfigKeys.BACKEND_HOST);
}
diff --git a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/ConfigKeys.java b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/ConfigKeys.java
index 6728212..47f784d 100644
--- a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/ConfigKeys.java
+++ b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/ConfigKeys.java
@@ -18,13 +18,18 @@
package org.apache.streampipes.extensions.all.jvm.config;
public class ConfigKeys {
- final static String HOST = "SP_HOST";
- final static String PORT = "SP_PORT";
- final static String SERVICE_NAME_KEY = "SP_SERVICE_NAME";
- final static String KAFKA_HOST = "SP_KAFKA_HOST";
- final static String KAFKA_PORT = "SP_KAFKA_PORT";
- final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
- final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
- final static String BACKEND_HOST = "SP_BACKEND_HOST";
- final static String BACKEND_PORT = "SP_BACKEND_PORT";
+ public static final String HOST = "SP_HOST";
+ public static final String PORT = "SP_PORT";
+ public static final String SERVICE_NAME_KEY = "SP_SERVICE_NAME";
+ public static final String KAFKA_HOST = "SP_KAFKA_HOST";
+ public static final String KAFKA_PORT = "SP_KAFKA_PORT";
+ public static final String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
+ public static final String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
+ public static final String BACKEND_HOST = "SP_BACKEND_HOST";
+ public static final String BACKEND_PORT = "SP_BACKEND_PORT";
+ public static final String NODE_CONTROLLER_ID = "SP_NODE_CONTROLLER_ID";
+ public static final String NODE_CONTROLLER_CONTAINER_HOST = "SP_NODE_CONTROLLER_CONTAINER_HOST";
+ public static final String NODE_CONTROLLER_CONTAINER_PORT = "SP_NODE_CONTROLLER_CONTAINER_PORT";
+ public static final String NODE_BROKER_CONTAINER_HOST = "SP_NODE_BROKER_CONTAINER_HOST";
+ public static final String NODE_BROKER_CONTAINER_PORT = "SP_NODE_BROKER_CONTAINER_PORT";
}