Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fleet] agent_status total deprecated, added all and active #151564

Merged
merged 3 commits into from
Feb 22, 2023
Merged

[Fleet] agent_status total deprecated, added all and active #151564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b08ab5e
agent_status total deprecated, added all and active
juliaElastic Feb 17, 2023
86505c6
fix test
juliaElastic Feb 17, 2023
824d3b4
fix type used in security plugin
juliaElastic Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions x-pack/plugins/fleet/common/openapi/bundled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,10 +1302,17 @@
"type": "integer"
},
"total": {
"type": "integer"
"type": "integer",
"deprecated": true
},
"updating": {
"type": "integer"
},
"all": {
"type": "integer"
},
"active": {
"type": "integer"
}
},
"required": [
Expand All @@ -1316,7 +1323,9 @@
"online",
"other",
"total",
"updating"
"updating",
"all",
"active"
ashokaditya marked this conversation as resolved.
Show resolved Hide resolved
]
}
}
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/fleet/common/openapi/bundled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,8 +820,13 @@ paths:
type: integer
total:
type: integer
deprecated: true
updating:
type: integer
all:
type: integer
active:
type: integer
required:
- error
- events
Expand All @@ -831,6 +836,8 @@ paths:
- other
- total
- updating
- all
- active
operationId: get-agent-status
parameters:
- schema:
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/fleet/common/openapi/paths/agent_status.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@ get:
type: integer
total:
type: integer
deprecated: true
updating:
type: integer
all:
type: integer
active:
type: integer
required:
- error
- events
Expand All @@ -36,6 +41,8 @@ get:
- other
- total
- updating
- all
- active
operationId: get-agent-status
parameters:
- schema:
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/fleet/common/types/rest_spec/agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ export interface GetAgentStatusRequest {
export interface GetAgentStatusResponse {
results: {
events: number;
// deprecated
total: number;
online: number;
error: number;
Expand All @@ -193,6 +194,8 @@ export interface GetAgentStatusResponse {
updating: number;
inactive: number;
unenrolled: number;
all: number;
active: number;
};
}

Expand Down
10 changes: 6 additions & 4 deletions x-pack/plugins/fleet/server/services/agents/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,18 @@ export async function getAgentStatusForAgentPolicy(

const { healthy: online, unhealthy: error, ...otherStatuses } = agentStatusesToSummary(statuses);
const combinedStatuses = { online, error, ...otherStatuses };
const allStatuses = Object.values(statuses).reduce((acc, val) => acc + val, 0);
const allActive = allStatuses - combinedStatuses.unenrolled - combinedStatuses.inactive;
return {
...combinedStatuses,
/* @deprecated no agents will have other status */
other: 0,
/* @deprecated Agent events do not exists anymore */
events: 0,
total:
Object.values(statuses).reduce((acc, val) => acc + val, 0) -
combinedStatuses.unenrolled -
combinedStatuses.inactive,
/* @deprecated use active instead */
total: allActive,
all: allStatuses,
active: allActive,
};
}
export async function getIncomingDataByAgentsId(
Expand Down
2 changes: 2 additions & 0 deletions ...blic/management/pages/policy/store/policy_details/reducer/initial_policy_details_state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export const initialPolicyDetailsState: () => Immutable<PolicyDetailsState> = ()
online: 0,
total: 0,
other: 0,
all: 0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got a question, what about all the places where we already use the .total? Should we change all the .total references by .all? Or, is .total still working as before?

Copy link
Contributor Author

@juliaElastic juliaElastic Feb 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, total still works as it is only deprecated, it should be changed eventually by the time the deprecation is removed (next major)

active: 0,
},
artifacts: {
location: {
Expand Down
4 changes: 4 additions & 0 deletions x-pack/test/fleet_api_integration/apis/agents/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ export default function ({ getService }: FtrProviderContext) {
other: 0,
total: 8,
online: 2,
active: 8,
all: 11,
error: 2,
offline: 1,
updating: 3,
Expand Down Expand Up @@ -298,6 +300,8 @@ export default function ({ getService }: FtrProviderContext) {
other: 0,
total: 10,
online: 3,
active: 10,
all: 11,
error: 2,
offline: 1,
updating: 4,
Expand Down