PMM-13146 simplify boolean logic when reporting feature toggles

percona · Aug 20, 2024 · e918913 · e918913
1 parent bc3e32a
commit e918913
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/docs/process/v2_to_v3_environment_variables.md b/docs/process/v2_to_v3_environment_variables.md
@@ -9,7 +9,7 @@ Below is a list of affected variables and their new names.
 | `DISABLE_UPDATES`                             | `PMM_ENABLE_UPDATES`                       |                                                              |
 | `DISABLE_TELEMETRY`                           | `PMM_ENABLE_TELEMETRY`                     |                                                              |
 | `PERCONA_PLATFORM_API_TIMEOUT`                | `PMM_DEV_PERCONA_PLATFORM_API_TIMEOUT`     |                                                              |
-| `DISABLE_BACKUP_MANAGEMENT`                   |                                            | Removed in PMM v3, use `PMM_ENABLE_BACKUP_MANAGEMENT`        |
+| `DISABLE_BACKUP_MANAGEMENT`                   | `PMM_ENABLE_BACKUP_MANAGEMENT`             | Note the reverted boolean                                    |
 | `ENABLE_AZUREDISCOVER`                        | `PMM_ENABLE_AZURE_DISCOVER`                |                                                              |
 | `ENABLE_RBAC`                                 | `PMM_ENABLE_ACCESS_CONTROL`                |                                                              |
 | `LESS_LOG_NOISE`                              |                                            | Removed in PMM v3                                            |

diff --git a/managed/services/telemetry/config.default.yml b/managed/services/telemetry/config.default.yml
@@ -2,7 +2,7 @@ telemetry:
   # PMM - generic information
   - id: PMMServerAlertingEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN alerting->'enabled' = 'true' THEN '1' WHEN alerting->'enabled' = 'null' THEN '1' ELSE '0' END) AS alerting_enabled FROM settings s, jsonb_extract_path(s.settings, 'alerting') AS alerting
+    query: (CASE WHEN alerting->'enabled' = 'false' THEN '0' ELSE '1' END) AS alerting_enabled FROM settings s, jsonb_extract_path(s.settings, 'alerting') AS alerting
     summary: "PMM Server Integration Alerting feature enabled/disabled"
     data:
       - metric_name: "pmm_server_alerting_enabled"
@@ -26,39 +26,39 @@ telemetry:
 
   - id: PMMServerAdvisorsEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN advisors->'enabled' = 'true' THEN '1' WHEN advisors->'enabled' = 'null' THEN '1' ELSE '0' END) AS advisors_disabled FROM settings s, jsonb_extract_path(s.settings, 'sass') AS advisors
+    query: (CASE WHEN advisors->'enabled' = 'false' THEN '0' ELSE '1' END) AS advisors_disabled FROM settings s, jsonb_extract_path(s.settings, 'sass') AS advisors
     summary: "PMM Advisors Enabled"
     data:
       - metric_name: "pmm_server_advisors_enabled"
         column: "advisors_enabled"
 
   - id: PMMServerBackupManagementEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN backup_management->'enabled' = 'true' THEN '1' WHEN backup_management->'enabled' = 'null' THEN '1' ELSE '0' END) AS backup_management_enabled FROM settings s, jsonb_extract_path(s.settings, 'backup_management') AS backup_management
+    query: (CASE WHEN backup_management->'enabled' = 'false' THEN '0' ELSE '1' END) AS backup_management_enabled FROM settings s, jsonb_extract_path(s.settings, 'backup_management') AS backup_management
     summary: "PMM Server Backup Management feature enabled"
     data:
       - metric_name: "pmm_server_backup_management_enabled"
         column: "backup_management_enabled"
 
   - id: PMMServerAccessControlEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN access_control->'enabled' = 'true' THEN '1' WHEN access_control->'enabled' = 'null' THEN '0' ELSE '0' END) AS access_control_enabled FROM settings s, jsonb_extract_path(s.settings, 'access_control') AS access_control
+    query: (CASE WHEN access_control->'enabled' = 'true' THEN '1' ELSE '0' END) AS access_control_enabled FROM settings s, jsonb_extract_path(s.settings, 'access_control') AS access_control
     summary: "PMM Server Access Control feature enabled"
     data:
       - metric_name: "pmm_server_access_control_enabled"
         column: "access_control_enabled"
 
   - id: PMMServerUpdatesEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN updates->'enabled' = 'true' THEN '1' WHEN updates->'enabled' = 'null' THEN '1'  ELSE '0' END) AS updates_disabled FROM settings s, jsonb_extract_path(s.settings, 'updates') AS updates
+    query: (CASE WHEN updates->'enabled' = 'true' THEN '1' ELSE '0' END) AS updates_disabled FROM settings s, jsonb_extract_path(s.settings, 'updates') AS updates
     summary: "PMM Server Check Updates feature enabled"
     data:
       - metric_name: "pmm_server_updates_enabled"
         column: "updates_enabled"
 
   - id: PMMAzureMonitoringEnabled
     source: PMMDB_SELECT
-    query: (CASE WHEN azure->'enabled' = 'true' THEN '1' WHEN azure->'enabled' = 'null' THEN '1'  ELSE '0' END) AS azure_enabled FROM settings s, jsonb_extract_path(s.settings, 'azure') AS azure
+    query: (CASE WHEN azure->'enabled' = 'true' THEN '1' ELSE '0' END) AS azure_enabled FROM settings s, jsonb_extract_path(s.settings, 'azure') AS azure
     summary: "PMM Azure monitoring feature enabled"
     data:
       - metric_name: "pmm_server_azure_enabled"
@@ -953,14 +953,7 @@ telemetry:
     summary: "Use of HA feature"
     data:
       - metric_name: "pmm_server_ha_enable"
-        column: "PMM_TEST_HA_ENABLE"        
-
-  - id: PMMServerTelementryEnabled
-    source: ENV_VARS
-    summary: "Use of telemetry feature"
-    data:
-      - metric_name: "pmm_server_telemetry_enable"
-        column: "PMM_ENABLE_TELEMETRY"
+        column: "PMM_TEST_HA_ENABLE"
 
   - id: PMMServerBuiltinDatabaseDisabled
     source: ENV_VARS