Collect agent telemetry even when fleet server is disabled.

elastic · Mar 2, 2021 · 8c9c0a3 · 8c9c0a3
1 parent c116477
commit 8c9c0a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
@@ -6,6 +6,7 @@
  */
 
 import { ElasticsearchClient, SavedObjectsClient } from 'kibana/server';
+import { FleetConfigType } from '../../common/types';
 import * as AgentService from '../services/agents';
 import { isFleetServerSetup } from '../services/fleet_server';
 
@@ -17,11 +18,13 @@ export interface AgentUsage {
 }
 
 export const getAgentUsage = async (
+  config: FleetConfigType,
   soClient?: SavedObjectsClient,
   esClient?: ElasticsearchClient
 ): Promise<AgentUsage> => {
   // TODO: unsure if this case is possible at all.
-  if (!soClient || !esClient || !(await isFleetServerSetup())) {
+  const fleetServerMissing = config.agents.fleetServerEnabled && !(await isFleetServerSetup());
+  if (!soClient || !esClient || fleetServerMissing) {
     return {
       total: 0,
       online: 0,

diff --git a/x-pack/plugins/fleet/server/collectors/register.ts b/x-pack/plugins/fleet/server/collectors/register.ts
@@ -38,7 +38,7 @@ export function registerFleetUsageCollector(
       const [soClient, esClient] = await getInternalClients(core);
       return {
         agents_enabled: getIsAgentsEnabled(config),
-        agents: await getAgentUsage(soClient, esClient),
+        agents: await getAgentUsage(config, soClient, esClient),
         packages: await getPackageUsage(soClient),
       };
     },