fixed tests and docs

elastic · Oct 5, 2021 · b0b6d10 · b0b6d10
1 parent d062a21
commit b0b6d10
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
@@ -181,7 +181,7 @@ For example, `20m`, `24h`, `7d`, `1w`. Default: `60s`.
 Sets the number of actions that will be executed ephemerally. To use this, enable ephemeral tasks in task manager first with <<task-manager-settings,`xpack.task_manager.ephemeral_tasks.enabled`>>
 
 `xpack.alerting.defaultRuleTaskTimeout`::
-Specifies the default timeout for the all rule types tasks. Task timeout could be overridden by the rule type producer during registration. The time is formatted as:
+Specifies the default timeout for the all rule types tasks. The time is formatted as:
 +
 `<count>[ms,s,m,h,d,w,M,Y]` 
 +

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -222,6 +222,7 @@ kibana_vars=(
     xpack.alerting.healthCheck.interval
     xpack.alerting.invalidateApiKeysTask.interval
     xpack.alerting.invalidateApiKeysTask.removalDelay
+    xpack.alerting.defaultRuleTaskTimeout
     xpack.alerts.healthCheck.interval
     xpack.alerts.invalidateApiKeysTask.interval
     xpack.alerts.invalidateApiKeysTask.removalDelay

diff --git a/x-pack/plugins/alerting/server/config.test.ts b/x-pack/plugins/alerting/server/config.test.ts
@@ -12,7 +12,7 @@ describe('config validation', () => {
     const config: Record<string, unknown> = {};
     expect(configSchema.validate(config)).toMatchInlineSnapshot(`
       Object {
-        "defaultRuleTaskTimeout": "10m",
+        "defaultRuleTaskTimeout": "5m",
         "healthCheck": Object {
           "interval": "60m",
         },

diff --git a/x-pack/plugins/alerting/server/plugin.test.ts b/x-pack/plugins/alerting/server/plugin.test.ts
@@ -38,7 +38,7 @@ describe('Alerting Plugin', () => {
           removalDelay: '1h',
         },
         maxEphemeralActionsPerAlert: 10,
-        defaultRuleTaskTimeout: '20m',
+        defaultRuleTaskTimeout: '5m',
       });
       plugin = new AlertingPlugin(context);
 
@@ -72,7 +72,7 @@ describe('Alerting Plugin', () => {
           removalDelay: '1h',
         },
         maxEphemeralActionsPerAlert: 10,
-        defaultRuleTaskTimeout: '20m',
+        defaultRuleTaskTimeout: '5m',
       });
       plugin = new AlertingPlugin(context);
 
@@ -146,11 +146,12 @@ describe('Alerting Plugin', () => {
       });
 
       it('should apply default config value for ruleTaskTimeout', async () => {
-        setup.registerType({
+        const ruleType = {
           ...sampleAlertType,
           minimumLicenseRequired: 'basic',
-        });
-        expect(sampleAlertType.ruleTaskTimeout).toBe('5m');
+        } as AlertType<never, never, never, never, never, "default", never>;
+        await setup.registerType(ruleType);
+        expect(ruleType.ruleTaskTimeout).toBe('5m');
       });
     });
   });
@@ -167,7 +168,7 @@ describe('Alerting Plugin', () => {
             removalDelay: '1h',
           },
           maxEphemeralActionsPerAlert: 10,
-          defaultRuleTaskTimeout: '20m',
+          defaultRuleTaskTimeout: '5m',
         });
         const plugin = new AlertingPlugin(context);
 
@@ -208,7 +209,7 @@ describe('Alerting Plugin', () => {
             removalDelay: '1h',
           },
           maxEphemeralActionsPerAlert: 10,
-          defaultRuleTaskTimeout: '20m',
+          defaultRuleTaskTimeout: '5m',
         });
         const plugin = new AlertingPlugin(context);
 
@@ -263,7 +264,7 @@ describe('Alerting Plugin', () => {
           removalDelay: '1h',
         },
         maxEphemeralActionsPerAlert: 100,
-        defaultRuleTaskTimeout: '20m',
+        defaultRuleTaskTimeout: '5m',
       });
       const plugin = new AlertingPlugin(context);