From 50560c5f839d1b9b63ac9f5fe07cba09b8cbf7ee Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 15 May 2025 11:19:52 +0200 Subject: [PATCH] feat: port monitoring_status to 18.0 --- .github/workflows/test.yml | 2 ++ cloud_platform/models/cloud_platform.py | 3 +++ monitoring_status/__manifest__.py | 4 ++-- monitoring_status/controllers/main.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 269fdaa..d0c78a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,6 +61,8 @@ jobs: env: INCLUDE: "${{ matrix.include }}" EXCLUDE: "${{ matrix.exclude }}" + # Disable Redis check + ODOO_CLOUD_PLATFORM_UNSAFE: 1 steps: - uses: actions/checkout@v3 with: diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py index 470032e..02cd67c 100644 --- a/cloud_platform/models/cloud_platform.py +++ b/cloud_platform/models/cloud_platform.py @@ -65,6 +65,9 @@ class CloudPlatform(models.AbstractModel): @api.model def check(self): + if is_true(os.environ.get("ODOO_CLOUD_PLATFORM_UNSAFE")): + _logger.warning("cloud platform checks disabled, this is not safe") + return environment_name = self._get_running_env() self._check_redis(environment_name) diff --git a/monitoring_status/__manifest__.py b/monitoring_status/__manifest__.py index 9f7dcb0..d85c5fd 100644 --- a/monitoring_status/__manifest__.py +++ b/monitoring_status/__manifest__.py @@ -4,12 +4,12 @@ { "name": "Monitoring: Status", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "category", "depends": ["base", "web"], "website": "https://github.com/camptocamp/odoo-cloud-platform", "data": [], - "installable": False, + "installable": True, } diff --git a/monitoring_status/controllers/main.py b/monitoring_status/controllers/main.py index 21b6893..7da3e6c 100644 --- a/monitoring_status/controllers/main.py +++ b/monitoring_status/controllers/main.py @@ -8,7 +8,7 @@ import werkzeug from odoo import http -from odoo.addons.web.controllers.main import ensure_db +from odoo.addons.web.controllers.utils import ensure_db class HealthCheckFilter(logging.Filter):