This is an automated email from the ASF dual-hosted git repository.
tex pushed a commit to branch dev
in repository
https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
The following commit(s) were added to refs/heads/dev by this push:
new cba0efb [STREAMPIPES-171] move datalake influx config to container
configs
cba0efb is described below
commit cba0efb10f5c3098083cd5f5c738aa78031f1778
Author: tex <[email protected]>
AuthorDate: Thu Jul 9 10:21:45 2020 +0200
[STREAMPIPES-171] move datalake influx config to container configs
---
.../sinks/internal/jvm/config/ConfigKeys.java | 3 +++
.../internal/jvm/config/SinksInternalJvmConfig.java | 18 ++++++++++++++++++
.../internal/jvm/datalake/DataLakeController.java | 6 +++---
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/ConfigKeys.java
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/ConfigKeys.java
index c30fb0e..7396ae5 100644
---
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/ConfigKeys.java
+++
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/ConfigKeys.java
@@ -30,6 +30,9 @@ public class ConfigKeys {
final static String DATA_LAKE_HOST = "SP_DATA_LAKE_HOST";
final static String DATA_LAKE_PROTOCOL = "SP_DATA_LAKE_PROTOCOL";
final static String DATA_LAKE_PORT = "SP_DATA_LAKE_PORT";
+ final static String DATA_LAKE_USERNAME = "SP_DATA_LAKE_USERNAME";
+ final static String DATA_LAKE_PASSWORD = "SP_DATA_LAKE_PASSWORD";
+ final static String DATA_LAKE_DATABASE_NAME = "SP_DATA_LAKE_DATABASE_NAME";
final static String BACKEND_HOST = "SP_BACKEND_HOST";
final static String BACKEND_PORT = "SP_BACKEND_PORT";
final static String BACKEND_PROTOCOL = "SP_BACKEND_PROTOCOL";
diff --git
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
index a18d869..c3f41ec 100644
---
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
+++
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
@@ -49,6 +49,9 @@ public enum SinksInternalJvmConfig implements PeConfig {
config.register(ConfigKeys.DATA_LAKE_HOST, "influxdb",
"Hostname for the StreamPipes data lake database");
config.register(ConfigKeys.DATA_LAKE_PROTOCOL, "http",
"Protocol for the StreamPipes data lake database");
config.register(ConfigKeys.DATA_LAKE_PORT, 8086, "Port for the
StreamPipes data lake database");
+ config.register(ConfigKeys.DATA_LAKE_USERNAME, "default",
"Username for the StreamPipes data lake database");
+ config.registerPassword(ConfigKeys.DATA_LAKE_PASSWORD,
"default", "Password for the StreamPipes data lake database");
+ config.register(ConfigKeys.DATA_LAKE_DATABASE_NAME, "sp",
"Database name for the StreamPipes data lake database");
config.register(ConfigKeys.BACKEND_HOST, "backend", "Hostname
for the StreamPipes-Backend");
config.register(ConfigKeys.BACKEND_PORT, 8030, "Port for the
StreamPipes-Backend");
config.register(ConfigKeys.BACKEND_PROTOCOL, "http", "Protocol
for the StreamPipes-Backend");
@@ -113,6 +116,21 @@ public enum SinksInternalJvmConfig implements PeConfig {
return config.getInteger(ConfigKeys.DATA_LAKE_PORT);
}
+ public String getDataLakeUsername() {
+ return config.getString(ConfigKeys.DATA_LAKE_USERNAME);
+ }
+
+
+ public String getDataLakePassword() {
+ return config.getString(ConfigKeys.DATA_LAKE_PASSWORD);
+ }
+
+
+ public String getDataLakeDatabaseName() {
+ return config.getString(ConfigKeys.DATA_LAKE_DATABASE_NAME);
+ }
+
+
@Override
public String getId() {
return service_id;
diff --git
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeController.java
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeController.java
index aceb897..837d631 100644
---
a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeController.java
+++
b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeController.java
@@ -66,9 +66,9 @@ public class DataLakeController extends
StandaloneEventSinkDeclarer<DataLakePara
String hostname = SinksInternalJvmConfig.INSTANCE.getDataLakeProtocol() +
"://" + SinksInternalJvmConfig.INSTANCE.getDataLakeHost();
Integer port = SinksInternalJvmConfig.INSTANCE.getDataLakePort();
- String dbName = "sp";
- String user = "default";
- String password = "default";
+ String dbName = SinksInternalJvmConfig.INSTANCE.getDataLakeDatabaseName();
+ String user = SinksInternalJvmConfig.INSTANCE.getDataLakeUsername();
+ String password = SinksInternalJvmConfig.INSTANCE.getDataLakePassword();
Integer batch_size = 100;
Integer flush_duration = 1000;