Make telemetry task use a schedule instead of scheduling explicitly for midnight

x-pack/plugins/actions/server/usage/task.ts

@@ -6,18 +6,19 @@
  */
 
 import { Logger, CoreSetup } from '@kbn/core/server';
-import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
+  IntervalSchedule,
 } from '@kbn/task-manager-plugin/server';
 import { PreConfiguredAction } from '../types';
 import { getTotalCount, getInUseTotalCount, getExecutionsPerDayCount } from './actions_telemetry';
 
 export const TELEMETRY_TASK_TYPE = 'actions_telemetry';
 
 export const TASK_ID = `Actions-${TELEMETRY_TASK_TYPE}`;
+export const SCHEDULE: IntervalSchedule = { interval: '1d' };
 
 export function initializeActionsTelemetry(
   logger: Logger,
@@ -71,6 +72,7 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
       taskType: TELEMETRY_TASK_TYPE,
       state: {},
       params: {},
+      schedule: SCHEDULE,
     });
   } catch (e) {
     logger.debug(`Error scheduling task, received ${e.message}`);
@@ -133,14 +135,12 @@ export function telemetryTaskRunner(
               count_connector_types_by_action_run_outcome_per_day:
                 totalExecutionsPerDay.countRunOutcomeByConnectorType,
             },
-            runAt: getNextMidnight(),
+            // Useful for setting a schedule for the old tasks that don't have one
+            // or to update the schedule if ever the frequency changes in code
+            schedule: SCHEDULE,
           };
         });
       },
     };
   };
 }
-
-function getNextMidnight() {
-  return moment().add(1, 'd').startOf('d').toDate();
-}

x-pack/plugins/alerting/server/usage/task.ts

@@ -6,11 +6,11 @@
  */
 
 import { Logger, CoreSetup } from '@kbn/core/server';
-import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
+  IntervalSchedule,
 } from '@kbn/task-manager-plugin/server';
 
 import { getFailedAndUnrecognizedTasksPerDay } from './lib/get_telemetry_from_task_manager';
@@ -23,6 +23,7 @@ import {
 export const TELEMETRY_TASK_TYPE = 'alerting_telemetry';
 
 export const TASK_ID = `Alerting-${TELEMETRY_TASK_TYPE}`;
+export const SCHEDULE: IntervalSchedule = { interval: '1d' };
 
 export function initializeAlertingTelemetry(
   logger: Logger,
@@ -69,6 +70,7 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
       taskType: TELEMETRY_TASK_TYPE,
       state: {},
       params: {},
+      schedule: SCHEDULE,
     });
   } catch (e) {
     logger.debug(`Error scheduling task, received ${e.message}`);
@@ -189,22 +191,22 @@ export function telemetryTaskRunner(
                   percentile_num_alerts_by_type_per_day:
                     dailyExecutionCounts.alertsPercentilesByType,
                 },
-                runAt: getNextMidnight(),
+                // Useful for setting a schedule for the old tasks that don't have one
+                // or to update the schedule if ever the frequency changes in code
+                schedule: SCHEDULE,
               };
             }
           )
           .catch((errMsg) => {
             logger.warn(`Error executing alerting telemetry task: ${errMsg}`);
             return {
               state: {},
-              runAt: getNextMidnight(),
+              // Useful for setting a schedule for the old tasks that don't have one
+              // or to update the schedule if ever the frequency changes in code
+              schedule: SCHEDULE,
             };
           });
       },
     };
   };
 }
-
-function getNextMidnight() {
-  return moment().add(1, 'd').startOf('d').toDate();
-}

x-pack/plugins/task_manager/server/index.ts

@@ -18,6 +18,7 @@ export type {
   EphemeralTask,
   TaskRunCreatorFunction,
   RunContext,
+  IntervalSchedule,
 } from './task';
 
 export { TaskStatus } from './task';

x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/alerting_and_actions_telemetry.ts

@@ -20,8 +20,7 @@ export default function createAlertingAndActionsTelemetryTests({ getService }: F
   const esTestIndexTool = new ESTestIndexTool(es, retry);
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/140973
-  describe.skip('telemetry', () => {
+  describe('telemetry', () => {
     const alwaysFiringRuleId: { [key: string]: string } = {};
 
     beforeEach(async () => {