From 39dc006f67b11fd40f43b7929eb71994677ebee2 Mon Sep 17 00:00:00 2001 From: nk-hystax <128669932+nk-hystax@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:10:45 +0300 Subject: [PATCH 1/2] OS-7942. Updated mysql-connector-python version --- auth/requirements.txt | 2 +- docker_images/cleanmongodb/requirements.txt | 2 +- docker_images/configurator/requirements.txt | 2 +- docker_images/failed_imports_dataset_generator/requirements.txt | 2 +- docker_images/users_dataset_generator/requirements.txt | 2 +- herald/requirements.txt | 2 +- katara/katara_service/requirements.txt | 2 +- rest_api/requirements.txt | 2 +- slacker/requirements.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/auth/requirements.txt b/auth/requirements.txt index 2c6ebfe73..cfe873460 100644 --- a/auth/requirements.txt +++ b/auth/requirements.txt @@ -1,5 +1,5 @@ SQLAlchemy==1.3.24 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 tornado==6.4.1 alembic==1.13.1 pymacaroons==0.9.2 diff --git a/docker_images/cleanmongodb/requirements.txt b/docker_images/cleanmongodb/requirements.txt index 543f76187..237c28734 100644 --- a/docker_images/cleanmongodb/requirements.txt +++ b/docker_images/cleanmongodb/requirements.txt @@ -1,4 +1,4 @@ -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 SQLAlchemy==1.3.24 pymongo==4.6.3 # OptScale packages diff --git a/docker_images/configurator/requirements.txt b/docker_images/configurator/requirements.txt index 00bc762fa..0a915c08b 100644 --- a/docker_images/configurator/requirements.txt +++ b/docker_images/configurator/requirements.txt @@ -1,4 +1,4 @@ -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 pyyaml==6.0.1 SQLAlchemy==1.3.24 pymongo==4.6.3 diff --git a/docker_images/failed_imports_dataset_generator/requirements.txt b/docker_images/failed_imports_dataset_generator/requirements.txt index 06d17c4b6..8d45ef5b8 100644 --- a/docker_images/failed_imports_dataset_generator/requirements.txt +++ b/docker_images/failed_imports_dataset_generator/requirements.txt @@ -1,5 +1,5 @@ boto3==1.34.7 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 SQLAlchemy==1.3.24 # OptScale packages diff --git a/docker_images/users_dataset_generator/requirements.txt b/docker_images/users_dataset_generator/requirements.txt index fa99e65e7..7e1359b2b 100644 --- a/docker_images/users_dataset_generator/requirements.txt +++ b/docker_images/users_dataset_generator/requirements.txt @@ -1,6 +1,6 @@ boto3==1.34.7 clickhouse-driver==0.2.6 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 pymongo==4.6.3 SQLAlchemy==1.3.24 diff --git a/herald/requirements.txt b/herald/requirements.txt index 1efed9d98..d3677a2bc 100644 --- a/herald/requirements.txt +++ b/herald/requirements.txt @@ -4,7 +4,7 @@ requests==2.32.3 netaddr==0.8.0 alembic==1.13.1 pika==1.1.0 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 pystache==0.6.0 boto3==1.34.7 diff --git a/katara/katara_service/requirements.txt b/katara/katara_service/requirements.txt index 0079abda2..c8950b6f0 100644 --- a/katara/katara_service/requirements.txt +++ b/katara/katara_service/requirements.txt @@ -1,5 +1,5 @@ SQLAlchemy==1.3.24 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 tornado==6.4.1 alembic==1.13.1 croniter==0.3.15 diff --git a/rest_api/requirements.txt b/rest_api/requirements.txt index 75a15094a..42cac47cf 100644 --- a/rest_api/requirements.txt +++ b/rest_api/requirements.txt @@ -1,5 +1,5 @@ SQLAlchemy==1.3.24 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 tornado==6.4.1 alembic==1.13.1 cryptography==43.0.1 diff --git a/slacker/requirements.txt b/slacker/requirements.txt index ceba3270c..428c1bf2d 100644 --- a/slacker/requirements.txt +++ b/slacker/requirements.txt @@ -3,7 +3,7 @@ slack_bolt==1.18.1 slack_sdk==3.27.1 sqlalchemy==1.4.52 alembic==1.13.1 -mysql-connector-python==8.1.0 +mysql-connector-python==9.1.0 apispec==6.3.1 pyyaml==6.0.1 currency-symbols==2.0.3 From 96cceee631ed8993b9e0e57db6159307872e10b0 Mon Sep 17 00:00:00 2001 From: nk-hystax <128669932+nk-hystax@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:11:59 +0300 Subject: [PATCH 2/2] OS-4303. Removed optscale_metric_enabled etcd key --- docker_images/configurator/configurator.py | 10 ++++++---- optscale-deploy/optscale/templates/tpl/_config.tpl | 1 - optscale-deploy/optscale/values.yaml | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker_images/configurator/configurator.py b/docker_images/configurator/configurator.py index 6491f46dc..9ed6c262d 100644 --- a/docker_images/configurator/configurator.py +++ b/docker_images/configurator/configurator.py @@ -17,6 +17,7 @@ LOG = logging.getLogger(__name__) +ETCD_KEYS_TO_DELETE = ['/logstash_host', '/optscale_meter_enabled'] RETRY_ARGS = dict(stop_max_attempt_number=300, wait_fixed=500) RABBIT_PRECONDIFITON_FAILED_CODE = 406 @@ -93,10 +94,11 @@ def pre_configure(self): self.commit_config() return LOG.info("Writing default etcd keys") - try: - self.etcd_cl.delete('/logstash_host') - except etcd.EtcdKeyNotFound: - pass + for key in ETCD_KEYS_TO_DELETE: + try: + self.etcd_cl.delete(key) + except etcd.EtcdKeyNotFound: + pass self.etcd_cl.write_branch('/', config, overwrite_lists=True) LOG.info("Configuring database server") self.configure_databases() diff --git a/optscale-deploy/optscale/templates/tpl/_config.tpl b/optscale-deploy/optscale/templates/tpl/_config.tpl index c752a0b82..4597fcee6 100644 --- a/optscale-deploy/optscale/templates/tpl/_config.tpl +++ b/optscale-deploy/optscale/templates/tpl/_config.tpl @@ -219,7 +219,6 @@ etcd: aws_secret_access_key: {{ .Values.users_dataset_generator.aws_secret_access_key }} service_credentials: {{ toYaml .Values.service_credentials | indent 4 }} - optscale_meter_enabled: {{ .Values.optscale_meter_enabled }} {{ if .Values.fake_cad_config }} fake_cad: config: diff --git a/optscale-deploy/optscale/values.yaml b/optscale-deploy/optscale/values.yaml index aeea3c7b5..cd69bbe95 100644 --- a/optscale-deploy/optscale/values.yaml +++ b/optscale-deploy/optscale/values.yaml @@ -1057,8 +1057,6 @@ bumi_worker: task_timeout: 3600 run_period: 10800 -optscale_meter_enabled: 0 - fake_cad_enabled: 0 #filled from smtp overlay - smtp settings for testing