[alerting] add mustache variable for Kibana's publicly exposed base URL

x-pack/plugins/alerts/server/plugin.ts

@@ -161,6 +161,7 @@ export class AlertingPlugin {
   private eventLogService?: IEventLogService;
   private eventLogger?: IEventLogger;
   private readonly kibanaIndexConfig: Observable<{ kibana: { index: string } }>;
+  private kibanaBaseUrl: string | undefined;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.config = initializerContext.config.create<AlertsConfig>().pipe(first()).toPromise();
@@ -176,6 +177,7 @@ export class AlertingPlugin {
     core: CoreSetup<AlertingPluginsStart, unknown>,
     plugins: AlertingPluginsSetup
   ): PluginSetupContract {
+    this.kibanaBaseUrl = core.http.basePath.publicBaseUrl;
     this.licenseState = new LicenseState(plugins.licensing.license$);
     this.security = plugins.security;
 
@@ -371,6 +373,7 @@ export class AlertingPlugin {
       eventLogger: this.eventLogger!,
       internalSavedObjectsRepository: core.savedObjects.createInternalRepository(['alert']),
       alertTypeRegistry: this.alertTypeRegistry!,
+      kibanaBaseUrl: this.kibanaBaseUrl,
     });
 
     this.eventLogService!.registerSavedObjectProvider('alert', (request) => {

x-pack/plugins/alerts/server/task_runner/create_execution_handler.test.ts

@@ -72,6 +72,7 @@ const createExecutionHandlerParams: jest.Mocked<
   alertName: 'name-of-alert',
   tags: ['tag-A', 'tag-B'],
   apiKey: 'MTIzOmFiYw==',
+  kibanaBaseUrl: 'http://localhost:5601',
   alertType,
   logger: loggingSystemMock.create().get(),
   eventLogger: mockEventLogger,

x-pack/plugins/alerts/server/task_runner/create_execution_handler.ts

@@ -39,6 +39,7 @@ export interface CreateExecutionHandlerOptions<
   actions: AlertAction[];
   spaceId: string;
   apiKey: RawAlert['apiKey'];
+  kibanaBaseUrl: string | undefined;
   alertType: NormalizedAlertType<
     Params,
     State,
@@ -82,6 +83,7 @@ export function createExecutionHandler<
   spaceId,
   apiKey,
   alertType,
+  kibanaBaseUrl,
   eventLogger,
   request,
   alertParams,
@@ -126,6 +128,7 @@ export function createExecutionHandler<
             context,
             actionParams: action.params,
             state,
+            kibanaBaseUrl,
             alertParams,
           }),
         };

x-pack/plugins/alerts/server/task_runner/task_runner.test.ts

@@ -97,6 +97,7 @@ describe('Task Runner', () => {
     eventLogger: eventLoggerMock.create(),
     internalSavedObjectsRepository: savedObjectsRepositoryMock.create(),
     alertTypeRegistry,
+    kibanaBaseUrl: 'https://localhost:5601',
   };
 
   const mockedAlertTypeSavedObject: Alert<AlertTypeParams> = {

x-pack/plugins/alerts/server/task_runner/task_runner.ts

@@ -160,6 +160,7 @@ export class TaskRunner<
     tags: string[] | undefined,
     spaceId: string,
     apiKey: RawAlert['apiKey'],
+    kibanaBaseUrl: string | undefined,
     actions: Alert<Params>['actions'],
     alertParams: Params
   ) {
@@ -180,6 +181,7 @@ export class TaskRunner<
       actions,
       spaceId,
       alertType: this.alertType,
+      kibanaBaseUrl,
       eventLogger: this.context.eventLogger,
       request: this.getFakeKibanaRequest(spaceId, apiKey),
       alertParams,
@@ -388,6 +390,7 @@ export class TaskRunner<
       alert.tags,
       spaceId,
       apiKey,
+      this.context.kibanaBaseUrl,
       alert.actions,
       alert.params
     );

x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts

@@ -77,6 +77,7 @@ describe('Task Runner Factory', () => {
     eventLogger: eventLoggerMock.create(),
     internalSavedObjectsRepository: savedObjectsRepositoryMock.create(),
     alertTypeRegistry: alertTypeRegistryMock.create(),
+    kibanaBaseUrl: 'https://localhost:5601',
   };
 
   beforeEach(() => {

x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts

@@ -40,6 +40,7 @@ export interface TaskRunnerContext {
   basePathService: IBasePath;
   internalSavedObjectsRepository: ISavedObjectsRepository;
   alertTypeRegistry: AlertTypeRegistry;
+  kibanaBaseUrl: string | undefined;
 }
 
 export class TaskRunnerFactory {

x-pack/plugins/alerts/server/task_runner/transform_action_params.ts

@@ -27,6 +27,7 @@ interface TransformActionParamsOptions {
   actionParams: AlertActionParams;
   alertParams: AlertTypeParams;
   state: AlertInstanceState;
+  kibanaBaseUrl?: string;
   context: AlertInstanceContext;
 }
 
@@ -44,6 +45,7 @@ export function transformActionParams({
   context,
   actionParams,
   state,
+  kibanaBaseUrl,
   alertParams,
 }: TransformActionParamsOptions): AlertActionParams {
   // when the list of variables we pass in here changes,
@@ -61,6 +63,7 @@ export function transformActionParams({
     context,
     date: new Date().toISOString(),
     state,
+    kibanaBaseUrl,
     params: alertParams,
   };
   return actionsPlugin.renderActionParameterTemplates(actionTypeId, actionParams, variables);

x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts

@@ -44,10 +44,18 @@ describe('transformActionVariables', () => {
           "description": "The alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroup",
         },
+        Object {
+          "description": "The alert action subgroup that was used to scheduled actions for the alert.",
+          "name": "alertActionSubgroup",
+        },
         Object {
           "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroupName",
         },
+        Object {
+          "description": "The configured server.publicBaseUrl value or empty string if not configured.",
+          "name": "kibanaBaseUrl",
+        },
       ]
     `);
   });
@@ -91,10 +99,18 @@ describe('transformActionVariables', () => {
           "description": "The alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroup",
         },
+        Object {
+          "description": "The alert action subgroup that was used to scheduled actions for the alert.",
+          "name": "alertActionSubgroup",
+        },
         Object {
           "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroupName",
         },
+        Object {
+          "description": "The configured server.publicBaseUrl value or empty string if not configured.",
+          "name": "kibanaBaseUrl",
+        },
         Object {
           "description": "foo-description",
           "name": "context.foo",
@@ -146,10 +162,18 @@ describe('transformActionVariables', () => {
           "description": "The alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroup",
         },
+        Object {
+          "description": "The alert action subgroup that was used to scheduled actions for the alert.",
+          "name": "alertActionSubgroup",
+        },
         Object {
           "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroupName",
         },
+        Object {
+          "description": "The configured server.publicBaseUrl value or empty string if not configured.",
+          "name": "kibanaBaseUrl",
+        },
         Object {
           "description": "foo-description",
           "name": "state.foo",
@@ -204,10 +228,18 @@ describe('transformActionVariables', () => {
           "description": "The alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroup",
         },
+        Object {
+          "description": "The alert action subgroup that was used to scheduled actions for the alert.",
+          "name": "alertActionSubgroup",
+        },
         Object {
           "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroupName",
         },
+        Object {
+          "description": "The configured server.publicBaseUrl value or empty string if not configured.",
+          "name": "kibanaBaseUrl",
+        },
         Object {
           "description": "fooC-description",
           "name": "context.fooC",
@@ -280,10 +312,18 @@ describe('transformActionVariables', () => {
           "description": "The alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroup",
         },
+        Object {
+          "description": "The alert action subgroup that was used to scheduled actions for the alert.",
+          "name": "alertActionSubgroup",
+        },
         Object {
           "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
           "name": "alertActionGroupName",
         },
+        Object {
+          "description": "The configured server.publicBaseUrl value or empty string if not configured.",
+          "name": "kibanaBaseUrl",
+        },
         Object {
           "description": "fooC-description",
           "name": "context.fooC",

x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts

@@ -88,6 +88,17 @@ function getAlwaysProvidedActionVariables(): ActionVariable[] {
     }),
   });
 
+  result.push({
+    name: 'alertActionSubgroup',
+    description: i18n.translate(
+      'xpack.triggersActionsUI.actionVariables.alertActionSubgroupLabel',
+      {
+        defaultMessage:
+          'The alert action subgroup that was used to scheduled actions for the alert.',
+      }
+    ),
+  });
+
   result.push({
     name: 'alertActionGroupName',
     description: i18n.translate(
@@ -99,5 +110,13 @@ function getAlwaysProvidedActionVariables(): ActionVariable[] {
     ),
   });
 
+  result.push({
+    name: 'kibanaBaseUrl',
+    description: i18n.translate('xpack.triggersActionsUI.actionVariables.kibanaBaseUrlLabel', {
+      defaultMessage:
+        'The configured server.publicBaseUrl value or empty string if not configured.',
+    }),
+  });
+
   return result;
 }

x-pack/test/alerting_api_integration/common/config.ts

@@ -19,6 +19,7 @@ interface CreateTestConfigOptions {
   ssl?: boolean;
   enableActionsProxy: boolean;
   rejectUnauthorized?: boolean;
+  publicBaseUrl?: boolean;
 }
 
 // test.not-enabled is specifically not enabled
@@ -97,7 +98,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          '--server.publicBaseUrl=https://localhost:5601',
+          ...(options.publicBaseUrl ? ['--server.publicBaseUrl=https://localhost:5601'] : []),
           `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           '--xpack.alerts.invalidateApiKeysTask.interval="15s"',

x-pack/test/alerting_api_integration/security_and_spaces/config.ts

@@ -13,4 +13,5 @@ export default createTestConfig('security_and_spaces', {
   license: 'trial',
   ssl: true,
   enableActionsProxy: true,
+  publicBaseUrl: true,
 });

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts

@@ -51,6 +51,7 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
       loadTestFile(require.resolve('./update_api_key'));
       loadTestFile(require.resolve('./alerts'));
       loadTestFile(require.resolve('./event_log'));
+      loadTestFile(require.resolve('./mustache_templates'));
     });
   });
 }