Skip to content

Commit

Permalink
Merge pull request #5522 from telstra/remove_opentsdb_and_hbase
Browse files Browse the repository at this point in the history
remove opentsdb and hbase
  • Loading branch information
pablomuri authored Apr 22, 2024
2 parents fa95ba1 + c5b7453 commit f33cc85
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 663 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LAB_API_MEM_LIMIT=512m
NEO4J_MEM_LIMIT=2g
ZOOKEEPER_MEM_LIMIT=2g
KAFKA_MEM_LIMIT=2g
HBASE_MEM_LIMIT=2g
FL_1_MEM_LIMIT=2g
FL_2_MEM_LIMIT=2g
FL_STATS_MEM_LIMIT=2g
Expand Down
5 changes: 0 additions & 5 deletions confd/templates/base-storm-topology/topology.properties.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ zookeeper.reconnect_delay={{ getv "/kilda_zookeeper_reconnect_delay_ms"}}
persistence.implementation.default = {{ getv "/kilda_persistence_default_implementation" }}
persistence.implementation.area.history = {{ getv "/kilda_persistence_history_implementation" }}

{{if getv "/kilda_opentsdb_hosts"}}
opentsdb.target.opentsdb = http://{{ getv "/kilda_opentsdb_hosts" }}:{{ getv "/kilda_opentsdb_port" }}
{{else}}
opentsdb.target.opentsdb =
{{end}}
{{if getv "/kilda_victoriametrics_host"}}
opentsdb.target.victoriametrics = http://{{ getv "/kilda_victoriametrics_host" }}:{{ getv "/kilda_victoriametrics_write_port" }}{{ getv "/kilda_victoriametrics_path" }}
{{else}}
Expand Down
53 changes: 1 addition & 52 deletions confd/templates/docker-compose/docker-compose.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -271,27 +271,6 @@ services:
environment:
- WFM_TOPOLOGIES_MODE

hbase:
container_name: hbase
hostname: hbase.pendev
image: kilda/hbase:latest
command: /opt/hbase/bin/start-hbase
volumes:
- hbase_data:/data/hbase
depends_on:
zookeeper:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "jps | grep --silent HMaster"]
interval: 30s
timeout: 10s
retries: 3
networks:
default:
aliases:
- hbase.pendev
mem_limit: ${HBASE_MEM_LIMIT:-2g}

storm-nimbus:
container_name: storm-nimbus
hostname: nimbus.pendev
Expand All @@ -300,10 +279,6 @@ services:
depends_on:
zookeeper:
condition: service_healthy
{{if not (exists "/no_opentsdb")}}
opentsdb:
condition: service_started
{{end}}
{{if not (exists "/no_victoriametrics")}}
victoriametrics:
condition: service_started
Expand Down Expand Up @@ -358,10 +333,6 @@ services:
logstash:
condition: service_healthy
{{end}}
{{if not (exists "/no_opentsdb")}}
opentsdb:
condition: service_started
{{end}}
{{if not (exists "/no_victoriametrics")}}
victoriametrics:
condition: service_started
Expand Down Expand Up @@ -558,25 +529,6 @@ services:
- grpc-speaker.pendev
mem_limit: ${GRPC_MEM_LIMIT:-2g}
{{end}}
{{if not (exists "/no_opentsdb")}}
opentsdb:
container_name: opentsdb
hostname: opentsdb.pendev
image: kilda/opentsdb:latest
command: /app/wait-for-it.sh -t 120 -h hbase.pendev -p 9090 -- /app/start-opentsdb
depends_on:
zookeeper:
condition: service_healthy
hbase:
condition: service_healthy
ports:
- "4242:4242"
networks:
default:
aliases:
- opentsdb.pendev
mem_limit: ${OTSDB_MEM_LIMIT:-2g}
{{end}}
{{if not (exists "/no_victoriametrics")}}
victoriametrics:
container_name: victoriametrics
Expand Down Expand Up @@ -606,9 +558,7 @@ services:
depends_on:
northbound:
condition: service_started
{{if not (exists "/no_opentsdb")}} opentsdb:
condition: service_started
{{end}}{{if not (exists "/no_victoriametrics")}} victoriametrics:
{{if not (exists "/no_victoriametrics")}} victoriametrics:
condition: service_started
{{end}} networks:
default:
Expand Down Expand Up @@ -809,7 +759,6 @@ volumes:
zookeeper_data:
kafka_data:
app_server_data:
hbase_data:
odb1_data:
sql_data:
{{if not (exists "/single_orientdb")}} odb2_data:
Expand Down
4 changes: 1 addition & 3 deletions confd/templates/makefile/makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ build-base: {{if not (exists "/no_grpc_stub")}}build-grpc-stub {{end}}build-lock
docker build -t kilda/base-ubuntu:latest docker/base/kilda-base-ubuntu/
docker build -t kilda/zookeeper:latest docker/zookeeper
docker build -t kilda/kafka:latest docker/kafka
docker build -t kilda/hbase:latest docker/hbase
docker build -t kilda/storm:latest docker/storm
{{if not (exists "/no_opentsdb")}} docker build -t kilda/opentsdb:latest docker/opentsdb
{{end}}{{if not (exists "/no_logstash")}} docker build -t kilda/logstash:latest docker/logstash
{{if not (exists "/no_logstash")}} docker build -t kilda/logstash:latest docker/logstash
{{end}}{{if not (exists "/no_elasticsearch")}} docker build -t kilda/elasticsearch:latest docker/elasticsearch
{{end}} $(MAKE) -C src-python/lab-service find-python-requirements
docker build -t kilda/base-lab-service:latest docker/base/kilda-base-lab-service/ {{if (exists "/ovs_vxlan")}} --build-arg=OVS_VERSION=kilda.v2.15.1.3{{end}}
Expand Down
10 changes: 0 additions & 10 deletions confd/templates/opentsdb-topology/opentsdb-topology.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,18 @@ config:

# spout definitions
spouts:
- id: "input.opentsdb"
parallelism: {{ getv "/kilda_opentsdb_num_spouts" }}
- id: "input.victoriametrics"
parallelism: {{ getv "/kilda_opentsdb_num_spouts" }}
- id: "zookeeper.spout"
parallelism: 1

# bolt definitions
bolts:
- id: "DatapointParseBolt.opentsdb"
parallelism: {{ getv "/kilda_opentsdb_num_datapointparserbolt" }}
numTasks: {{ getv "/kilda_opentsdb_workers_datapointparserbolt" }}
- id: "DatapointParseBolt.victoriametrics"
parallelism: {{ getv "/kilda_opentsdb_num_datapointparserbolt" }}
numTasks: {{ getv "/kilda_opentsdb_workers_datapointparserbolt" }}
- id: "OpenTsdbFilterBolt.opentsdb"
parallelism: {{ getv "/kilda_opentsdb_num_opentsdbfilterbolt" }}
- id: "OpenTsdbFilterBolt.victoriametrics"
parallelism: {{ getv "/kilda_opentsdb_num_opentsdbfilterbolt" }}
- id: "output.opentsdb"
parallelism: {{ getv "/kilda_opentsdb_num_output_bolt" }}
numTasks: {{ getv "/kilda_opentsdb_tasks_output_bolt" }}
- id: "output.victoriametrics"
parallelism: {{ getv "/kilda_opentsdb_num_output_bolt" }}
numTasks: {{ getv "/kilda_opentsdb_tasks_output_bolt" }}
Expand Down
2 changes: 0 additions & 2 deletions confd/vars/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ kilda_zookeeper_state_root: "kilda"
kilda_zookeeper_reconnect_delay_ms: 100
kilda_zookeeper_reconnect_delay_ms_server42: 10000
kilda_zookeeper_reconnect_delay_ms_speaker: 1000
kilda_opentsdb_hosts: "opentsdb.pendev"
kilda_opentsdb_port: "4242"
kilda_victoriametrics_host: "victoriametrics.pendev"
kilda_victoriametrics_write_port: "4242"
kilda_victoriametrics_read_port: "8428"
Expand Down
35 changes: 0 additions & 35 deletions docker/hbase/Dockerfile

This file was deleted.

137 changes: 0 additions & 137 deletions docker/hbase/hbase-conf/hbase-env.sh

This file was deleted.

Loading

0 comments on commit f33cc85

Please sign in to comment.