Merge branch 'v3' into PMM-13629-fix-pmm-managed-npe-issue

percona · Jan 8, 2025 · 9bc7ed4 · 9bc7ed4
2 parents 9b846cd + 6fd9049
commit 9bc7ed4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - 443:8443
     environment:
       - PMM_DEBUG=1
-      - PERCONA_PORTAL_URL=https://portal-dev.percona.com
+      - PMM_DEV_PORTAL_URL=https://portal-dev.percona.com
       - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com:443
       - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
 

diff --git a/pkg/api/system.go b/pkg/api/system.go
@@ -11,7 +11,7 @@ import (
 
 func GetPerconaSaasHost(c *contextmodel.ReqContext) response.Response {
 	saasHost := "https://portal.percona.com"
-	envHost, ok := os.LookupEnv("PERCONA_PORTAL_URL")
+	envHost, ok := os.LookupEnv("PMM_DEV_PORTAL_URL")
 
 	if ok {
 		saasHost = envHost

diff --git a/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx
@@ -18,9 +18,9 @@ const TemplateFiltersField: FC = () => {
   } = useFormContext();
   const filterOptions: Array<SelectableValue<AlertRuleFilterType>> = useMemo(
     () =>
-      Object.entries(AlertRuleFilterType).map(([, value]) => ({
-        label: value,
-        value: value,
+      Object.entries(AlertRuleFilterType).map(([label, value]) => ({
+        label,
+        value,
       })),
     []
   );

diff --git a/public/app/percona/settings/components/Advanced/Advanced.tsx b/public/app/percona/settings/components/Advanced/Advanced.tsx
@@ -140,7 +140,7 @@ export const Advanced: FC = () => {
       enable_telemetry: telemetry,
       enable_advisor: stt,
       enable_azurediscover: azureDiscover,
-      pmm_public_address: publicAddress,
+      pmm_public_address: publicAddress || '',
       enable_alerting: alerting,
       advisor_run_intervals: !!stt ? sttCheckIntervals : undefined,
       enable_backup_management: backup,

diff --git a/public/app/percona/shared/core/types.ts b/public/app/percona/shared/core/types.ts
@@ -105,8 +105,8 @@ export enum AlertRuleParamType {
 }
 
 export enum AlertRuleFilterType {
-  MATCH = 'MATCH',
-  MISMATCH = 'MISMATCH',
+  MATCH = 'FILTER_TYPE_MATCH',
+  MISMATCH = 'FILTER_TYPE_MISMATCH',
 }
 
 export type AlertRulesParsedParam = TemplateParam & { value: string | boolean | number };

diff --git a/public/app/plugins/panel/pmm-update/components/AvailableUpdate/AvailableUpdate.tsx b/public/app/plugins/panel/pmm-update/components/AvailableUpdate/AvailableUpdate.tsx
diff --git a/public/app/plugins/panel/pmm-update/module.tsx b/public/app/plugins/panel/pmm-update/module.tsx
diff --git a/public/app/plugins/panel/pmm-update/plugin.json b/public/app/plugins/panel/pmm-update/plugin.json