diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts index 7d50e05398c09..c9e1cf6915bba 100644 --- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts +++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts @@ -47,8 +47,8 @@ describe('Security UsageCollector', () => { enabledAuthProviders: ['basic'], loginSelectorEnabled: false, httpAuthSchemes: ['apikey'], - sessionIdleTimeoutMinutes: 60, - sessionLifespanMinutes: 43200, + sessionIdleTimeoutInMinutes: 60, + sessionLifespanInMinutes: 43200, }; describe('initialization', () => { @@ -106,8 +106,8 @@ describe('Security UsageCollector', () => { enabledAuthProviders: [], loginSelectorEnabled: false, httpAuthSchemes: [], - sessionIdleTimeoutMinutes: 0, - sessionLifespanMinutes: 0, + sessionIdleTimeoutInMinutes: 0, + sessionLifespanInMinutes: 0, }); }); @@ -489,8 +489,8 @@ describe('Security UsageCollector', () => { expect(usage).toEqual({ ...DEFAULT_USAGE, - sessionIdleTimeoutMinutes: 123, - sessionLifespanMinutes: 456, + sessionIdleTimeoutInMinutes: 123, + sessionLifespanInMinutes: 456, }); }); }); diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts index fa79eeda58bcd..5703969c4df79 100644 --- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts +++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts @@ -18,8 +18,8 @@ interface Usage { authProviderCount: number; enabledAuthProviders: string[]; httpAuthSchemes: string[]; - sessionIdleTimeoutMinutes: number; - sessionLifespanMinutes: number; + sessionIdleTimeoutInMinutes: number; + sessionLifespanInMinutes: number; } interface Deps { @@ -108,14 +108,14 @@ export function registerSecurityUsageCollector({ usageCollection, config, licens }, }, }, - sessionIdleTimeoutMinutes: { + sessionIdleTimeoutInMinutes: { type: 'long', _meta: { description: 'The global session idle timeout expiration that is configured, in minutes (0 if disabled).', }, }, - sessionLifespanMinutes: { + sessionLifespanInMinutes: { type: 'long', _meta: { description: @@ -138,8 +138,8 @@ export function registerSecurityUsageCollector({ usageCollection, config, licens authProviderCount: 0, enabledAuthProviders: [], httpAuthSchemes: [], - sessionIdleTimeoutMinutes: 0, - sessionLifespanMinutes: 0, + sessionIdleTimeoutInMinutes: 0, + sessionLifespanInMinutes: 0, }; } @@ -173,8 +173,8 @@ export function registerSecurityUsageCollector({ usageCollection, config, licens ); const sessionExpirations = config.session.getExpirationTimeouts(); // get global expiration values - const sessionIdleTimeoutMinutes = sessionExpirations.idleTimeout?.asMinutes() ?? 0; - const sessionLifespanMinutes = sessionExpirations.lifespan?.asMinutes() ?? 0; + const sessionIdleTimeoutInMinutes = sessionExpirations.idleTimeout?.asMinutes() ?? 0; + const sessionLifespanInMinutes = sessionExpirations.lifespan?.asMinutes() ?? 0; return { auditLoggingEnabled: legacyAuditLoggingEnabled || ecsAuditLoggingEnabled, @@ -184,8 +184,8 @@ export function registerSecurityUsageCollector({ usageCollection, config, licens authProviderCount, enabledAuthProviders, httpAuthSchemes, - sessionIdleTimeoutMinutes, - sessionLifespanMinutes, + sessionIdleTimeoutInMinutes, + sessionLifespanInMinutes, }; }, }); diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json index c0bfe26d05914..10c84ecc06d5a 100644 --- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json +++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @@ -5497,13 +5497,13 @@ } } }, - "sessionIdleTimeoutMinutes": { + "sessionIdleTimeoutInMinutes": { "type": "long", "_meta": { "description": "The global session idle timeout expiration that is configured, in minutes (0 if disabled)." } }, - "sessionLifespanMinutes": { + "sessionLifespanInMinutes": { "type": "long", "_meta": { "description": "The global session lifespan expiration that is configured, in minutes (0 if disabled)."