This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 0f845b754 2133 remove consul and all related assets (#2180)
0f845b754 is described below
commit 0f845b754fb9a03dc02e6acb008546048f60871d
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Nov 29 16:30:43 2023 +0100
2133 remove consul and all related assets (#2180)
* refactor(#2133): Remove consul dependencies from code
* refactor(#2133): Remove consul dependencies from installer options
* Remove Consul Migration from available migrations
* refactor(#2133): Fix ui build
* refactor(#2133): Remove consul references from ui code
* refactor(#2133): Remove consul references from backend code
---------
Co-authored-by: Dominik Riemer <[email protected]>
---
.../resources/archetype-resources/development/env | 2 +-
.../resources/archetype-resources/development/env | 2 +-
.../resources/archetype-resources/development/env | 2 +-
development/.env | 2 +-
docker-compose.yml | 29 ---
installer/cli/.env | 1 -
installer/cli/README.md | 10 +-
installer/cli/bin/commands/add | 1 -
.../deploy/standalone/backend/docker-compose.yml | 1 -
.../connect-adapters-iiot/docker-compose.yml | 2 -
.../standalone/connect-adapters/docker-compose.yml | 2 -
.../standalone/consul/docker-compose.dev.yml | 21 --
.../deploy/standalone/consul/docker-compose.yml | 53 -----
.../extensions-all-jvm/docker-compose.yml | 3 +-
.../pipeline-elements-all-flink/docker-compose.yml | 1 -
.../pipeline-elements-all-jvm/docker-compose.yml | 2 -
.../sinks-internal-jvm/docker-compose.yml | 2 -
.../standalone/ui-custom-conf/docker-compose.yml | 1 -
.../cli/deploy/standalone/ui/docker-compose.yml | 1 -
installer/cli/environments/adapter | 1 -
installer/cli/environments/backend | 1 -
installer/cli/environments/backend-nats | 1 -
installer/cli/environments/backend-pulsar | 1 -
installer/cli/environments/basic | 1 -
installer/cli/environments/basic-nats | 1 -
installer/cli/environments/basic-pulsar | 1 -
installer/cli/environments/full | 1 -
installer/cli/environments/lite | 1 -
installer/cli/environments/lite-nats | 1 -
installer/cli/environments/lite-pulsar | 1 -
installer/cli/environments/minimal | 1 -
installer/cli/environments/pipeline-element | 1 -
installer/cli/environments/pipeline-element-nats | 1 -
installer/cli/environments/pipeline-element-pulsar | 1 -
installer/cli/environments/ui | 1 -
installer/compose/.env | 1 -
installer/compose/docker-compose.full.yml | 31 ---
installer/compose/docker-compose.minimal.yml | 29 ---
installer/compose/docker-compose.nats.yml | 30 ---
installer/compose/docker-compose.pulsar.yml | 30 ---
installer/compose/docker-compose.quickstart.yml | 30 ---
installer/compose/docker-compose.yml | 30 ---
installer/k8s/README.md | 31 ++-
.../k8s/templates/core/backend-deployment.yaml | 4 +-
installer/k8s/templates/core/ui-deployment.yaml | 4 +-
.../external/consul/consul-deployment.yaml | 85 --------
.../templates/external/consul/consul-pv-pvc.yaml | 28 ---
.../templates/external/consul/consul-service.yaml | 31 ---
.../templates/external/kafka/kafka-deployment.yaml | 2 +-
.../templates/external/nats/nats-deployment.yaml | 4 -
.../monitor/grafana/grafana-deployment.yml | 4 +-
.../monitor/prometheus/prometheus-deployment.yml | 2 +-
installer/k8s/values.yaml | 14 --
installer/scripts/epsg/Readme.md | 1 -
pom.xml | 2 -
.../streampipes/functions/registration.py | 2 +-
.../commons/constants/DefaultEnvValues.java | 3 -
.../apache/streampipes/commons/constants/Envs.java | 11 -
.../commons/environment/DefaultEnvironment.java | 14 --
.../commons/environment/Environment.java | 8 -
streampipes-config/pom.xml | 52 -----
.../streampipes/config/backend/BackendConfig.java | 129 ------------
.../config/backend/BackendConfigKeys.java | 44 ----
.../development/env | 2 +-
.../streampipes-connect-adapters/development/env | 2 +-
.../development/env | 2 +-
.../development/env | 2 +-
.../streampipes-sinks-internal-jvm/development/env | 2 +-
streampipes-integration-tests/pom.xml | 6 -
.../svcdiscovery/AbstractConsulTest.java | 74 -------
.../svcdiscovery/ConsulSpConfigTest.java | 71 -------
.../src/main/resources/docker-compose.yml | 2 -
.../core/migrations/AvailableMigrations.java | 2 -
.../migrations/v093/ConsulConfigMigration.java | 83 --------
streampipes-service-discovery-consul/pom.xml | 58 ------
.../svcdiscovery/consul/AbstractConsulService.java | 35 ----
.../svcdiscovery/consul/ConsulProvider.java | 106 ----------
.../svcdiscovery/consul/ConsulSpConfig.java | 227 ---------------------
streampipes-service-discovery/pom.xml | 5 -
.../svcdiscovery/SpServiceDiscovery.java | 17 --
.../tests/experimental/testJvmArchetype/.env | 1 -
.../testJvmArchetype/armDockerFile/Dockerfile | 2 -
.../experimental/testJvmArchetype/backend/.env | 1 -
.../testJvmArchetype/docker-compose.yml | 29 ---
...extensions-service-configuration.component.html | 16 +-
...extensions-service-configuration.component.scss | 8 +-
.../extensions-service-configuration.component.ts | 22 +-
.../service-configs-boolean.component.ts | 2 +-
.../service-configs-number.component.ts | 2 +-
.../service-configs-password.component.spec.ts | 6 +-
.../service-configs-password.component.ts | 2 +-
.../service-configs-text.component.ts | 2 +-
.../service-configs/service-configs.component.html | 18 +-
.../service-configs/service-configs.component.ts | 6 +-
.../registered-extensions-services.component.html | 2 +-
.../configuration/shared/configuration.service.ts | 9 +-
96 files changed, 85 insertions(+), 1549 deletions(-)
diff --git
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env
index e46f6d76b..a9ee6e1e7 100644
---
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env
+++
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8005
SP_HOST=host.docker.internal
SP_DEBUG=true
\ No newline at end of file
diff --git
a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env
b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env
index 2eaca6f67..077ddab6f 100644
---
a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env
+++
b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8005
SP_HOST=host.docker.internal
SP_DEBUG=true
diff --git
a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env
b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env
index 2eaca6f67..077ddab6f 100644
---
a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env
+++
b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8005
SP_HOST=host.docker.internal
SP_DEBUG=true
diff --git a/development/.env b/development/.env
index 285230a42..6584644ee 100644
--- a/development/.env
+++ b/development/.env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=6009
SP_HOST=host.docker.internal
SP_DEBUG=true
diff --git a/docker-compose.yml b/docker-compose.yml
index 5570b5f3d..860c6e779 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,6 @@ services:
dockerfile: Dockerfile
image: streampipes_backend:release-validation
depends_on:
- - consul
- couchdb
volumes:
- backend:/root/.streampipes
@@ -58,7 +57,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
logging: *default-logging
networks:
@@ -75,32 +73,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"rpc_streaming\": false,
\"disable_update_check\": true, \"rpc\": {\"enable_streaming\": false},
\"use_streaming_backend\": false}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- - "CONSUL_RPC_ENABLE_STREAMING=false"
- - "CONSUL_USE_STREAMING_BACKEND=false"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- logging: *default-logging
- volumes:
- - consul:/consul/data
- networks:
- spnet:
- ipv4_address: 172.31.0.9
-
couchdb:
image: couchdb:2.3.1
environment:
@@ -162,7 +134,6 @@ services:
volumes:
kafka:
files:
- consul:
couchdb:
zookeeper:
influxdb:
diff --git a/installer/cli/.env b/installer/cli/.env
index d0ed018c9..4f899ce21 100644
--- a/installer/cli/.env
+++ b/installer/cli/.env
@@ -16,7 +16,6 @@
SP_DOCKER_REGISTRY=apachestreampipes
SP_VERSION=0.93.0-SNAPSHOT
SP_SUBNET=172.31.0.0/16
-SP_CONSUL_CONTAINER_IP=172.31.0.9
COMPOSE_PROJECT_NAME=streampipes
# -------------------------------------------------------------
diff --git a/installer/cli/README.md b/installer/cli/README.md
index e189c71a8..248cf389e 100644
--- a/installer/cli/README.md
+++ b/installer/cli/README.md
@@ -98,7 +98,7 @@ streampipes env --set pipeline-element
```
**Start** environment ( default: `dev` mode). Here the service definition in
the selected environment is used to start the multi-container landscape.
-> **NOTE**: `dev` mode is enabled by default since we rely on open ports to
core service such as `consul`, `couchdb`, `kafka` etc. to reach from the IDE
when developing. If you don't want to map ports (except the UI port), then use
the `--no-ports` flag.
+> **NOTE**: `dev` mode is enabled by default since we rely on open ports to
core service such as `couchdb`, `kafka` etc. to reach from the IDE when
developing. If you don't want to map ports (except the UI port), then use the
`--no-ports` flag.
```bash
streampipes up -d
@@ -120,12 +120,12 @@ streampipes down
## Additionally, useful commands
-**Start individual services only?** We got you! You chose a template that
suits your needs and now you only want to start individual services from it,
e.g. only Kafka and Consul.
+**Start individual services only?** We got you! You chose a template that
suits your needs and now you only want to start individual services from it,
e.g. only Kafka and CouchDB.
> **NOTE**: the service names need to be present and match your current
> `.spenv` environment.
```bash
-streampipes up -d kafka consul
+streampipes up -d kafka couchdb
```
**Get current environment** (if previously set using `streampipes env --set
<environment>`).
@@ -162,8 +162,8 @@ streampipes start extensions-all-jvm
**Restart** existing services
```bash
-# restart backend consul container
-streampipes restart backend consul
+# restart backend couchdb container
+streampipes restart backend couchdb
# restart existing services by removing and recreating container instance
streampipes restart --force-create extensions-all-jvm
```
diff --git a/installer/cli/bin/commands/add b/installer/cli/bin/commands/add
index f86bd44f0..cb8e6fbfe 100755
--- a/installer/cli/bin/commands/add
+++ b/installer/cli/bin/commands/add
@@ -125,7 +125,6 @@ services:
${svc_name}:
image: ${svc_img_tag}
depends_on:
- - "consul"
- "backend"
environment:
- SP_HOST=${svc_name}
diff --git a/installer/cli/deploy/standalone/backend/docker-compose.yml
b/installer/cli/deploy/standalone/backend/docker-compose.yml
index 4d014eb27..c6f320022 100644
--- a/installer/cli/deploy/standalone/backend/docker-compose.yml
+++ b/installer/cli/deploy/standalone/backend/docker-compose.yml
@@ -18,7 +18,6 @@ services:
backend:
image: ${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}
depends_on:
- - consul
- couchdb
volumes:
- backend:/root/.streampipes
diff --git
a/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
b/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
index 30e150096..eb45b3747 100644
--- a/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
+++ b/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
@@ -17,8 +17,6 @@ version: "3.4"
services:
connect-adapters-iiot:
image: ${SP_DOCKER_REGISTRY}/connect-adapters-iiot:${SP_VERSION}
- depends_on:
- - consul
environment:
- SP_BACKEND_HOST=backend
- SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters-iiot
diff --git
a/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml
b/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml
index 70fa81eb0..03c2bece5 100644
--- a/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml
+++ b/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml
@@ -17,8 +17,6 @@ version: "3.4"
services:
connect-adapters:
image: ${SP_DOCKER_REGISTRY}/connect-adapters:${SP_VERSION}
- depends_on:
- - consul
environment:
- SP_BACKEND_HOST=backend
- SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters
diff --git a/installer/cli/deploy/standalone/consul/docker-compose.dev.yml
b/installer/cli/deploy/standalone/consul/docker-compose.dev.yml
deleted file mode 100644
index e9011ae3a..000000000
--- a/installer/cli/deploy/standalone/consul/docker-compose.dev.yml
+++ /dev/null
@@ -1,21 +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.
-
-version: "3.4"
-services:
- consul:
- ports:
- - "8500:8500"
- - "8600:8600"
diff --git a/installer/cli/deploy/standalone/consul/docker-compose.yml
b/installer/cli/deploy/standalone/consul/docker-compose.yml
deleted file mode 100644
index dd26e0af9..000000000
--- a/installer/cli/deploy/standalone/consul/docker-compose.yml
+++ /dev/null
@@ -1,53 +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.
-
-version: "3.4"
-services:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"rpc_streaming\": false,
\"disable_update_check\": true, \"rpc\": {\"enable_streaming\": false},
\"use_streaming_backend\": false}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- - "CONSUL_RPC_ENABLE_STREAMING=false"
- - "CONSUL_USE_STREAMING_BACKEND=false"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging:
- driver: "json-file"
- options:
- max-size: "1m"
- max-file: "1"
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
-volumes:
- consul:
-
-networks:
- spnet:
- external: true
diff --git
a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
index 287b34dfd..a44655139 100644
--- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
@@ -18,8 +18,7 @@ services:
extensions-all-jvm:
image: ${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}
depends_on:
- - consul
- - couchdb
+ - couchdb
volumes:
- files:/spImages
logging:
diff --git
a/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml
b/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml
index d18367f45..d1496ec8f 100644
---
a/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml
+++
b/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml
@@ -18,7 +18,6 @@ services:
pipeline-elements-all-flink:
image: ${SP_DOCKER_REGISTRY}/pipeline-elements-all-flink:${SP_VERSION}
depends_on:
- - "consul"
- "jobmanager"
logging:
driver: "json-file"
diff --git
a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
index 6f024ab0e..8ecc75f68 100644
---
a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
+++
b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
@@ -17,8 +17,6 @@ version: "3.4"
services:
pipeline-elements-all-jvm:
image: ${SP_DOCKER_REGISTRY}/pipeline-elements-all-jvm:${SP_VERSION}
- depends_on:
- - "consul"
volumes:
- files:/spImages
logging:
diff --git
a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
index 93db02e88..5ef951161 100644
--- a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
@@ -17,8 +17,6 @@ version: "3.4"
services:
sinks-internal-jvm:
image: ${SP_DOCKER_REGISTRY}/sinks-internal-jvm:${SP_VERSION}
- depends_on:
- - "consul"
volumes:
- files:/spImages
logging:
diff --git a/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
index 917e90b54..7d9efb089 100644
--- a/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
+++ b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml
@@ -21,7 +21,6 @@ services:
- "80:80"
depends_on:
- couchdb
- - consul
volumes:
- "../ui-custom-conf/default.conf:/etc/nginx/conf.d/default.conf"
logging:
diff --git a/installer/cli/deploy/standalone/ui/docker-compose.yml
b/installer/cli/deploy/standalone/ui/docker-compose.yml
index bd88b873d..0985c3a7d 100644
--- a/installer/cli/deploy/standalone/ui/docker-compose.yml
+++ b/installer/cli/deploy/standalone/ui/docker-compose.yml
@@ -21,7 +21,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
volumes:
- nginx:/etc/nginx/
logging:
diff --git a/installer/cli/environments/adapter
b/installer/cli/environments/adapter
index 851165714..ce6599f80 100644
--- a/installer/cli/environments/adapter
+++ b/installer/cli/environments/adapter
@@ -15,7 +15,6 @@
[environment:adapter]
backend
-consul
couchdb
kafka
ui
diff --git a/installer/cli/environments/backend
b/installer/cli/environments/backend
index 798a732ce..c556a3347 100644
--- a/installer/cli/environments/backend
+++ b/installer/cli/environments/backend
@@ -15,7 +15,6 @@
[environment:backend]
kafka
-consul
zookeeper
couchdb
influxdb
diff --git a/installer/cli/environments/backend-nats
b/installer/cli/environments/backend-nats
index 550c54169..b83bc8b65 100644
--- a/installer/cli/environments/backend-nats
+++ b/installer/cli/environments/backend-nats
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:backend]
-consul
couchdb
influxdb
nats
diff --git a/installer/cli/environments/backend-pulsar
b/installer/cli/environments/backend-pulsar
index 0e3a8d803..c2bcd9daa 100644
--- a/installer/cli/environments/backend-pulsar
+++ b/installer/cli/environments/backend-pulsar
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:backend-pulsar]
-consul
couchdb
influxdb
ui-custom-conf
diff --git a/installer/cli/environments/basic b/installer/cli/environments/basic
index ce25e8e74..94404b70e 100644
--- a/installer/cli/environments/basic
+++ b/installer/cli/environments/basic
@@ -15,7 +15,6 @@
[environment:basic]
kafka
-consul
zookeeper
couchdb
influxdb
diff --git a/installer/cli/environments/basic-nats
b/installer/cli/environments/basic-nats
index fb7ef1c89..d9a7aa929 100644
--- a/installer/cli/environments/basic-nats
+++ b/installer/cli/environments/basic-nats
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:basic]
-consul
couchdb
influxdb
nats
diff --git a/installer/cli/environments/basic-pulsar
b/installer/cli/environments/basic-pulsar
index fe220cc7e..1c857e99f 100644
--- a/installer/cli/environments/basic-pulsar
+++ b/installer/cli/environments/basic-pulsar
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:basic-pulsar]
-consul
couchdb
influxdb
pulsar
diff --git a/installer/cli/environments/full b/installer/cli/environments/full
index f751a5086..bc9f7da71 100644
--- a/installer/cli/environments/full
+++ b/installer/cli/environments/full
@@ -17,7 +17,6 @@
ui
backend
extensions-all-jvm
-consul
couchdb
jobmanager
taskmanager
diff --git a/installer/cli/environments/lite b/installer/cli/environments/lite
index b41a6a09a..5dc3305ff 100644
--- a/installer/cli/environments/lite
+++ b/installer/cli/environments/lite
@@ -16,7 +16,6 @@
[environment:lite]
ui
backend
-consul
couchdb
kafka
zookeeper
diff --git a/installer/cli/environments/lite-nats
b/installer/cli/environments/lite-nats
index 89966075b..312fc18af 100644
--- a/installer/cli/environments/lite-nats
+++ b/installer/cli/environments/lite-nats
@@ -16,7 +16,6 @@
[environment:lite]
ui
backend
-consul
couchdb
influxdb
extensions-all-jvm
diff --git a/installer/cli/environments/lite-pulsar
b/installer/cli/environments/lite-pulsar
index 791e49ab1..a80e85cf9 100644
--- a/installer/cli/environments/lite-pulsar
+++ b/installer/cli/environments/lite-pulsar
@@ -16,7 +16,6 @@
[environment:lite-pulsar]
ui
backend
-consul
couchdb
influxdb
extensions-all-jvm
diff --git a/installer/cli/environments/minimal
b/installer/cli/environments/minimal
index 3f51549a1..63c4b987c 100644
--- a/installer/cli/environments/minimal
+++ b/installer/cli/environments/minimal
@@ -16,7 +16,6 @@
[environment:minimal]
ui
backend
-consul
couchdb
influxdb
mosquitto
diff --git a/installer/cli/environments/pipeline-element
b/installer/cli/environments/pipeline-element
index 3c0e735bd..f30bf1a76 100644
--- a/installer/cli/environments/pipeline-element
+++ b/installer/cli/environments/pipeline-element
@@ -15,7 +15,6 @@
[environment:pipeline-element]
backend
-consul
couchdb
kafka
ui
diff --git a/installer/cli/environments/pipeline-element-nats
b/installer/cli/environments/pipeline-element-nats
index 25cda9368..3eede5658 100644
--- a/installer/cli/environments/pipeline-element-nats
+++ b/installer/cli/environments/pipeline-element-nats
@@ -15,7 +15,6 @@
[environment:pipeline-element]
backend
-consul
couchdb
ui
nats
diff --git a/installer/cli/environments/pipeline-element-pulsar
b/installer/cli/environments/pipeline-element-pulsar
index 280810eb2..88f6d91b6 100644
--- a/installer/cli/environments/pipeline-element-pulsar
+++ b/installer/cli/environments/pipeline-element-pulsar
@@ -15,7 +15,6 @@
[environment:pipeline-element-pulsar]
backend-pulsar
-consul
couchdb
ui
influxdb
diff --git a/installer/cli/environments/ui b/installer/cli/environments/ui
index 91c75baab..125c42904 100644
--- a/installer/cli/environments/ui
+++ b/installer/cli/environments/ui
@@ -15,7 +15,6 @@
[environment:ui]
backend
-consul
extensions-all-jvm
couchdb
kafka
diff --git a/installer/compose/.env b/installer/compose/.env
index 6d48dab97..194e36be6 100644
--- a/installer/compose/.env
+++ b/installer/compose/.env
@@ -16,7 +16,6 @@
SP_VERSION=0.93.0-SNAPSHOT
SP_DOCKER_REGISTRY=apachestreampipes
SP_SUBNET=172.31.0.0/16
-SP_CONSUL_CONTAINER_IP=172.31.0.9
COMPOSE_PROJECT_NAME=streampipes
# For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an
existing installation
diff --git a/installer/compose/docker-compose.full.yml
b/installer/compose/docker-compose.full.yml
index 00029cddd..a8f88f6e4 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
depends_on:
- - consul
- couchdb
volumes:
- backend:/root/.streampipes
@@ -44,7 +43,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -53,31 +51,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- volumes:
- - consul:/consul/data
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -170,8 +143,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- depends_on:
- - consul
volumes:
- files:/spImages
logging: *default-logging
@@ -183,7 +154,6 @@ services:
pipeline-elements-all-flink:
image: "${SP_DOCKER_REGISTRY}/pipeline-elements-all-flink:${SP_VERSION}"
depends_on:
- - consul
- jobmanager
logging: *default-logging
restart: unless-stopped
@@ -193,7 +163,6 @@ services:
volumes:
backend:
- consul:
connect:
couchdb:
kafka:
diff --git a/installer/compose/docker-compose.minimal.yml
b/installer/compose/docker-compose.minimal.yml
index 0a4246298..948dd0d35 100644
--- a/installer/compose/docker-compose.minimal.yml
+++ b/installer/compose/docker-compose.minimal.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend-nats:${SP_VERSION}"
depends_on:
- - consul
- couchdb
environment:
- SP_PRIORITIZED_PROTOCOL=nats
@@ -45,7 +44,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -54,31 +52,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -120,7 +93,6 @@ services:
extensions-iiot-minimal:
image: "${SP_DOCKER_REGISTRY}/extensions-iiot-minimal:${SP_VERSION}"
depends_on:
- - consul
logging: *default-logging
restart: unless-stopped
networks:
@@ -128,7 +100,6 @@ services:
volumes:
backend:
- consul:
couchdb:
influxdb:
influxdb2:
diff --git a/installer/compose/docker-compose.nats.yml
b/installer/compose/docker-compose.nats.yml
index 210532139..b9e5fff61 100644
--- a/installer/compose/docker-compose.nats.yml
+++ b/installer/compose/docker-compose.nats.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
depends_on:
- - consul
- couchdb
environment:
- SP_PRIORITIZED_PROTOCOL=nats
@@ -45,7 +44,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -54,31 +52,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -120,8 +93,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- depends_on:
- - consul
logging: *default-logging
restart: unless-stopped
networks:
@@ -129,7 +100,6 @@ services:
volumes:
backend:
- consul:
connect:
couchdb:
influxdb:
diff --git a/installer/compose/docker-compose.pulsar.yml
b/installer/compose/docker-compose.pulsar.yml
index ca11f9c02..c657b18bb 100644
--- a/installer/compose/docker-compose.pulsar.yml
+++ b/installer/compose/docker-compose.pulsar.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
depends_on:
- - consul
- couchdb
environment:
- SP_PRIORITIZED_PROTOCOL=pulsar
@@ -46,7 +45,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -55,31 +53,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -115,8 +88,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- depends_on:
- - consul
logging: *default-logging
restart: unless-stopped
networks:
@@ -124,7 +95,6 @@ services:
volumes:
backend:
- consul:
connect:
couchdb:
influxdb:
diff --git a/installer/compose/docker-compose.quickstart.yml
b/installer/compose/docker-compose.quickstart.yml
index c676359ea..5fea61fc4 100644
--- a/installer/compose/docker-compose.quickstart.yml
+++ b/installer/compose/docker-compose.quickstart.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
depends_on:
- - consul
- couchdb
volumes:
- backend:/root/.streampipes
@@ -44,7 +43,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -53,31 +51,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -145,8 +118,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- depends_on:
- - consul
volumes:
- files:/spImages
logging: *default-logging
@@ -167,7 +138,6 @@ services:
volumes:
backend:
- consul:
connect:
couchdb:
kafka:
diff --git a/installer/compose/docker-compose.yml
b/installer/compose/docker-compose.yml
index 4f9bb5bad..25a5be84b 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -28,7 +28,6 @@ services:
backend:
image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
depends_on:
- - consul
- couchdb
volumes:
- backend:/root/.streampipes
@@ -44,7 +43,6 @@ services:
- "80:8088"
depends_on:
- couchdb
- - consul
- backend
volumes:
- nginx:/etc/nginx/
@@ -53,31 +51,6 @@ services:
networks:
spnet:
- consul:
- image: consul:1.14.3
- environment:
- - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}"
- - "CONSUL_BIND_INTERFACE=eth0"
- - "CONSUL_HTTP_ADDR=0.0.0.0"
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:3.3.1
environment:
@@ -145,8 +118,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- depends_on:
- - consul
volumes:
- files:/spImages
logging: *default-logging
@@ -157,7 +128,6 @@ services:
volumes:
backend:
- consul:
connect:
couchdb:
kafka:
diff --git a/installer/k8s/README.md b/installer/k8s/README.md
index d55f52105..4c48df125 100644
--- a/installer/k8s/README.md
+++ b/installer/k8s/README.md
@@ -69,7 +69,6 @@ After a while, all containers should successfully started,
indicated by the `Run
kubectl get pods
NAME READY STATUS RESTARTS AGE
backend-76ddc486c8-nswpc 1/1 Running 0
3m27s
-consul-55965f966b-gwb7l 1/1 Running 0
3m27s
couchdb-77db98cf7b-xnnvb 1/1 Running 0
3m27s
influxdb-b95b6479-r8wh8 1/1 Running 0
3m27s
extensions-all-jvm-79c445dbd9-m8xcs 1/1 Running 0 3m27s
@@ -165,22 +164,6 @@ rm -rf ${HOME}/streampipes-k8s
### External common parameters
-#### Consul common parameters
-
-| Parameter Name | Description
| Value |
-|----------------------------------------------|----------------------------------------------------|--------------|
-| external.consul.appName | Consul application name
| "consul" |
-| external.consul.version | Consul version
| 1.14.3 |
-| external.consul.webPort | Port number for the Consul
web interface | 8500 |
-| external.consul.dnsPort | Port number for the Consul
DNS interface | 8600 |
-| external.consul.persistence.storageClassName | Storage class name for Consul
PVs | "hostpath" |
-| external.consul.persistence.storageSize | Size of the Consul PV
| "1Gi" |
-| external.consul.persistence.claimName | Name of the Consul
PersistentVolumeClaim | "consul-pvc" |
-| external.consul.persistence.pvName | Name of the Consul
PersistentVolume | "consul-pv" |
-| external.consul.service.name | Name of the Consul service
| "consul" |
-| external.consul.service.webPort | TargetPort of the Consul
service for web interface | 8500 |
-| external.consul.service.dnsPort | TargetPort of the Consul
service for DNS interface | 8600 |
-
#### Couchdb common parameters
| Parameter Name | Description
| Value |
@@ -196,6 +179,20 @@ rm -rf ${HOME}/streampipes-k8s
| external.couchdb.persistence.storageSize | Size of the CouchDB PV
| "1Gi" |
| external.couchdb.persistence.claimName | Name of the CouchDB
PersistentVolumeClaim | "couchdb-pvc" |
| external.couchdb.persistence.pvName | Name of the CouchDB
PersistentVolume | "couchdb-pv" |
+####Couchdb common parameters
+| Parameter Name | Description
| Value |
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
+| external.couchdb.appName | CouchDB application name
| "couchdb" |
+| external.couchdb.version | CouchDB version
| 3.3.1 |
+| external.couchdb.user | CouchDB admin username
| "admin" |
+| external.couchdb.password | CouchDB admin password
| empty (auto-generated) |
+| external.couchdb.port | Port for the CouchDB
service | 5984 |
+| external.couchdb.service.name | Name of the CouchDB
service | "couchdb"
|
+| external.couchdb.service.port | TargetPort of the CouchDB
service | 5984 |
+| external.couchdb.persistence.storageClassName | Storage class name for
CouchDB PVs | "hostpath" |
+| external.couchdb.persistence.storageSize | Size of the CouchDB PV
| "1Gi" |
+| external.couchdb.persistence.claimName | Name of the CouchDB
PersistentVolumeClaim | "couchdb-pvc"
|
+| external.couchdb.persistence.pvName | Name of the CouchDB
PersistentVolume | "couchdb-pv"
|
#### Influxdb common parameters
diff --git a/installer/k8s/templates/core/backend-deployment.yaml
b/installer/k8s/templates/core/backend-deployment.yaml
index a8d4e8e26..96d09ee9c 100644
--- a/installer/k8s/templates/core/backend-deployment.yaml
+++ b/installer/k8s/templates/core/backend-deployment.yaml
@@ -37,9 +37,9 @@ spec:
claimName: {{ .Values.streampipes.core.persistence.claimName }}
restartPolicy: {{ .Values.restartPolicy }}
initContainers:
- - name: init-wait-consul-couchdb
+ - name: init-wait-couchdb
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.service.name }} {{
.Values.external.consul.service.webPort }} && nc -zvw1 {{
.Values.external.couchdb.service.name }} {{
.Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.couchdb.service.name }} {{
.Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.streampipes.core.appName }}
image: {{ .Values.streampipes.registry }}/backend:{{
.Values.streampipes.version }}
diff --git a/installer/k8s/templates/core/ui-deployment.yaml
b/installer/k8s/templates/core/ui-deployment.yaml
index 7383f0ce0..d04c2f1f5 100644
--- a/installer/k8s/templates/core/ui-deployment.yaml
+++ b/installer/k8s/templates/core/ui-deployment.yaml
@@ -33,9 +33,9 @@ spec:
name: nginx-conf
restartPolicy: {{ .Values.restartPolicy }}
initContainers:
- - name: init-wait-consul-couchdb-core
+ - name: init-wait-couchdb-core
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1
{{.Values.external.consul.service.name }}
{{.Values.external.consul.service.webPort }} && nc -zvw1
{{.Values.external.couchdb.service.name }}
{{.Values.external.couchdb.service.port }} && nc -zvw1
{{.Values.streampipes.core.service.name }}
{{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1
{{.Values.external.couchdb.service.name }}
{{.Values.external.couchdb.service.port }} && nc -zvw1
{{.Values.streampipes.core.service.name }}
{{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.streampipes.ui.appName }}
image: {{ .Values.streampipes.registry }}/ui:{{
.Values.streampipes.version }}
diff --git a/installer/k8s/templates/external/consul/consul-deployment.yaml
b/installer/k8s/templates/external/consul/consul-deployment.yaml
deleted file mode 100644
index 7b84ef8b2..000000000
--- a/installer/k8s/templates/external/consul/consul-deployment.yaml
+++ /dev/null
@@ -1,85 +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.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Values.external.consul.appName }}
-spec:
- selector:
- matchLabels:
- app: {{ .Values.external.consul.appName }}
- replicas: 1
- template:
- metadata:
- labels:
- app: {{ .Values.external.consul.appName }}
- spec:
- volumes:
- - name: {{ .Values.external.consul.persistence.pvName }}
- persistentVolumeClaim:
- claimName: {{ .Values.external.consul.persistence.claimName }}
- restartPolicy: {{ .Values.restartPolicy }}
- containers:
- - name: {{ .Values.external.consul.appName }}
- image: consul:{{ .Values.external.consul.version }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- command:
- - "/bin/sh"
- - "-ec"
- - |
- exec /bin/consul agent \
- -server \
- -bind=0.0.0.0 \
- -bootstrap-expect=1 \
- -data-dir=/consul/data \
- -node=consule-one \
- -client=0.0.0.0 \
- -enable-script-checks=true \
- -ui
- env:
- - name: CONSUL_BIND_INTERFACE
- value: "eth0"
- - name: CONSUL_HTTP_ADDR
- value: "0.0.0.0"
- - name: CONSUL_LOCAL_CONFIG
- value: "{\"disable_update_check\": true}"
- ports:
- - containerPort: {{ .Values.external.consul.webPort }}
- - containerPort: {{ .Values.external.consul.dnsPort }}
- volumeMounts:
- - mountPath: "/consul/data"
- name: {{ .Values.external.consul.persistence.pvName }}
- livenessProbe:
- httpGet:
- path: /v1/status/leader
- port: {{ .Values.external.consul.webPort }}
- initialDelaySeconds: {{ .Values.initialDelaySeconds }}
- periodSeconds: {{ .Values.periodSeconds }}
- failureThreshold: {{ .Values.failureThreshold }}
- readinessProbe:
- httpGet:
- path: /v1/status/leader
- port: {{ .Values.external.consul.webPort }}
- initialDelaySeconds: {{ .Values.initialDelaySeconds }}
- periodSeconds: {{ .Values.periodSeconds }}
- failureThreshold: {{ .Values.failureThreshold }}
- startupProbe:
- httpGet:
- path: /v1/status/leader
- port: {{ .Values.external.consul.webPort }}
- initialDelaySeconds: {{ .Values.initialDelaySeconds }}
- periodSeconds: {{ .Values.periodSeconds }}
- failureThreshold: {{ .Values.failureThreshold }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
b/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
deleted file mode 100644
index 200350e46..000000000
--- a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
+++ /dev/null
@@ -1,28 +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.
-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- labels:
- app: {{ .Values.external.consul.appName }}
- name: {{ .Values.external.consul.persistence.claimName }}
-spec:
- storageClassName: {{ .Values.external.consul.persistence.storageClassName }}
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- resources:
- requests:
- storage: {{ .Values.external.consul.persistence.storageSize }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/consul/consul-service.yaml
b/installer/k8s/templates/external/consul/consul-service.yaml
deleted file mode 100644
index 6090b3ca8..000000000
--- a/installer/k8s/templates/external/consul/consul-service.yaml
+++ /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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Values.external.consul.service.name }}
-spec:
- selector:
- app: {{ .Values.external.consul.appName }}
- ports:
- - name: main
- protocol: TCP
- port: {{ .Values.external.consul.webPort }}
- targetPort: {{ .Values.external.consul.service.webPort }}
- - name: test
- protocol: TCP
- port: {{ .Values.external.consul.dnsPort }}
- targetPort: {{ .Values.external.consul.service.dnsPort }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/kafka/kafka-deployment.yaml
b/installer/k8s/templates/external/kafka/kafka-deployment.yaml
index f5680ace4..76ac96f04 100644
--- a/installer/k8s/templates/external/kafka/kafka-deployment.yaml
+++ b/installer/k8s/templates/external/kafka/kafka-deployment.yaml
@@ -30,7 +30,7 @@ spec:
spec:
restartPolicy: {{ .Values.restartPolicy }}
initContainers:
- - name: init-wait-consul
+ - name: init-wait
image: alpine
command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.zookeeper.service.name }} {{
.Values.external.zookeeper.service.port }} && exit 0 || sleep 3; done; exit 1"]
volumes:
diff --git a/installer/k8s/templates/external/nats/nats-deployment.yaml
b/installer/k8s/templates/external/nats/nats-deployment.yaml
index 2d6ae4219..88eba9035 100644
--- a/installer/k8s/templates/external/nats/nats-deployment.yaml
+++ b/installer/k8s/templates/external/nats/nats-deployment.yaml
@@ -29,10 +29,6 @@ spec:
app: {{ .Values.external.nats.appName }}
spec:
restartPolicy: {{ .Values.restartPolicy }}
- initContainers:
- - name: init-wait-consul
- image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.appName }} {{ .Values.external.consul.webPort }} &&
exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.external.nats.appName }}
image: nats
diff --git a/installer/k8s/templates/monitor/grafana/grafana-deployment.yml
b/installer/k8s/templates/monitor/grafana/grafana-deployment.yml
index 11743fed4..5670d5a1b 100644
--- a/installer/k8s/templates/monitor/grafana/grafana-deployment.yml
+++ b/installer/k8s/templates/monitor/grafana/grafana-deployment.yml
@@ -36,9 +36,9 @@ spec:
claimName: {{ .Values.monitoring.grafana.persistence.claimName }}
restartPolicy: {{ .Values.restartPolicy }}
initContainers:
- - name: init-wait-consul-couchdb-core
+ - name: init-wait-couchdb-core
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.streampipes.core.service.name }} {{
.Values.streampipes.core.service.port }} && nc -zvw1 {{
.Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port
}} && exit 0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port
}} && exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.monitoring.grafana.appName }}
image: grafana/grafana:{{ .Values.monitoring.grafana.version }}
diff --git
a/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml
b/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml
index 161a9e510..ee28b43c7 100644
--- a/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml
+++ b/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml
@@ -42,7 +42,7 @@ spec:
name: prometheus-conf
restartPolicy: {{ .Values.restartPolicy }}
initContainers:
- - name: init-wait-consul-couchdb-core
+ - name: init-wait-couchdb-core
image: alpine
command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.streampipes.core.service.name }} {{
.Values.streampipes.core.service.port }} && nc -zvw1 {{
.Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port
}} && exit 0 || sleep 3; done; exit 1"]
containers:
diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
index 33885487c..36ae91f3a 100644
--- a/installer/k8s/values.yaml
+++ b/installer/k8s/values.yaml
@@ -87,20 +87,6 @@ extensions:
port: 8090
external:
- consul:
- appName: "consul"
- version: 1.14.3
- webPort: 8500
- dnsPort: 8600
- persistence:
- storageClassName: "hostpath"
- storageSize: "1Gi"
- claimName: "consul-pvc"
- pvName: "consul-pv"
- service:
- name: "consul"
- webPort: 8500
- dnsPort: 8600
couchdb:
appName: "couchdb"
version: 3.3.1
diff --git a/installer/scripts/epsg/Readme.md b/installer/scripts/epsg/Readme.md
index 95effeeee..91ac0bde7 100644
--- a/installer/scripts/epsg/Readme.md
+++ b/installer/scripts/epsg/Readme.md
@@ -40,7 +40,6 @@ Running the `pipeline-element` environment, your environment
file should look li
[environment:pipeline-element]
backend
-consul
extensions-all-jvm
couchdb
kafka
diff --git a/pom.xml b/pom.xml
index 81f79948d..ea8b3de47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -831,7 +831,6 @@
<module>streampipes-client</module>
<module>streampipes-client-api</module>
<module>streampipes-commons</module>
- <module>streampipes-config</module>
<module>streampipes-connect-management</module>
<module>streampipes-connect-shared</module>
<module>streampipes-extensions-api</module>
@@ -873,7 +872,6 @@
<module>streampipes-service-core</module>
<module>streampipes-service-core-minimal</module>
<module>streampipes-service-discovery</module>
- <module>streampipes-service-discovery-consul</module>
<module>streampipes-service-discovery-api</module>
<module>streampipes-service-extensions</module>
<module>streampipes-storage-api</module>
diff --git a/streampipes-client-python/streampipes/functions/registration.py
b/streampipes-client-python/streampipes/functions/registration.py
index e77bd8ad8..5cbd39d0c 100644
--- a/streampipes-client-python/streampipes/functions/registration.py
+++ b/streampipes-client-python/streampipes/functions/registration.py
@@ -45,7 +45,7 @@ class Registration:
self: Registration
The updated Registration instance
"""
- self.functions.append(streampipes_function) # TODO register function
to AdminAPI + consul
+ self.functions.append(streampipes_function) # TODO register function
to AdminAPI
return self
def getFunctions(self) -> List[StreamPipesFunction]:
diff --git
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/DefaultEnvValues.java
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/DefaultEnvValues.java
index 04eb5b564..983cc0295 100644
---
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/DefaultEnvValues.java
+++
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/DefaultEnvValues.java
@@ -24,9 +24,6 @@ public class DefaultEnvValues {
public static final String INITIAL_CLIENT_USER_DEFAULT = "sp-service-client";
public static final String INITIAL_CLIENT_SECRET_DEFAULT =
"my-apache-streampipes-secret-key-change-me";
- public static final String CONSUL_HOST_DEFAULT = "consul";
- public static final String CONSUL_PORT_DEFAULT = "8500";
-
public static final int MAX_WAIT_TIME_AT_SHUTDOWN_DEFAULT = 10000;
public static final String INSTALL_PIPELINE_ELEMENTS = "true";
diff --git
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
index c3e6f969f..4c58485e2 100644
---
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
+++
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
@@ -24,20 +24,9 @@ public enum Envs {
SP_CORE_ASSET_BASE_DIR("SP_CORE_ASSET_BASE_DIR"),
- @Deprecated(since = "0.90.0", forRemoval = true)
- SP_CONSUL_LOCATION("CONSUL_LOCATION",
- DefaultEnvValues.CONSUL_HOST_DEFAULT,
- DefaultEnvValues.LOCALHOST),
-
- SP_CONSUL_HOST("SP_CONSUL_HOST",
- DefaultEnvValues.CONSUL_HOST_DEFAULT,
- DefaultEnvValues.LOCALHOST),
-
SP_CORE_SCHEME("SP_CORE_SCHEME", "http", "http"),
SP_CORE_HOST("SP_CORE_HOST", "backend", "localhost"),
SP_CORE_PORT("SP_CORE_PORT", "8030", "8030"),
-
- SP_CONSUL_PORT("SP_CONSUL_PORT", DefaultEnvValues.CONSUL_PORT_DEFAULT),
SP_KAFKA_RETENTION_MS("SP_KAFKA_RETENTION_MS",
DefaultEnvValues.SP_KAFKA_RETENTION_MS_DEFAULT),
SP_PRIORITIZED_PROTOCOL("SP_PRIORITIZED_PROTOCOL", "kafka"),
SP_JWT_SECRET("SP_JWT_SECRET"),
diff --git
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
index c1db1c185..5e613e090 100644
---
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
+++
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
@@ -25,16 +25,6 @@ import
org.apache.streampipes.commons.environment.variable.StringEnvironmentVari
public class DefaultEnvironment implements Environment {
- @Override
- public StringEnvironmentVariable getConsulHost() {
- return new StringEnvironmentVariable(Envs.SP_CONSUL_HOST);
- }
-
- @Override
- public IntEnvironmentVariable getConsulPort() {
- return new IntEnvironmentVariable(Envs.SP_CONSUL_PORT);
- }
-
@Override
public BooleanEnvironmentVariable getSpDebug() {
return new BooleanEnvironmentVariable(Envs.SP_DEBUG);
@@ -284,8 +274,4 @@ public class DefaultEnvironment implements Environment {
return new StringEnvironmentVariable(Envs.SP_PULSAR_URL);
}
- @Override
- public StringEnvironmentVariable getConsulLocation() {
- return new StringEnvironmentVariable(Envs.SP_CONSUL_LOCATION);
- }
}
diff --git
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
index 913855924..092e6992d 100644
---
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
+++
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
@@ -24,14 +24,6 @@ import
org.apache.streampipes.commons.environment.variable.StringEnvironmentVari
public interface Environment {
- // Consul env variables
- StringEnvironmentVariable getConsulHost();
-
- IntEnvironmentVariable getConsulPort();
-
- @Deprecated(since = "0.90.0", forRemoval = true)
- StringEnvironmentVariable getConsulLocation();
-
BooleanEnvironmentVariable getSpDebug();
// Service base configuration
diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml
deleted file mode 100644
index a445066de..000000000
--- a/streampipes-config/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>streampipes-parent</artifactId>
- <groupId>org.apache.streampipes</groupId>
- <version>0.95.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>streampipes-config</artifactId>
-
- <dependencies>
- <!-- StreamPipes dependencies -->
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-model</artifactId>
- <version>0.95.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-service-discovery</artifactId>
- <version>0.95.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfig.java
b/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfig.java
deleted file mode 100644
index 7937866ca..000000000
---
a/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfig.java
+++ /dev/null
@@ -1,129 +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.
- *
- */
-
-package org.apache.streampipes.config.backend;
-
-
-import org.apache.streampipes.commons.environment.Environments;
-import org.apache.streampipes.commons.random.TokenGenerator;
-import org.apache.streampipes.model.configuration.DefaultMessagingSettings;
-import org.apache.streampipes.model.configuration.EmailConfig;
-import org.apache.streampipes.model.configuration.GeneralConfig;
-import org.apache.streampipes.model.configuration.LocalAuthConfig;
-import org.apache.streampipes.model.configuration.MessagingSettings;
-import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-
-public enum BackendConfig {
- INSTANCE;
-
- private final SpConfig config;
-
- BackendConfig() {
- config = SpServiceDiscovery.getSpConfig("backend");
- config.register(BackendConfigKeys.IS_CONFIGURED, false,
- "Boolean that indicates whether streampipes is " + "already configured
or not");
- }
-
- public String getJmsHost() {
- return config.getString(BackendConfigKeys.JMS_HOST);
- }
-
- public int getJmsPort() {
- return config.getInteger(BackendConfigKeys.JMS_PORT);
- }
-
- public String getMqttHost() {
- return config.getString(BackendConfigKeys.MQTT_HOST);
- }
-
- public int getMqttPort() {
- return config.getInteger(BackendConfigKeys.MQTT_PORT);
- }
-
- public String getNatsHost() {
- return config.getString(BackendConfigKeys.NATS_HOST);
- }
-
- public int getNatsPort() {
- return config.getInteger(BackendConfigKeys.NATS_PORT);
- }
-
- public String getKafkaHost() {
- return config.getString(BackendConfigKeys.KAFKA_HOST);
- }
-
- public int getKafkaPort() {
- return config.getInteger(BackendConfigKeys.KAFKA_PORT);
- }
-
- public String getPulsarUrl() {
- return config.getString(BackendConfigKeys.PULSAR_URL);
- }
-
- public String getZookeeperHost() {
- return config.getString(BackendConfigKeys.ZOOKEEPER_HOST);
- }
-
- public int getZookeeperPort() {
- return config.getInteger(BackendConfigKeys.ZOOKEEPER_PORT);
- }
-
- public MessagingSettings getMessagingSettings() {
- return config.getObject(BackendConfigKeys.MESSAGING_SETTINGS,
MessagingSettings.class,
- new DefaultMessagingSettings().make());
- }
-
- public boolean isConfigured() {
- return config.getBoolean(BackendConfigKeys.IS_CONFIGURED);
- }
-
- public void setIsConfigured(boolean b) {
- config.setBoolean(BackendConfigKeys.IS_CONFIGURED, b);
- }
-
- public String getAssetDir() {
- return config.getString(BackendConfigKeys.ASSETS_DIR);
- }
-
- public String getFilesDir() {
- return config.getString(BackendConfigKeys.FILES_DIR);
- }
-
- public LocalAuthConfig getLocalAuthConfig() {
- return config.getObject(BackendConfigKeys.LOCAL_AUTH_CONFIG,
LocalAuthConfig.class,
- LocalAuthConfig.fromDefaults(getJwtSecret()));
- }
-
- public EmailConfig getEmailConfig() {
- return config.getObject(BackendConfigKeys.EMAIL_CONFIG, EmailConfig.class,
EmailConfig.fromDefaults());
- }
-
- public GeneralConfig getGeneralConfig() {
- return config.getObject(BackendConfigKeys.GENERAL_CONFIG,
GeneralConfig.class, new GeneralConfig());
- }
-
- private String getJwtSecret() {
- var env = Environments.getEnvironment();
- return env.getJwtSecret().getValueOrResolve(this::makeDefaultJwtSecret);
- }
-
- private String makeDefaultJwtSecret() {
- return TokenGenerator.generateNewToken();
- }
-}
diff --git
a/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfigKeys.java
b/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfigKeys.java
deleted file mode 100644
index b0268f46c..000000000
---
a/streampipes-config/src/main/java/org/apache/streampipes/config/backend/BackendConfigKeys.java
+++ /dev/null
@@ -1,44 +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.
- *
- */
-
-package org.apache.streampipes.config.backend;
-
-public class BackendConfigKeys {
- public static final String BACKEND_HOST = "SP_BACKEND_HOST";
- public static final String BACKEND_PORT = "SP_BACKEND_PORT";
- public static final String JMS_HOST = "SP_JMS_HOST";
- public static final String JMS_PORT = "SP_JMS_PORT";
- public static final String NATS_HOST = "SP_NATS_HOST";
- public static final String NATS_PORT = "SP_NATS_PORT";
- public static final String MQTT_HOST = "SP_MQTT_HOST";
- public static final String MQTT_PORT = "SP_MQTT_PORT";
- public static final String KAFKA_HOST = "SP_KAFKA_HOST";
- public static final String KAFKA_PORT = "SP_KAFKA_PORT";
- public static final String PULSAR_URL = "SP_PULSAR_URL";
- public static final String ZOOKEEPER_HOST = "SP_ZOOKEEPER_HOST";
- public static final String ZOOKEEPER_PORT = "SP_ZOOKEEPER_PORT";
- public static final String IS_CONFIGURED = "SP_IS_CONFIGURED";
- public static final String IS_SETUP_RUNNING = "SP_IS_SETUP_RUNNING";
- public static final String ASSETS_DIR = "SP_ASSETS_DIR";
- public static final String FILES_DIR = "SP_FILES_DIR";
- public static final String MESSAGING_SETTINGS = "SP_MESSAGING_SETTINGS";
-
- public static final String LOCAL_AUTH_CONFIG = "SP_LOCAL_AUTH_CONFIG";
- public static final String EMAIL_CONFIG = "SP_EMAIL_CONFIG";
- public static final String GENERAL_CONFIG = "SP_GENERAL_CONFIG";
-}
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/development/env
b/streampipes-extensions/streampipes-connect-adapters-iiot/development/env
index 2f7b5b4d9..9cf7ec8b0 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/development/env
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8002
SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
diff --git
a/streampipes-extensions/streampipes-connect-adapters/development/env
b/streampipes-extensions/streampipes-connect-adapters/development/env
index 75b98506e..e15e03370 100644
--- a/streampipes-extensions/streampipes-connect-adapters/development/env
+++ b/streampipes-extensions/streampipes-connect-adapters/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8001
SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
diff --git
a/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
index 2eaca6f67..077ddab6f 100644
---
a/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
+++
b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=8005
SP_HOST=host.docker.internal
SP_DEBUG=true
diff --git
a/streampipes-extensions/streampipes-processors-filters-siddhi/development/env
b/streampipes-extensions/streampipes-processors-filters-siddhi/development/env
index 869b1d35e..e52cf08a6 100644
---
a/streampipes-extensions/streampipes-processors-filters-siddhi/development/env
+++
b/streampipes-extensions/streampipes-processors-filters-siddhi/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=6020
SP_HOST=host.docker.internal
SP_DEBUG=true
\ No newline at end of file
diff --git
a/streampipes-extensions/streampipes-sinks-internal-jvm/development/env
b/streampipes-extensions/streampipes-sinks-internal-jvm/development/env
index 3ade8ae97..6c010f641 100644
--- a/streampipes-extensions/streampipes-sinks-internal-jvm/development/env
+++ b/streampipes-extensions/streampipes-sinks-internal-jvm/development/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Those parameters are used by IntelliJ to set the default consul parameters
for development
+# Those parameters are used by IntelliJ to set the default parameters for
development
SP_PORT=7020
#SP_HOST=host.docker.internal
SP_DEBUG=true
diff --git a/streampipes-integration-tests/pom.xml
b/streampipes-integration-tests/pom.xml
index aa5465aee..e10fc8621 100644
--- a/streampipes-integration-tests/pom.xml
+++ b/streampipes-integration-tests/pom.xml
@@ -106,12 +106,6 @@
<version>1.19.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>consul</artifactId>
- <version>1.19.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/AbstractConsulTest.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/AbstractConsulTest.java
deleted file mode 100644
index 0e7107f23..000000000
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/AbstractConsulTest.java
+++ /dev/null
@@ -1,74 +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.
- *
- */
-
-package org.apache.streampipes.integration.svcdiscovery;
-
-import org.apache.streampipes.commons.environment.Environment;
-import
org.apache.streampipes.commons.environment.variable.BooleanEnvironmentVariable;
-import
org.apache.streampipes.commons.environment.variable.IntEnvironmentVariable;
-import
org.apache.streampipes.commons.environment.variable.StringEnvironmentVariable;
-import org.apache.streampipes.model.extensions.configuration.ConfigItem;
-
-import org.mockito.Mockito;
-import org.testcontainers.consul.ConsulContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import static org.mockito.Mockito.mock;
-
-public class AbstractConsulTest {
-
- static final ConsulContainer CONSUL_CONTAINER;
-
- static {
- CONSUL_CONTAINER = new ConsulContainer(
- DockerImageName.parse("consul").withTag("1.14.3"))
- .withExposedPorts(8500);
- CONSUL_CONTAINER.start();
- }
-
- protected ConfigItem makeConfigItem(String key, String value) {
- var item = new ConfigItem();
- item.setKey(key);
- item.setValue(value);
- item.setPassword(false);
-
- return item;
- }
-
- protected Environment mockEnvironment() {
- var envMock = mock(Environment.class);
- var hostVariableMock = mock(StringEnvironmentVariable.class);
- var portVariableMock = mock(IntEnvironmentVariable.class);
- var consulLocationMock = mock(StringEnvironmentVariable.class);
- var spDebugMock = mock(BooleanEnvironmentVariable.class);
-
-
Mockito.when(hostVariableMock.getValueOrDefault()).thenReturn(CONSUL_CONTAINER.getHost());
-
Mockito.when(portVariableMock.getValueOrDefault()).thenReturn(CONSUL_CONTAINER.getMappedPort(8500));
- Mockito.when(consulLocationMock.exists()).thenReturn(false);
- Mockito.when(spDebugMock.exists()).thenReturn(false);
- Mockito.when(spDebugMock.getValueOrReturn(false)).thenReturn(false);
-
- Mockito.when(envMock.getConsulHost()).thenReturn(hostVariableMock);
- Mockito.when(envMock.getConsulPort()).thenReturn(portVariableMock);
- Mockito.when(envMock.getConsulLocation()).thenReturn(consulLocationMock);
- Mockito.when(envMock.getSpDebug()).thenReturn(spDebugMock);
-
- return envMock;
-
- }
-}
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/ConsulSpConfigTest.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/ConsulSpConfigTest.java
deleted file mode 100644
index 7b64d3d39..000000000
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/svcdiscovery/ConsulSpConfigTest.java
+++ /dev/null
@@ -1,71 +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.
- *
- */
-
-package org.apache.streampipes.integration.svcdiscovery;
-
-import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ConsulSpConfigTest extends AbstractConsulTest {
-
- private SpConfig spConfig;
- @Before
- public void before() {
- var env = mockEnvironment();
- this.spConfig = SpServiceDiscovery
- .getSpConfig("test-service-group", env);
- }
-
- @Test
- public void testKvString() {
-
- spConfig.register("str", "abc", "desc");
- var value = spConfig.getString("str");
- assertEquals("abc", value);
- }
-
- @Test
- public void testKvInteger() {
- spConfig.register("int", 2, "desc");
- var value = spConfig.getInteger("int");
- assertEquals(2, value);
- }
-
- @Test
- public void testKvConfigItem() {
- var configItem = makeConfigItem("config", "value");
- spConfig.register(configItem);
- var value = spConfig.getConfigItem("config");
- assertEquals(configItem, value);
- }
-
- @Test
- public void testUpdateValue() {
- spConfig.register("stru", "abc", "desc");
- var value = spConfig.getString("stru");
- assertEquals("abc", value);
- spConfig.setString("stru", "abc2");
- var result = spConfig.getString("stru");
- assertEquals("abc2", result);
- }
-}
diff --git a/streampipes-maven-plugin/src/main/resources/docker-compose.yml
b/streampipes-maven-plugin/src/main/resources/docker-compose.yml
index b7f4c2a7a..cc3a2326f 100644
--- a/streampipes-maven-plugin/src/main/resources/docker-compose.yml
+++ b/streampipes-maven-plugin/src/main/resources/docker-compose.yml
@@ -17,8 +17,6 @@ version: "2"
services:
processors-text-mining-flink:
image:
${SP_DOCKER_REGISTRY}/streampipes/streampipes-pipeline-elements/processors-text-mining-flink:${SP_PE_VERSION}
- depends_on:
- - "consul"
# ports:
# - "8098:8090"
environment:
diff --git
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/AvailableMigrations.java
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/AvailableMigrations.java
index ce673b5e5..b389241b4 100644
---
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/AvailableMigrations.java
+++
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/AvailableMigrations.java
@@ -24,7 +24,6 @@ import
org.apache.streampipes.service.core.migrations.v070.CreateDefaultAssetMig
import
org.apache.streampipes.service.core.migrations.v070.CreateFileAssetTypeMigration;
import
org.apache.streampipes.service.core.migrations.v090.UpdateUsernameViewMigration;
import org.apache.streampipes.service.core.migrations.v093.AdapterMigration;
-import
org.apache.streampipes.service.core.migrations.v093.ConsulConfigMigration;
import
org.apache.streampipes.service.core.migrations.v093.StoreEmailTemplatesMigration;
import java.util.Arrays;
@@ -39,7 +38,6 @@ public class AvailableMigrations {
new CreateFileAssetTypeMigration(),
new UpdateUsernameViewMigration(),
new AdapterMigration(),
- new ConsulConfigMigration(),
new StoreEmailTemplatesMigration()
);
}
diff --git
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/ConsulConfigMigration.java
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/ConsulConfigMigration.java
deleted file mode 100644
index 53857b12c..000000000
---
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/ConsulConfigMigration.java
+++ /dev/null
@@ -1,83 +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.
- *
- */
-
-package org.apache.streampipes.service.core.migrations.v093;
-
-import org.apache.streampipes.config.backend.BackendConfig;
-import org.apache.streampipes.config.backend.BackendConfigKeys;
-import org.apache.streampipes.model.configuration.DefaultMessagingSettings;
-import org.apache.streampipes.model.configuration.SpCoreConfiguration;
-import org.apache.streampipes.model.configuration.SpCoreConfigurationStatus;
-import org.apache.streampipes.service.core.migrations.Migration;
-import org.apache.streampipes.storage.api.ISpCoreConfigurationStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
-import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
-
-public class ConsulConfigMigration implements Migration {
-
- private final ISpCoreConfigurationStorage storage;
-
- public ConsulConfigMigration() {
- this.storage =
StorageDispatcher.INSTANCE.getNoSqlStore().getSpCoreConfigurationStorage();
- }
-
- @Override
- public boolean shouldExecute() {
- return storage.getAll().isEmpty();
- }
-
- @Override
- public void executeMigration() {
- var currConf = BackendConfig.INSTANCE;
- var newConf = new SpCoreConfiguration();
-
- var pulsarUrlExists = SpServiceDiscovery
- .getSpConfig("backend")
- .exists(BackendConfigKeys.PULSAR_URL);
-
- var pulsarUrl = pulsarUrlExists ? currConf.getPulsarUrl() : new
DefaultMessagingSettings().make().getPulsarUrl();
-
- var messagingSettings = currConf.getMessagingSettings();
- newConf.setLocalAuthConfig(currConf.getLocalAuthConfig());
- newConf.setEmailConfig(currConf.getEmailConfig());
- newConf.setGeneralConfig(currConf.getGeneralConfig());
-
- messagingSettings.setJmsHost(currConf.getJmsHost());
- messagingSettings.setJmsPort(currConf.getJmsPort());
- messagingSettings.setMqttHost(currConf.getMqttHost());
- messagingSettings.setMqttPort(currConf.getMqttPort());
- messagingSettings.setNatsHost(currConf.getNatsHost());
- messagingSettings.setNatsPort(currConf.getNatsPort());
- messagingSettings.setKafkaHost(currConf.getKafkaHost());
- messagingSettings.setKafkaPort(currConf.getKafkaPort());
- messagingSettings.setPulsarUrl(pulsarUrl);
- messagingSettings.setZookeeperHost(currConf.getZookeeperHost());
- messagingSettings.setZookeeperPort(currConf.getZookeeperPort());
- newConf.setAssetDir(currConf.getAssetDir());
- newConf.setFilesDir(currConf.getFilesDir());
-
- newConf.setMessagingSettings(messagingSettings);
- newConf.setServiceStatus(SpCoreConfigurationStatus.MIGRATING);
- storage.createElement(newConf);
- }
-
- @Override
- public String getDescription() {
- return "Migrate Consul configurations to CouchDB";
- }
-}
diff --git a/streampipes-service-discovery-consul/pom.xml
b/streampipes-service-discovery-consul/pom.xml
deleted file mode 100644
index 4ce579694..000000000
--- a/streampipes-service-discovery-consul/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>streampipes-parent</artifactId>
- <groupId>org.apache.streampipes</groupId>
- <version>0.95.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>streampipes-service-discovery-consul</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-serializers-json</artifactId>
- <version>0.95.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-service-discovery-api</artifactId>
- <version>0.95.0-SNAPSHOT</version>
- </dependency>
-
- <!-- third-party dependencies -->
- <dependency>
- <groupId>com.ecwid.consul</groupId>
- <artifactId>consul-api</artifactId>
- <version>1.4.5</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/AbstractConsulService.java
b/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/AbstractConsulService.java
deleted file mode 100644
index d89b387ac..000000000
---
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/AbstractConsulService.java
+++ /dev/null
@@ -1,35 +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.
- *
- */
-package org.apache.streampipes.svcdiscovery.consul;
-
-import org.apache.streampipes.commons.environment.Environment;
-
-import com.ecwid.consul.v1.ConsulClient;
-
-public abstract class AbstractConsulService {
-
- private final Environment environment;
-
- public AbstractConsulService(Environment environment) {
- this.environment = environment;
- }
-
- public ConsulClient consulInstance() {
- return ConsulProvider.INSTANCE.getConsulInstance(environment);
- }
-}
diff --git
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulProvider.java
b/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulProvider.java
deleted file mode 100644
index 9148a69ac..000000000
---
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulProvider.java
+++ /dev/null
@@ -1,106 +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.
- *
- */
-package org.apache.streampipes.svcdiscovery.consul;
-
-import org.apache.streampipes.commons.constants.DefaultEnvValues;
-import org.apache.streampipes.commons.environment.Environment;
-
-import com.ecwid.consul.v1.ConsulClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.concurrent.TimeUnit;
-
-public enum ConsulProvider {
-
- INSTANCE;
-
- private static final Logger LOG =
LoggerFactory.getLogger(ConsulProvider.class);
- private static final int CHECK_INTERVAL = 1;
-
- private ConsulClient consulClient;
- private boolean initialized = false;
-
- ConsulProvider() {
- }
-
- public ConsulClient getConsulInstance(Environment environment) {
- if (!initialized) {
- createConsulInstance(environment);
- }
-
- return consulClient;
- }
-
- private void createConsulInstance(Environment environment) {
- var consulHost = getConsulHost(environment);
- var consulPort = getConsulPort(environment);
- var connected = false;
-
- LOG.info("Checking if consul is available on host {} and port {}",
consulHost, consulPort);
- connected = checkConsulAvailable(consulHost, consulPort);
-
- if (connected) {
- LOG.info("Successfully connected to Consul on host {}", consulHost);
- this.consulClient = new ConsulClient(consulHost, consulPort);
- this.initialized = true;
- } else {
- LOG.info("Retrying in {} second", CHECK_INTERVAL);
- try {
- TimeUnit.SECONDS.sleep(CHECK_INTERVAL);
- createConsulInstance(environment);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- private boolean checkConsulAvailable(String consulHost,
- int consulPort) {
- try {
- InetSocketAddress sa = new InetSocketAddress(consulHost, consulPort);
- Socket ss = new Socket();
- ss.connect(sa, 1000);
- ss.close();
-
- return true;
- } catch (IOException e) {
- LOG.info("Could not connect to Consul instance...");
- return false;
- }
- }
-
- private int getConsulPort(Environment environment) {
- return environment.getConsulPort().getValueOrDefault();
- }
-
- private String getConsulHost(Environment environment) {
- if (environment.getConsulLocation().exists()) {
- return environment.getConsulLocation().getValue();
- } else {
- if (environment.getSpDebug().getValueOrReturn(false)) {
- return DefaultEnvValues.LOCALHOST;
- } else {
- return environment.getConsulHost().getValueOrDefault();
- }
- }
- }
-}
diff --git
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulSpConfig.java
b/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulSpConfig.java
deleted file mode 100644
index 48b3a93ed..000000000
---
a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/ConsulSpConfig.java
+++ /dev/null
@@ -1,227 +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.
- *
- */
-
-package org.apache.streampipes.svcdiscovery.consul;
-
-import org.apache.streampipes.commons.environment.Environment;
-import org.apache.streampipes.model.extensions.configuration.ConfigItem;
-import org.apache.streampipes.model.extensions.configuration.ConfigItemUtils;
-import
org.apache.streampipes.model.extensions.configuration.ConfigurationScope;
-import org.apache.streampipes.serializers.json.JacksonSerializer;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-
-import com.ecwid.consul.v1.ConsulClient;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConsulSpConfig extends AbstractConsulService implements SpConfig {
-
- public static final String SERVICE_ROUTE_PREFIX = "sp/v1/";
- private static final Logger LOG =
LoggerFactory.getLogger(ConsulSpConfig.class);
- private static final String SLASH = "/";
- private final String serviceName;
- private final ConsulClient kvClient;
-
- public ConsulSpConfig(String serviceName,
- Environment environment) {
- super(environment);
- this.kvClient = consulInstance();
- this.serviceName = serviceName;
- }
-
- @Override
- public <T> void register(String key, T defaultValue, String description,
ConfigurationScope configurationScope) {
- register(key, String.valueOf(defaultValue),
ConfigItemUtils.getValueType(defaultValue), description,
- configurationScope, false);
- }
-
- @Override
- public void register(String key, boolean defaultValue, String description) {
- register(key, Boolean.toString(defaultValue), "xs:boolean", description,
- ConfigurationScope.CONTAINER_STARTUP_CONFIG, false);
- }
-
- @Override
- public void register(String key, int defaultValue, String description) {
- register(key, Integer.toString(defaultValue), "xs:integer", description,
- ConfigurationScope.CONTAINER_STARTUP_CONFIG, false);
- }
-
- @Override
- public void register(String key, double defaultValue, String description) {
- register(key, Double.toString(defaultValue), "xs:double", description,
ConfigurationScope.CONTAINER_STARTUP_CONFIG,
- false);
-
- }
-
- @Override
- public void register(String key, String defaultValue, String description) {
- register(key, defaultValue, "xs:string", description,
ConfigurationScope.CONTAINER_STARTUP_CONFIG, false);
- }
-
- @Override
- public void registerObject(String key, Object defaultValue, String
description) {
- var i = kvClient.getKVValue(addSn(key));
- if (i.getValue() == null) {
- kvClient.setKVValue(addSn(key), toJson(defaultValue));
- }
- }
-
- @Override
- public void registerPassword(String key, String defaultValue, String
description) {
- register(key, defaultValue, "xs:string", description,
ConfigurationScope.CONTAINER_STARTUP_CONFIG, true);
- }
-
- @Override
- public void register(ConfigItem configItem) {
- String key = addSn(configItem.getKey());
- var i = kvClient.getKVValue(key);
-
- if (i.getValue() == null) {
- // Set the value of environment variable as default
- String envVariable = System.getenv(configItem.getKey());
- if (envVariable != null) {
- configItem.setValue(envVariable);
- kvClient.setKVValue(key, toJson(configItem));
- } else {
- kvClient.setKVValue(key, toJson(configItem));
- }
- }
- }
-
- private void register(String key,
- String defaultValue,
- String valueType,
- String description,
- ConfigurationScope configurationScope,
- boolean isPassword) {
- ConfigItem configItem = ConfigItem.from(key, defaultValue, description,
valueType, configurationScope, isPassword);
- register(configItem);
- }
-
- @Override
- public boolean getBoolean(String key) {
- return Boolean.parseBoolean(getString(key));
- }
-
- @Override
- public int getInteger(String key) {
- return Integer.parseInt(getString(key));
- }
-
- @Override
- public double getDouble(String key) {
- return Double.parseDouble(getString(key));
- }
-
- @Override
- public String getString(String key) {
- return getConfigItem(key).getValue();
- }
-
- @Override
- public boolean exists(String key) {
- var os = kvClient.getKVValue(addSn(key)).getValue();
- return os != null;
- }
-
- @Override
- public <T> T getObject(String key, Class<T> clazz, T defaultValue) {
- var os = kvClient.getKVValue(addSn(key));
- if (os.getValue() != null) {
- try {
- return
JacksonSerializer.getObjectMapper().readValue(os.getValue().getDecodedValue(),
clazz);
- } catch (JsonProcessingException e) {
- LOG.info("Could not deserialize object", e);
- return defaultValue;
- }
- } else {
- return defaultValue;
- }
- }
-
- @Override
- public ConfigItem getConfigItem(String key) {
- var os = kvClient.getKVValue(addSn(key)).getValue();
- return fromJson(os.getDecodedValue());
- }
-
- @Override
- public void setBoolean(String key, Boolean value) {
- setString(key, value.toString());
- }
-
- @Override
- public void setInteger(String key, int value) {
- setString(key, String.valueOf(value));
- }
-
- @Override
- public void setDouble(String key, double value) {
- setString(key, String.valueOf(value));
- }
-
- @Override
- public void setString(String key, String value) {
- kvClient.setKVValue(addSn(key), value);
- }
-
- @Override
- public void setObject(String key, Object value) {
- kvClient.setKVValue(addSn(key), toJson(value));
- }
-
- private String addSn(String key) {
- return SERVICE_ROUTE_PREFIX + serviceName + SLASH + key;
- }
-
- private ConfigItem fromJson(String content) {
- try {
- return JacksonSerializer.getObjectMapper().readValue(content,
ConfigItem.class);
- } catch (Exception e) {
- // if old config is used, this is a fallback
- ConfigItem configItem = new ConfigItem();
- configItem.setValue(content);
- return configItem;
- }
- }
-
- private ConfigItem prepareConfigItem(String valueType,
- String description,
- ConfigurationScope configurationScope,
- boolean password) {
- ConfigItem configItem = new ConfigItem();
- configItem.setValueType(valueType);
- configItem.setDescription(description);
- configItem.setPassword(password);
- configItem.setConfigurationScope(configurationScope);
-
- return configItem;
- }
-
- private String toJson(Object object) {
- try {
- return JacksonSerializer.getObjectMapper().writeValueAsString(object);
- } catch (JsonProcessingException e) {
- LOG.info("Could not serialize object to JSON", e);
- return "";
- }
- }
-
-}
diff --git a/streampipes-service-discovery/pom.xml
b/streampipes-service-discovery/pom.xml
index 30be07a50..237ed71d8 100644
--- a/streampipes-service-discovery/pom.xml
+++ b/streampipes-service-discovery/pom.xml
@@ -38,11 +38,6 @@
<artifactId>streampipes-service-discovery-api</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-service-discovery-consul</artifactId>
- <version>0.95.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-storage-management</artifactId>
diff --git
a/streampipes-service-discovery/src/main/java/org/apache/streampipes/svcdiscovery/SpServiceDiscovery.java
b/streampipes-service-discovery/src/main/java/org/apache/streampipes/svcdiscovery/SpServiceDiscovery.java
index e46169a04..ff2d96aa0 100644
---
a/streampipes-service-discovery/src/main/java/org/apache/streampipes/svcdiscovery/SpServiceDiscovery.java
+++
b/streampipes-service-discovery/src/main/java/org/apache/streampipes/svcdiscovery/SpServiceDiscovery.java
@@ -17,11 +17,7 @@
*/
package org.apache.streampipes.svcdiscovery;
-import org.apache.streampipes.commons.environment.Environment;
-import org.apache.streampipes.commons.environment.Environments;
import org.apache.streampipes.svcdiscovery.api.ISpServiceDiscovery;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.svcdiscovery.consul.ConsulSpConfig;
public class SpServiceDiscovery {
@@ -29,17 +25,4 @@ public class SpServiceDiscovery {
return new SpServiceDiscoveryCore();
}
- public static ISpServiceDiscovery getServiceDiscovery(Environment
environment) {
- return new SpServiceDiscoveryCore();
- }
-
- public static SpConfig getSpConfig(String serviceGroup) {
- return getSpConfig(serviceGroup, Environments.getEnvironment());
- }
-
- public static SpConfig getSpConfig(String serviceGroup,
- Environment environment) {
- return new ConsulSpConfig(serviceGroup, environment);
- }
-
}
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/.env
b/ui/cypress/tests/experimental/testJvmArchetype/.env
index 0330973bc..0ad93efe8 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/.env
+++ b/ui/cypress/tests/experimental/testJvmArchetype/.env
@@ -16,5 +16,4 @@
SP_VERSION=0.70.0
SP_DOCKER_REGISTRY=apachestreampipes
SP_SUBNET=172.31.0.0/16
-SP_CONSUL_CONTAINER_IP=172.31.0.9
COMPOSE_PROJECT_NAME=streampipes
diff --git
a/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile
b/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile
index abe2a24ae..3d6915677 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile
+++ b/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile
@@ -16,8 +16,6 @@
ARG BASE_IMAGE=arm32v7/openjdk:11-jre-slim
FROM $BASE_IMAGE
-ENV CONSUL_LOCATION consul
-
EXPOSE 8090
COPY ../../../../../../../delme/automated-test/target/automated-test.jar
/streampipes-extensions-service.jar
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/backend/.env
b/ui/cypress/tests/experimental/testJvmArchetype/backend/.env
index 0330973bc..0ad93efe8 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/backend/.env
+++ b/ui/cypress/tests/experimental/testJvmArchetype/backend/.env
@@ -16,5 +16,4 @@
SP_VERSION=0.70.0
SP_DOCKER_REGISTRY=apachestreampipes
SP_SUBNET=172.31.0.0/16
-SP_CONSUL_CONTAINER_IP=172.31.0.9
COMPOSE_PROJECT_NAME=streampipes
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
index 0c9653baa..41ea68cc5 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
+++ b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
@@ -29,7 +29,6 @@ services:
depends_on:
- couchdb
- activemq
- - consul
logging: *default-logging
restart: unless-stopped
networks:
@@ -43,31 +42,6 @@ services:
networks:
spnet:
- consul:
- image: fogsyio/consul:1.9.6
- environment:
- - 'CONSUL_LOCAL_CONFIG={"disable_update_check": true}'
- - 'CONSUL_BIND_INTERFACE=eth0'
- - 'CONSUL_HTTP_ADDR=0.0.0.0'
- entrypoint:
- - consul
- - agent
- - -server
- - -bootstrap-expect=1
- - -data-dir=/consul/data
- - -node=consul-one
- - -bind={{ GetInterfaceIP "eth0" }}
- - -client=0.0.0.0
- - -enable-script-checks=true
- - -ui
- volumes:
- - consul:/consul/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
- ipv4_address: ${SP_CONSUL_CONTAINER_IP}
-
couchdb:
image: couchdb:2.3.1
volumes:
@@ -125,8 +99,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: '${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}'
- depends_on:
- - consul
volumes:
- files:/spImages
logging: *default-logging
@@ -144,7 +116,6 @@ services:
spnet:
volumes:
- consul:
connect:
couchdb:
kafka:
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.html
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.html
index f13afbfa0..984cd5c92 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.html
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.html
@@ -71,7 +71,7 @@
<button
mat-icon-button
color="accent"
- (click)="getConsulServices()"
+ (click)="getConfigurationServices()"
matTooltip="Refresh"
>
<mat-icon>refresh</mat-icon>
@@ -100,15 +100,17 @@
[attr.colspan]="displayedColumns.length"
>
<div
- class="consul-configuration-detail"
+ class="service-configuration-detail"
[@detailExpand]="
element === expandedElement ? 'expanded' : 'collapsed'
"
>
<div fxFlex="100">
<sp-service-configs
- [consulService]="element"
- (updateConsulService)="updateConsulService($event)"
+ [serviceConfiguration]="element"
+ (updateServiceConfiguration)="
+ updateConfigurationService($event)
+ "
></sp-service-configs>
</div>
</div>
@@ -119,15 +121,15 @@
<tr
mat-row
*matRowDef="let element; columns: displayedColumns"
- class="consul-configuration-row"
- [class.consul-configuration-row-expanded]="
+ class="service-configuration-row"
+ [class.service-configuration-row-expanded]="
expandedElement === element
"
></tr>
<tr
mat-row
*matRowDef="let row; columns: ['expandedDetail']"
- class="consul-configuration-detail-row"
+ class="service-configuration-detail-row"
></tr>
</table>
</div>
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.scss
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.scss
index 5fc34db9d..04eefb2b7 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.scss
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.scss
@@ -20,15 +20,15 @@ table {
width: 100%;
}
-tr.consul-configuration-detail-row {
+tr.service-configuration-detail-row {
height: 0;
}
-.consul-configuration-row td {
+.service-configuration-row td {
border-bottom-width: 0;
}
-.consul-configuration-detail {
+.service-configuration-detail {
overflow: hidden;
display: flex;
}
@@ -36,6 +36,6 @@ tr.consul-configuration-detail-row {
.mat-table {
}
-.consul-service {
+.service {
padding: 5px;
}
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.ts
index 96855639b..88600380e 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/extensions-service-configuration.component.ts
@@ -53,17 +53,17 @@ export class SpExtensionsServiceConfigurationComponent {
dataSource = new MatTableDataSource<SpServiceConfiguration>();
expandedElement: any;
- consulServices: SpServiceConfiguration[];
+ serviceConfiguration: SpServiceConfiguration[];
constructor(private configurationService: ConfigurationService) {
- this.getConsulServices();
+ this.getConfigurationServices();
}
- getConsulServices(): void {
+ getConfigurationServices(): void {
this.configurationService.getExtensionsServiceConfigs().subscribe(
response => {
const sortedServices = this.sort(response);
- this.consulServices = sortedServices;
+ this.serviceConfiguration = sortedServices;
this.dataSource.data = sortedServices;
},
error => {
@@ -72,12 +72,14 @@ export class SpExtensionsServiceConfigurationComponent {
);
}
- sort(consulServices: SpServiceConfiguration[]): SpServiceConfiguration[] {
- if (!consulServices || consulServices.length === 0) {
+ sort(
+ serviceConfiguration: SpServiceConfiguration[],
+ ): SpServiceConfiguration[] {
+ if (!serviceConfiguration || serviceConfiguration.length === 0) {
return null;
}
- consulServices.sort(
+ serviceConfiguration.sort(
(a: SpServiceConfiguration, b: SpServiceConfiguration) => {
if (a.serviceGroup < b.serviceGroup) {
return -1;
@@ -88,15 +90,15 @@ export class SpExtensionsServiceConfigurationComponent {
}
},
);
- return consulServices;
+ return serviceConfiguration;
}
- updateConsulService(config: SpServiceConfiguration): void {
+ updateConfigurationService(config: SpServiceConfiguration): void {
this.configurationService
.updateExtensionsServiceConfigs(config)
.subscribe(
() => {
- this.getConsulServices();
+ this.getConfigurationServices();
},
error => {
console.error(error);
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-boolean/service-configs-boolean.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-boolean/service-configs-boolean.component.ts
index cf69fa2e3..dd921dc94 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-boolean/service-configs-boolean.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-boolean/service-configs-boolean.component.ts
@@ -21,7 +21,7 @@ import { ConfigurationService } from
'../../../../shared/configuration.service';
import { ConfigItem } from '@streampipes/platform-services';
@Component({
- selector: 'sp-consul-configs-boolean',
+ selector: 'sp-service-configs-boolean',
templateUrl: './service-configs-boolean.component.html',
providers: [ConfigurationService],
})
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-number/service-configs-number.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-number/service-configs-number.component.ts
index ecf3b139b..12ddb9021 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-number/service-configs-number.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-number/service-configs-number.component.ts
@@ -21,7 +21,7 @@ import { ConfigurationService } from
'../../../../shared/configuration.service';
import { ConfigItem } from '@streampipes/platform-services';
@Component({
- selector: 'sp-consul-configs-number',
+ selector: 'sp-service-configs-number',
templateUrl: './service-configs-number.component.html',
})
export class ServiceConfigsNumberComponent {
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.spec.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.spec.ts
index b3a72508b..b21c96b01 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.spec.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.spec.ts
@@ -33,7 +33,7 @@ import { MatInputModule } from '@angular/material/input';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatTooltipModule } from '@angular/material/tooltip';
-describe('ConsulConfigsPasswordComponent', () => {
+describe('ServiceConfigsPasswordComponent', () => {
let fixture: ComponentFixture<ServiceConfigsPasswordComponent>;
let configurationServiceStub: Partial<ConfigurationService>;
@@ -44,8 +44,8 @@ describe('ConsulConfigsPasswordComponent', () => {
beforeEach(waitForAsync(() => {
configurationServiceStub = {
- adjustConfigurationKey(consulKey) {
- let str1 = consulKey.replace(/SP/g, '');
+ adjustConfigurationKey(key) {
+ let str1 = key.replace(/SP/g, '');
str1 = str1.replace(/_/g, ' ');
if (str1.startsWith(' ')) {
str1 = str1.slice(1, str1.length);
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.ts
index cccf0d7e7..cba954435 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-password/service-configs-password.component.ts
@@ -23,7 +23,7 @@ import { ConfigItem } from '@streampipes/platform-services';
const hiddenPasswordString = '*****';
@Component({
- selector: 'sp-consul-configs-password',
+ selector: 'sp-service-configs-password',
templateUrl: './service-configs-password.component.html',
styleUrls: ['./service-configs-password.component.css'],
providers: [ConfigurationService],
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-text/service-configs-text.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-text/service-configs-text.component.ts
index 20c3a2082..9491b785b 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-text/service-configs-text.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs-text/service-configs-text.component.ts
@@ -21,7 +21,7 @@ import { ConfigurationService } from
'../../../../shared/configuration.service';
import { ConfigItem } from '@streampipes/platform-services';
@Component({
- selector: 'sp-consul-configs-text',
+ selector: 'sp-service-configs-text',
templateUrl: './service-configs-text.component.html',
providers: [ConfigurationService],
})
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.html
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.html
index 9f6e1734f..c379b1bd2 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.html
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.html
@@ -24,17 +24,17 @@
<form (ngSubmit)="updateConfiguration()" fxFlex="100" fxLayout="column">
<div
fxLayout="column"
- *ngFor="let configuration of consulService.configs"
+ *ngFor="let configuration of serviceConfiguration.configs"
>
<h5>{{ configuration.key }}</h5>
- <sp-consul-configs-password
+ <sp-service-configs-password
fxFlex="100"
*ngIf="configuration.isPassword"
[configuration]="configuration"
>
- </sp-consul-configs-password>
+ </sp-service-configs-password>
- <sp-consul-configs-text
+ <sp-service-configs-text
fxFlex="100"
*ngIf="
configuration.valueType === service.XS_STRING &&
@@ -42,9 +42,9 @@
"
[configuration]="configuration"
>
- </sp-consul-configs-text>
+ </sp-service-configs-text>
- <sp-consul-configs-number
+ <sp-service-configs-number
fxFlex="100"
*ngIf="
configuration.valueType === service.XS_INTEGER ||
@@ -52,14 +52,14 @@
"
[configuration]="configuration"
>
- </sp-consul-configs-number>
+ </sp-service-configs-number>
- <sp-consul-configs-boolean
+ <sp-service-configs-boolean
fxFlex="100"
*ngIf="configuration.valueType === service.XS_BOOLEAN"
[configuration]="configuration"
>
- </sp-consul-configs-boolean>
+ </sp-service-configs-boolean>
</div>
<div fxLayoutAlign="end center">
<button
diff --git
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.ts
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.ts
index bc1cdb7e6..0de61e1af 100644
---
a/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.ts
+++
b/ui/src/app/configuration/extensions-service-management/extensions-service-configuration/service-configs/service-configs.component.ts
@@ -26,13 +26,13 @@ import { SpServiceConfiguration } from
'@streampipes/platform-services';
providers: [XsService],
})
export class ServiceConfigsComponent {
- @Input() consulService: SpServiceConfiguration;
- @Output() updateConsulService: EventEmitter<SpServiceConfiguration> =
+ @Input() serviceConfiguration: SpServiceConfiguration;
+ @Output() updateServiceConfiguration: EventEmitter<SpServiceConfiguration>
=
new EventEmitter<SpServiceConfiguration>();
constructor(private service: XsService) {}
updateConfiguration(): void {
- this.updateConsulService.emit(this.consulService);
+ this.updateServiceConfiguration.emit(this.serviceConfiguration);
}
}
diff --git
a/ui/src/app/configuration/extensions-service-management/registered-extensions-services/registered-extensions-services.component.html
b/ui/src/app/configuration/extensions-service-management/registered-extensions-services/registered-extensions-services.component.html
index c0a1e74b5..a12796362 100644
---
a/ui/src/app/configuration/extensions-service-management/registered-extensions-services/registered-extensions-services.component.html
+++
b/ui/src/app/configuration/extensions-service-management/registered-extensions-services/registered-extensions-services.component.html
@@ -128,7 +128,7 @@
<tr
mat-row
*matRowDef="let element; columns: displayedColumns"
- class="consul-configuration-row"
+ class="service-configuration-row"
></tr>
</table>
</div>
diff --git a/ui/src/app/configuration/shared/configuration.service.ts
b/ui/src/app/configuration/shared/configuration.service.ts
index 2e71d8037..65425309e 100644
--- a/ui/src/app/configuration/shared/configuration.service.ts
+++ b/ui/src/app/configuration/shared/configuration.service.ts
@@ -100,13 +100,8 @@ export class ConfigurationService {
);
}
- adjustConfigurationKey(consulKey) {
- const removedKey = consulKey.substr(
- consulKey.lastIndexOf('/') + 1,
- consulKey.length,
- );
-
- // console.log(removedKey);
+ adjustConfigurationKey(key) {
+ const removedKey = key.substr(key.lastIndexOf('/') + 1, key.length);
let str1 = removedKey.replace(/SP/g, '');
str1 = str1.replace(/_/g, ' ');
