This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
3501-remove-zookeeper-service-and-related-code-dependencies
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/3501-remove-zookeeper-service-and-related-code-dependencies by this
push:
new c0c6330e18 refactor(#3501): Remove zookeeper dependencies
c0c6330e18 is described below
commit c0c6330e18b27acc130fc842c714209e61a134b5
Author: Philipp Zehnder <[email protected]>
AuthorDate: Mon Feb 24 11:17:43 2025 +0100
refactor(#3501): Remove zookeeper dependencies
---
.../standalone/swagger-ui/docker-compose.dev.yml | 19 -------
.../standalone/swagger-ui/docker-compose.yml | 31 -----------
.../standalone/zookeeper/docker-compose.dev.yml | 19 -------
.../deploy/standalone/zookeeper/docker-compose.yml | 34 ------------
installer/cli/environments/adapter | 1 -
installer/cli/environments/backend | 1 -
installer/cli/environments/basic | 1 -
installer/cli/environments/full | 1 -
installer/cli/environments/full-monitoring | 1 -
installer/cli/environments/lite | 1 -
installer/cli/environments/lite-monitoring | 1 -
installer/cli/environments/pipeline-element | 1 -
installer/cli/environments/ui | 1 -
.../configuration/DefaultMessagingSettings.java | 2 -
.../model/configuration/MessagingSettings.java | 19 -------
.../apache/streampipes/vocabulary/StreamPipes.java | 3 -
.../src/lib/model/gen/streampipes-model-client.ts | 9 ++-
.../src/lib/model/gen/streampipes-model.ts | 64 ++--------------------
.../messaging-configuration.component.html | 5 --
19 files changed, 12 insertions(+), 202 deletions(-)
diff --git a/installer/cli/deploy/standalone/swagger-ui/docker-compose.dev.yml
b/installer/cli/deploy/standalone/swagger-ui/docker-compose.dev.yml
deleted file mode 100644
index a2c65daa5f..0000000000
--- a/installer/cli/deploy/standalone/swagger-ui/docker-compose.dev.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
- swagger-ui:
- ports:
- - "8080:8080"
diff --git a/installer/cli/deploy/standalone/swagger-ui/docker-compose.yml
b/installer/cli/deploy/standalone/swagger-ui/docker-compose.yml
deleted file mode 100644
index 1d43fa4c68..0000000000
--- a/installer/cli/deploy/standalone/swagger-ui/docker-compose.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
- swagger-ui:
- image: swaggerapi/swagger-ui
- environment:
- - "API_URL=http://${SP_HOST}/streampipes-backend/api/docs/swagger.json";
- logging:
- driver: "json-file"
- options:
- max-size: "1m"
- max-file: "1"
- networks:
- spnet:
-
-networks:
- spnet:
- external: true
diff --git a/installer/cli/deploy/standalone/zookeeper/docker-compose.dev.yml
b/installer/cli/deploy/standalone/zookeeper/docker-compose.dev.yml
deleted file mode 100644
index c5adbfd099..0000000000
--- a/installer/cli/deploy/standalone/zookeeper/docker-compose.dev.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
- zookeeper:
- ports:
- - "2181:2181"
diff --git a/installer/cli/deploy/standalone/zookeeper/docker-compose.yml
b/installer/cli/deploy/standalone/zookeeper/docker-compose.yml
deleted file mode 100644
index 25780394e9..0000000000
--- a/installer/cli/deploy/standalone/zookeeper/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-services:
- zookeeper:
- image: fogsyio/zookeeper:3.4.13
- volumes:
- - zookeeper:/opt/zookeeper-3.4.13
- logging:
- driver: "json-file"
- options:
- max-size: "1m"
- max-file: "1"
- networks:
- spnet:
-
-volumes:
- zookeeper:
-
-networks:
- spnet:
- external: true
diff --git a/installer/cli/environments/adapter
b/installer/cli/environments/adapter
index ce6599f80c..4c625da330 100644
--- a/installer/cli/environments/adapter
+++ b/installer/cli/environments/adapter
@@ -18,6 +18,5 @@ backend
couchdb
kafka
ui
-zookeeper
pipeline-elements-all-jvm
influxdb
diff --git a/installer/cli/environments/backend
b/installer/cli/environments/backend
index c556a33479..36dbf97449 100644
--- a/installer/cli/environments/backend
+++ b/installer/cli/environments/backend
@@ -15,7 +15,6 @@
[environment:backend]
kafka
-zookeeper
couchdb
influxdb
ui-custom-conf
diff --git a/installer/cli/environments/basic b/installer/cli/environments/basic
index 94404b70e0..b56add4321 100644
--- a/installer/cli/environments/basic
+++ b/installer/cli/environments/basic
@@ -15,6 +15,5 @@
[environment:basic]
kafka
-zookeeper
couchdb
influxdb
diff --git a/installer/cli/environments/full b/installer/cli/environments/full
index cf8789429b..e284a135d6 100644
--- a/installer/cli/environments/full
+++ b/installer/cli/environments/full
@@ -18,6 +18,5 @@ ui
backend
extensions-all-jvm
couchdb
-zookeeper
kafka
influxdb
diff --git a/installer/cli/environments/full-monitoring
b/installer/cli/environments/full-monitoring
index 3cc41edb32..9a09a34e1a 100644
--- a/installer/cli/environments/full-monitoring
+++ b/installer/cli/environments/full-monitoring
@@ -20,7 +20,6 @@ extensions-all-jvm
couchdb
jobmanager
taskmanager
-zookeeper
kafka
influxdb
pipeline-elements-all-flink
diff --git a/installer/cli/environments/lite b/installer/cli/environments/lite
index 5dc3305ff5..b74490d5f5 100644
--- a/installer/cli/environments/lite
+++ b/installer/cli/environments/lite
@@ -18,6 +18,5 @@ ui
backend
couchdb
kafka
-zookeeper
influxdb
extensions-all-jvm
diff --git a/installer/cli/environments/lite-monitoring
b/installer/cli/environments/lite-monitoring
index ffc232a38e..702c39e6de 100644
--- a/installer/cli/environments/lite-monitoring
+++ b/installer/cli/environments/lite-monitoring
@@ -18,7 +18,6 @@ ui
backend
couchdb
kafka
-zookeeper
influxdb
extensions-all-jvm
grafana
diff --git a/installer/cli/environments/pipeline-element
b/installer/cli/environments/pipeline-element
index f30bf1a76b..b316fb93c1 100644
--- a/installer/cli/environments/pipeline-element
+++ b/installer/cli/environments/pipeline-element
@@ -18,5 +18,4 @@ backend
couchdb
kafka
ui
-zookeeper
influxdb
diff --git a/installer/cli/environments/ui b/installer/cli/environments/ui
index 125c42904d..92e330487e 100644
--- a/installer/cli/environments/ui
+++ b/installer/cli/environments/ui
@@ -18,5 +18,4 @@ backend
extensions-all-jvm
couchdb
kafka
-zookeeper
influxdb
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultMessagingSettings.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultMessagingSettings.java
index 6ba4dd0865..6a8f1be2d9 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultMessagingSettings.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultMessagingSettings.java
@@ -66,8 +66,6 @@ public class DefaultMessagingSettings {
defaultSettings.setPulsarUrl(env.getPulsarUrl().getValueOrDefault());
- defaultSettings.setZookeeperHost("zookeeper");
- defaultSettings.setZookeeperPort(2181);
return defaultSettings;
}
}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/MessagingSettings.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/MessagingSettings.java
index 874c200750..1ad96d72ff 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/MessagingSettings.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/MessagingSettings.java
@@ -46,9 +46,6 @@ public class MessagingSettings {
private String pulsarUrl;
- private String zookeeperHost;
- private int zookeeperPort;
-
private List<String> supportedProtocols;
public MessagingSettings(Integer batchSize,
@@ -180,22 +177,6 @@ public class MessagingSettings {
this.pulsarUrl = pulsarUrl;
}
- public String getZookeeperHost() {
- return zookeeperHost;
- }
-
- public void setZookeeperHost(String zookeeperHost) {
- this.zookeeperHost = zookeeperHost;
- }
-
- public int getZookeeperPort() {
- return zookeeperPort;
- }
-
- public void setZookeeperPort(int zookeeperPort) {
- this.zookeeperPort = zookeeperPort;
- }
-
public List<String> getSupportedProtocols() {
return supportedProtocols;
}
diff --git
a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
index c928276096..b88069d96d 100644
---
a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
+++
b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
@@ -30,9 +30,6 @@ public class StreamPipes {
public static final String JMS_PORT = NS + "jmsPort";
- public static final String ZOOKEEPER_HOST = NS + "zookeeperHost";
- public static final String ZOOKEEPER_PORT = NS + "zookeeperPort";
-
public static final String KAFKA_PORT = NS + "kafkaPort";
public static final String KAFKA_HOST = NS + "kafkaHost";
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
index 68e4a75c60..857b800526 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
@@ -19,9 +19,9 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2024-10-07
13:58:29.
+// Generated using typescript-generator version 3.2.1263 on 2025-02-24
11:14:19.
-import { Storable } from './streampipes-model';
+import { Storable } from '@streampipes/platform-services';
export class Group implements Storable {
elementId: string;
@@ -229,6 +229,11 @@ export class ServiceAccount extends Principal {
}
}
+export interface Storable {
+ elementId: string;
+ rev: string;
+}
+
export class UserAccount extends Principal {
darkMode: boolean;
fullName: string;
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index 03013586f6..262d1ffe07 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2025-02-14
21:48:17.
+// Generated using typescript-generator version 3.2.1263 on 2025-02-24
11:14:17.
export class NamedStreamPipesEntity implements Storable {
'@class':
@@ -1090,24 +1089,6 @@ export class CustomTransformOutputStrategy extends
OutputStrategy {
}
}
-export class DashboardEntity implements Storable {
- elementId: string;
- rev: string;
-
- static fromData(
- data: DashboardEntity,
- target?: DashboardEntity,
- ): DashboardEntity {
- if (!data) {
- return data;
- }
- const instance = target || new DashboardEntity();
- instance.elementId = data.elementId;
- instance.rev = data.rev;
- return instance;
- }
-}
-
export class DashboardItem {
cols: number;
component: string;
@@ -1188,45 +1169,6 @@ export class DashboardModel implements Storable {
}
}
-export class DataExplorerWidgetModel extends DashboardEntity {
- baseAppearanceConfig: { [index: string]: any };
- dataConfig: { [index: string]: any };
- measureName: string;
- pipelineId: string;
- timeSettings: { [index: string]: any };
- visualizationConfig: { [index: string]: any };
- widgetId: string;
- widgetType: string;
-
- static fromData(
- data: DataExplorerWidgetModel,
- target?: DataExplorerWidgetModel,
- ): DataExplorerWidgetModel {
- if (!data) {
- return data;
- }
- const instance = target || new DataExplorerWidgetModel();
- super.fromData(data, instance);
- instance.baseAppearanceConfig = __getCopyObjectFn(__identity<any>())(
- data.baseAppearanceConfig,
- );
- instance.dataConfig = __getCopyObjectFn(__identity<any>())(
- data.dataConfig,
- );
- instance.measureName = data.measureName;
- instance.pipelineId = data.pipelineId;
- instance.timeSettings = __getCopyObjectFn(__identity<any>())(
- data.timeSettings,
- );
- instance.visualizationConfig = __getCopyObjectFn(__identity<any>())(
- data.visualizationConfig,
- );
- instance.widgetId = data.widgetId;
- instance.widgetType = data.widgetType;
- return instance;
- }
-}
-
export class DataLakeMeasure implements Storable {
'@class': 'org.apache.streampipes.model.datalake.DataLakeMeasure';
'elementId': string;
@@ -2153,6 +2095,8 @@ export class KafkaTransportProtocol extends
TransportProtocol {
'maxRequestSize': string;
'messageMaxBytes': string;
'offset': string;
+ 'zookeeperHost': string;
+ 'zookeeperPort': number;
static 'fromData'(
data: KafkaTransportProtocol,
@@ -2171,6 +2115,8 @@ export class KafkaTransportProtocol extends
TransportProtocol {
instance.maxRequestSize = data.maxRequestSize;
instance.messageMaxBytes = data.messageMaxBytes;
instance.offset = data.offset;
+ instance.zookeeperHost = data.zookeeperHost;
+ instance.zookeeperPort = data.zookeeperPort;
return instance;
}
}
diff --git
a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html
b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html
index 38c5eee17f..b1a003ebdb 100644
---
a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html
+++
b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html
@@ -162,11 +162,6 @@
/>
</mat-form-field>
</div>
- <sp-messaging-broker-config
- title="Zookeeper"
- [(host)]="messagingSettings.zookeeperHost"
- [(port)]="messagingSettings.zookeeperPort"
- ></sp-messaging-broker-config>
<div fxLayoutAlign="start center" class="mt-10">
<button
mat-raised-button
