Merge branch 'release-1.158.0'

telstra · May 16, 2024 · daf0ebd · daf0ebd
2 parents dc8d90c + f65fc5d
commit daf0ebd
Show file tree

Hide file tree

Showing 114 changed files with 2,769 additions and 1,464 deletions.
diff --git a/.env.example b/.env.example
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
-## v1.157.0 (15/04/2024)
+
+## v1.158.0 (23/04/2024)
+
+### Features:
+-  [#5353](https://github.com/telstra/open-kilda/pull/5353) 5208 add ha flow support into server42
+
+
+### Improvements:
+-  [#5481](https://github.com/telstra/open-kilda/pull/5481) [TEST]: 5208: Server42 RTT: HaFlow [**tests**]
+-  [#5522](https://github.com/telstra/open-kilda/pull/5522) remove opentsdb and hbase (Issue: [#4925](https://github.com/telstra/open-kilda/issues/4925))
+
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.157.0...v1.158.0).
+
+---
+
+## v1.157.0 (17/04/2024)
 
 ### Bug Fixes:
 -  [#5632](https://github.com/telstra/open-kilda/pull/5632) GUI hotfix.  [**gui**]

diff --git a/confd/templates/base-storm-topology/topology.properties.tmpl b/confd/templates/base-storm-topology/topology.properties.tmpl
@@ -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}}

diff --git a/confd/templates/docker-compose/docker-compose.tmpl b/confd/templates/docker-compose/docker-compose.tmpl
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -780,7 +730,7 @@ services:
       context: docker
       dockerfile: server42/Dockerfile
     image: kilda/server42
-    command: java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar server42-control-storm-stub.jar
+    command: /app/wait-for-it.sh -t 120 -h zookeeper.pendev -p 2181 -- java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar server42-control-storm-stub.jar
     ports:
       - "9001:9001"
     depends_on:
@@ -801,13 +751,14 @@ services:
 {{if not (exists "/no_server42_server")}}
 networks:
   server42_to_lab:
+    driver_opts:
+        com.docker.network.bridge.name: server42_to_lab
 {{end}}
 
 volumes:
   zookeeper_data:
   kafka_data:
   app_server_data:
-  hbase_data:
   odb1_data:
   sql_data:
 {{if not (exists "/single_orientdb")}}  odb2_data:

diff --git a/confd/templates/makefile/makefile.tmpl b/confd/templates/makefile/makefile.tmpl
@@ -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}}

diff --git a/confd/templates/opentsdb-topology/opentsdb-topology.tmpl b/confd/templates/opentsdb-topology/opentsdb-topology.tmpl
@@ -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" }}

diff --git a/confd/vars/main.yaml b/confd/vars/main.yaml
@@ -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"
@@ -291,16 +289,22 @@ kilda_server42_control_switch_to_vlan_1000: "1000=00:00:d7:61:46:7b:46:69,00:00:
 kilda_server42_control_switch_to_vlan_2000: "2000=00:00:55:dd:06:49:d9:61,00:00:84:1e:39:d5:dd:40"
 kilda_server42_control_switch_to_vlan_1002: "1002=00:00:00:00:00:00:00:02"
 kilda_server42_control_switch_to_vlan_1003: "1003=00:00:00:00:00:00:00:03"
+kilda_server42_control_switch_to_vlan_1007: "1007=00:00:00:00:00:00:00:07"
 kilda_server42_control_switch_to_vlan_1102: "1102=00:00:00:00:00:01:00:02"
 kilda_server42_control_switch_to_vlan_1103: "1103=00:00:00:00:00:01:00:03"
+kilda_server42_control_switch_to_vlan_1107: "1107=00:00:00:00:00:01:00:07"
 kilda_server42_control_switch_to_vlan_1202: "1202=00:00:00:00:00:02:00:02"
 kilda_server42_control_switch_to_vlan_1203: "1203=00:00:00:00:00:02:00:03"
+kilda_server42_control_switch_to_vlan_1207: "1207=00:00:00:00:00:02:00:07"
 kilda_server42_control_switch_to_vlan_1302: "1302=00:00:00:00:00:03:00:02"
 kilda_server42_control_switch_to_vlan_1303: "1303=00:00:00:00:00:03:00:03"
+kilda_server42_control_switch_to_vlan_1307: "1307=00:00:00:00:00:03:00:07"
 kilda_server42_control_switch_to_vlan_1402: "1402=00:00:00:00:00:04:00:02"
 kilda_server42_control_switch_to_vlan_1403: "1403=00:00:00:00:00:04:00:03"
+kilda_server42_control_switch_to_vlan_1407: "1407=00:00:00:00:00:04:00:07"
 kilda_server42_control_switch_to_vlan_1502: "1502=00:00:00:00:00:05:00:02"
 kilda_server42_control_switch_to_vlan_1503: "1503=00:00:00:00:00:05:00:03"
+kilda_server42_control_switch_to_vlan_1507: "1507=00:00:00:00:00:05:00:07"
 
 kilda_server42_control_kafka_group_id: "server42-control"
 kilda_server42_control_zeromq_connection_host: "tcp://server42-server.pendev:5555"

diff --git a/docker/hbase/Dockerfile b/docker/hbase/Dockerfile