From 75d73a5a6b6ad024bcacc5155f793b773abb3ddf Mon Sep 17 00:00:00 2001 From: Matej Kubinec <32638572+matejkubinec@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:45:29 +0100 Subject: [PATCH 1/3] PMM-13569 Update portal url env variable name (#792) * PMM-13569 Use correct portal url env variable name * PMM-13569 Remove executable bits from files --- docker-compose.yml | 2 +- pkg/api/system.go | 2 +- .../pmm-update/components/AvailableUpdate/AvailableUpdate.tsx | 0 public/app/plugins/panel/pmm-update/module.tsx | 0 public/app/plugins/panel/pmm-update/plugin.json | 0 5 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 public/app/plugins/panel/pmm-update/components/AvailableUpdate/AvailableUpdate.tsx mode change 100755 => 100644 public/app/plugins/panel/pmm-update/module.tsx mode change 100755 => 100644 public/app/plugins/panel/pmm-update/plugin.json diff --git a/docker-compose.yml b/docker-compose.yml index 2e5b423854249..85d67e453ca1c 100644 --- 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 index 94f1463fba4af..befd392fd7229 100644 --- 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/plugins/panel/pmm-update/components/AvailableUpdate/AvailableUpdate.tsx b/public/app/plugins/panel/pmm-update/components/AvailableUpdate/AvailableUpdate.tsx old mode 100755 new mode 100644 diff --git a/public/app/plugins/panel/pmm-update/module.tsx b/public/app/plugins/panel/pmm-update/module.tsx old mode 100755 new mode 100644 diff --git a/public/app/plugins/panel/pmm-update/plugin.json b/public/app/plugins/panel/pmm-update/plugin.json old mode 100755 new mode 100644 From a7138e156cdd6f0ee391de1750234813aa211b53 Mon Sep 17 00:00:00 2001 From: Matej Kubinec <32638572+matejkubinec@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:59:59 +0100 Subject: [PATCH 2/3] PMM-13537 Fix submit of empty public address (#788) * PMM-13537 Fix submit of empty public address * PMM-13537 Use correct quotes --- public/app/percona/settings/components/Advanced/Advanced.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/percona/settings/components/Advanced/Advanced.tsx b/public/app/percona/settings/components/Advanced/Advanced.tsx index 3e64d42d94f8c..649299de95a10 100644 --- 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, From 6fd90496bac1f6a15ef4ecfbc1dc6a6b5338ef2f Mon Sep 17 00:00:00 2001 From: Dora <103416234+doracretu3pillar@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:55:20 +0200 Subject: [PATCH 3/3] PMM-13520: Bug when creating new alert rule with filter MATCH (#785) * Alert rule filter type changed according to Swagger * Changed the label for filterOptions select box from New Alerting Template * Fixed prettier --- .../components/TemplateForm/TemplateFiltersField.tsx | 6 +++--- public/app/percona/shared/core/types.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx index 36667e9085c64..cb78332293d5b 100644 --- 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> = useMemo( () => - Object.entries(AlertRuleFilterType).map(([, value]) => ({ - label: value, - value: value, + Object.entries(AlertRuleFilterType).map(([label, value]) => ({ + label, + value, })), [] ); diff --git a/public/app/percona/shared/core/types.ts b/public/app/percona/shared/core/types.ts index e9f849c306982..bbcdd29928a85 100644 --- 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 };