[Synthetics] Schema configuration and Server side changes for CCS settings #262497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

mgiota merged 59 commits into elastic:main from mgiota:ccs/types-and-settings-api

Apr 16, 2026

revert remoteKibanaUrls changes

Loading branch information

mgiota committed Apr 15, 2026

commit 286923933647237b82702c207baf09ce4640f23f

x-pack/solutions/observability/plugins/synthetics/common/runtime_types/ccs_settings.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ export const remoteSyntheticsClusterSchema = t.type({ @@
     export const syntheticsCCSSettingsSchema = t.type({
       useAllRemoteClusters: t.boolean,
       selectedRemoteClusters: t.array(t.string),
-      remoteKibanaUrls: t.record(t.string, t.string),
     });
     export type RemoteSyntheticsCluster = t.TypeOf<typeof remoteSyntheticsClusterSchema>;
@@ Expand Down @@

x-pack/solutions/observability/plugins/synthetics/common/runtime_types/remote.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ import * as t from 'io-ts'; @@
     export const remoteMonitorInfoSchema = t.type({
       remoteName: t.string,
-      kibanaUrl: t.string,
     });
     export type RemoteMonitorInfo = t.TypeOf<typeof remoteMonitorInfoSchema>;

.../public/apps/synthetics/components/settings/remote_clusters/hooks/use_get_ccs_settings.ts

-Original file line number
+Diff line change
@@ Expand Up @@
     export const DEFAULT_CCS_SETTINGS: SyntheticsCCSSettings = {
       useAllRemoteClusters: false,
       selectedRemoteClusters: [],
-      remoteKibanaUrls: {},
     };
     const fetchCCSSettings = async () => {
@@ Expand Down @@

.../public/apps/synthetics/components/settings/remote_clusters/remote_clusters_form.test.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ const mockSaveSettings = jest.fn(); @@
     const mockCCSSettingsData = {
       useAllRemoteClusters: false,
       selectedRemoteClusters: [] as string[],
-      remoteKibanaUrls: {} as Record<string, string>,
     };
     jest.mock('./hooks/use_get_ccs_settings', () => ({
@@ Expand Down Expand Up / @@ -95,34 +94,6 @@ describe('<RemoteClustersForm />', () => { @@
         expect(comboBox).toHaveAttribute('disabled');
       });
-      it('shows the Kibana URL table when clusters are selected', () => {
-        jest.spyOn(observabilitySharedPublic, 'useFetcher').mockReturnValue({
-          data: mockRemoteClusters,
-          status: observabilitySharedPublic.FETCH_STATUS.SUCCESS,
-          refetch: () => {},
-        });
-        // Toggle "use all" to show URLs for all clusters
-        render(<RemoteClustersForm />);
-        const toggle = screen.getByTestId('syntheticsUseAllRemoteClusters');
-        fireEvent.click(toggle);
-        expect(screen.getByText('cluster-a')).toBeInTheDocument();
-        expect(screen.getByText('cluster-b')).toBeInTheDocument();
-        expect(screen.getByTestId('syntheticsRemoteClusterUrl-cluster-a')).toBeInTheDocument();
-        expect(screen.getByTestId('syntheticsRemoteClusterUrl-cluster-b')).toBeInTheDocument();
-      });
-      it('shows connection status for remote clusters', () => {
-        renderWithClusters();
-        const toggle = screen.getByTestId('syntheticsUseAllRemoteClusters');
-        fireEvent.click(toggle);
-        expect(screen.getByText('Connected')).toBeInTheDocument();
-        expect(screen.getByText('Disconnected')).toBeInTheDocument();
-      });
       it('enables the Apply button only when form is dirty', () => {
         renderWithClusters();
@@ Expand Down @@

...etics/public/apps/synthetics/components/settings/remote_clusters/remote_clusters_form.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,13 +8,11 @@ @@
     import React, { useCallback, useEffect, useMemo, useState } from 'react';
     import { i18n } from '@kbn/i18n';
     import {
-      EuiBasicTable,
       EuiButton,
       EuiButtonEmpty,
       EuiCallOut,
       EuiComboBox,
       EuiDescribedFormGroup,
-      EuiFieldText,
       EuiFlexGroup,
       EuiFlexItem,
       EuiForm,
@@ Expand All / @@ -23,7 +21,7 @@ import { @@
       EuiSpacer,
       EuiSwitch,
     } from '@elastic/eui';
-    import type { EuiBasicTableColumn, EuiComboBoxOptionOption } from '@elastic/eui';
+    import type { EuiComboBoxOptionOption } from '@elastic/eui';
     import { useFetcher } from '@kbn/observability-shared-plugin/public';
     import { useKibana } from '@kbn/kibana-react-plugin/public';
     import { isEqual } from 'lodash';
@@ Expand All / @@ -37,12 +35,6 @@ interface RemoteCluster { @@
       isConnected: boolean;
     }
-    interface ClusterUrlRow {
-      clusterName: string;
-      isConnected: boolean;
-      kibanaUrl: string;
-    }
     export const RemoteClustersForm = () => {
       const { http } = useKibana().services;
       const { isServerless, isCCSEnabled } = useSyntheticsSettingsContext();
@@ Expand All / @@ -69,14 +61,12 @@ export const RemoteClustersForm = () => { @@
       // Local form state
       const [useAllRemoteClusters, setUseAllRemoteClusters] = useState(false);
       const [selectedRemoteClusters, setSelectedRemoteClusters] = useState<string[]>([]);
-      const [remoteKibanaUrls, setRemoteKibanaUrls] = useState<Record<string, string>>({});
       // Sync local state from saved settings when loaded
       useEffect(() => {
         if (savedSettings) {
           setUseAllRemoteClusters(savedSettings.useAllRemoteClusters);
           setSelectedRemoteClusters(savedSettings.selectedRemoteClusters);
-          setRemoteKibanaUrls(savedSettings.remoteKibanaUrls);
         }
       }, [savedSettings]);
@@ Expand All / @@ -90,9 +80,8 @@ export const RemoteClustersForm = () => { @@
         () => ({
           useAllRemoteClusters,
           selectedRemoteClusters,
-          remoteKibanaUrls,
         }),
-        [useAllRemoteClusters, selectedRemoteClusters, remoteKibanaUrls]
+        [useAllRemoteClusters, selectedRemoteClusters]
       );
       const isFormDirty = !isEqual(currentFormValues, savedSettings ?? DEFAULT_CCS_SETTINGS);
@@ Expand All / @@ -101,42 +90,13 @@ export const RemoteClustersForm = () => { @@
         if (savedSettings) {
           setUseAllRemoteClusters(savedSettings.useAllRemoteClusters);
           setSelectedRemoteClusters(savedSettings.selectedRemoteClusters);
-          setRemoteKibanaUrls(savedSettings.remoteKibanaUrls);
         }
       }, [savedSettings]);
       const handleSave = useCallback(async () => {
         await saveSettings(currentFormValues);
       }, [saveSettings, currentFormValues]);
-      // Determine which clusters to show in the Kibana URL table
-      const clustersForUrlTable: ClusterUrlRow[] = useMemo(() => {
-        const clusterList = remoteClusters ?? [];
-        let relevantClusters: RemoteCluster[];
-        if (useAllRemoteClusters) {
-          relevantClusters = clusterList;
-        } else {
-          relevantClusters = selectedRemoteClusters.map((name) => {
-            const found = clusterList.find((c) => c.name === name);
-            return found ?? { name, isConnected: false };
-          });
-        }
-        return relevantClusters.map((cluster) => ({
-          clusterName: cluster.name,
-          isConnected: cluster.isConnected,
-          kibanaUrl: remoteKibanaUrls[cluster.name] ?? '',
-        }));
-      }, [remoteClusters, useAllRemoteClusters, selectedRemoteClusters, remoteKibanaUrls]);
-      const handleUrlChange = useCallback((clusterName: string, url: string) => {
-        setRemoteKibanaUrls((prev) => ({
-          ...prev,
-          [clusterName]: url,
-        }));
-      }, []);
       // Combo box options for cluster selection
       const clusterOptions: EuiComboBoxOptionOption[] = useMemo(() => {
         return (remoteClusters ?? []).map((cluster) => ({
@@ Expand All / @@ -154,51 +114,11 @@ export const RemoteClustersForm = () => { @@
         return selectedRemoteClusters.map((name) => ({ label: name, value: name }));
       }, [selectedRemoteClusters]);
-      // Table columns for Kibana URL mapping
-      const urlTableColumns: Array<EuiBasicTableColumn<ClusterUrlRow>> = useMemo(
-        () => [
-          {
-            field: 'clusterName',
-            name: CLUSTER_NAME_LABEL,
-            width: '30%',
-            truncateText: false,
-          },
-          {
-            field: 'isConnected',
-            name: STATUS_LABEL,
-            width: '20%',
-            render: (isConnected: boolean) =>
-              isConnected ? (
-                <EuiHealth color="success">{CONNECTED_LABEL}</EuiHealth>
-              ) : (
-                <EuiHealth color="danger">{DISCONNECTED_LABEL}</EuiHealth>
-              ),
-          },
-          {
-            field: 'kibanaUrl',
-            name: KIBANA_URL_LABEL,
-            width: '50%',
-            render: (_: string, row: ClusterUrlRow) => (
-              <EuiFieldText
-                data-test-subj={`syntheticsRemoteClusterUrl-${row.clusterName}`}
-                placeholder="https://..."
-                value={row.kibanaUrl}
-                onChange={(e) => handleUrlChange(row.clusterName, e.target.value)}
-                disabled={!canEdit}
-                compressed
-              />
-            ),
-          },
-        ],
-        [handleUrlChange, canEdit]
-      );
       if (isServerless || !isCCSEnabled) {
         return null;
       }
       const hasNoClusters = !loading && (remoteClusters ?? []).length === 0;
-      const hasSelectedClusters = useAllRemoteClusters || selectedRemoteClusters.length > 0;
       return (
         <EuiForm>
@@ Expand Down Expand Up / @@ -255,22 +175,6 @@ export const RemoteClustersForm = () => { @@
             </EuiFormRow>
           </EuiDescribedFormGroup>
-          {hasSelectedClusters && clustersForUrlTable.length > 0 && (
-            <>
-              <EuiSpacer size="l" />
-              <h4>{KIBANA_URLS_TITLE}</h4>
-              <EuiSpacer size="s" />
-              <p>{KIBANA_URLS_DESCRIPTION}</p>
-              <EuiSpacer size="m" />
-              <EuiBasicTable
-                data-test-subj="syntheticsRemoteClusterUrlTable"
-                items={clustersForUrlTable}
-                columns={urlTableColumns}
-                rowHeader="clusterName"
-              />
-            </>
-          )}
           <EuiSpacer />
           <EuiFlexGroup justifyContent="flexEnd">
             <EuiFlexItem grow={false}>
@@ Expand Down Expand Up / @@ -338,30 +242,6 @@ const SELECT_CLUSTERS_PLACEHOLDER = i18n.translate( @@
       { defaultMessage: 'Search for remote clusters' }
     );
-    const KIBANA_URLS_TITLE = i18n.translate('xpack.synthetics.settings.ccs.kibanaUrlsTitle', {
-      defaultMessage: 'Kibana URLs',
-    });
-    const KIBANA_URLS_DESCRIPTION = i18n.translate(
-      'xpack.synthetics.settings.ccs.kibanaUrlsDescription',
-      {
-        defaultMessage:
-          'Configure the Kibana URL for each remote cluster. These URLs are used to create deep links to remote monitor details.',
-      }
-    );
-    const CLUSTER_NAME_LABEL = i18n.translate('xpack.synthetics.settings.ccs.clusterName', {
-      defaultMessage: 'Cluster',
-    });
-    const STATUS_LABEL = i18n.translate('xpack.synthetics.settings.ccs.status', {
-      defaultMessage: 'Status',
-    });
-    const KIBANA_URL_LABEL = i18n.translate('xpack.synthetics.settings.ccs.kibanaUrl', {
-      defaultMessage: 'Kibana URL',
-    });
     const CONNECTED_LABEL = i18n.translate('xpack.synthetics.settings.ccs.connected', {
       defaultMessage: 'Connected',
     });
@@ Expand Down @@

x-pack/solutions/observability/plugins/synthetics/server/constants/settings.ts

-Original file line number
+Diff line change
@@ Expand Up @@
       },
       useAllRemoteClusters: false,
       selectedRemoteClusters: [],
-      remoteKibanaUrls: {},
     };
     export const DYNAMIC_SETTINGS_DEFAULT_ATTRIBUTES: DynamicSettingsAttributes =
@@ Expand Down @@

x-pack/solutions/observability/plugins/synthetics/server/lib/remote_result_utils.test.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,37 +29,19 @@ describe('remote_result_utils', () => { @@
       });
       describe('getRemoteMonitorInfo', () => {
-        const remoteKibanaUrls: Record<string, string> = {
-          cluster1: 'https://cluster1.example.com',
-          cluster2: 'https://cluster2.example.com',
-        };
-        it('returns remote info with kibanaUrl for a known remote cluster', () => {
-          expect(getRemoteMonitorInfo('cluster1:synthetics-browser-default', remoteKibanaUrls)).toEqual(
-            {
-              remoteName: 'cluster1',
-              kibanaUrl: 'https://cluster1.example.com',
-            }
-          );
-        });
-        it('returns remote info with empty kibanaUrl for an unknown remote cluster', () => {
-          expect(
-            getRemoteMonitorInfo('unknown-cluster:synthetics-browser-default', remoteKibanaUrls)
-          ).toEqual({
-            remoteName: 'unknown-cluster',
-            kibanaUrl: '',
+        it('returns remote info for a known remote cluster', () => {
+          expect(getRemoteMonitorInfo('cluster1:synthetics-browser-default')).toEqual({
+            remoteName: 'cluster1',
           });
         });
         it('returns undefined for a local index', () => {
-          expect(getRemoteMonitorInfo('synthetics-browser-default', remoteKibanaUrls)).toBeUndefined();
+          expect(getRemoteMonitorInfo('synthetics-browser-default')).toBeUndefined();
         });
-        it('returns remote info with empty kibanaUrl when remoteKibanaUrls is empty', () => {
-          expect(getRemoteMonitorInfo('cluster1:synthetics-browser-default', {})).toEqual({
-            remoteName: 'cluster1',
-            kibanaUrl: '',
+        it('returns remote info for a cluster with hyphens', () => {
+          expect(getRemoteMonitorInfo('my-remote-cluster:synthetics-http-default')).toEqual({
+            remoteName: 'my-remote-cluster',
           });
         });
       });
@@ Expand Down @@

x-pack/solutions/observability/plugins/synthetics/server/lib/remote_result_utils.ts

-Original file line number
+Diff line change
@@ Expand Up @@
      * Returns undefined for local hits.
      *
      * @param index - The `_index` field from the ES search hit
-     * @param remoteKibanaUrls - Map of remoteName → kibanaUrl from CCS settings
      */
-    export function getRemoteMonitorInfo(
-      index: string,
-      remoteKibanaUrls: Record<string, string>
-    ): RemoteMonitorInfo | undefined {
+    export function getRemoteMonitorInfo(index: string): RemoteMonitorInfo | undefined {
       const remoteName = getRemoteClusterName(index);
       if (!remoteName) {
         return undefined;
       }
       return {
         remoteName,
-        kibanaUrl: remoteKibanaUrls[remoteName] ?? '',
       };
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Synthetics] Schema configuration and Server side changes for CCS settings #262497

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!