Skip to content

[7.x] send protocol separately to agent as part of full agent policy (#79781) #79799

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

Merged
neptunian merged 1 commit into from
Oct 7, 2020
Merged

[7.x] send protocol separately to agent as part of full agent policy (#79781) #79799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export interface FullAgentPolicy {
fleet?: {
kibana: {
hosts: string[];
protocol: string;
};
};
inputs: FullAgentPolicyInput[];
Expand Down
9 changes: 6 additions & 3 deletions x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ describe('agent policy', () => {
revision: 1,
fleet: {
kibana: {
hosts: ['http://localhost:5603'],
hosts: ['localhost:5603'],
protocol: 'http',
},
},
agent: {
Expand Down Expand Up @@ -115,7 +116,8 @@ describe('agent policy', () => {
revision: 1,
fleet: {
kibana: {
hosts: ['http://localhost:5603'],
hosts: ['localhost:5603'],
protocol: 'http',
},
},
agent: {
Expand Down Expand Up @@ -150,7 +152,8 @@ describe('agent policy', () => {
revision: 1,
fleet: {
kibana: {
hosts: ['http://localhost:5603'],
hosts: ['localhost:5603'],
protocol: 'http',
},
},
agent: {
Expand Down
10 changes: 8 additions & 2 deletions x-pack/plugins/ingest_manager/server/services/agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,10 +532,16 @@ class AgentPolicyService {
} catch (error) {
throw new Error('Default settings is not setup');
}
if (!settings.kibana_urls) throw new Error('kibana_urls is missing');
if (!settings.kibana_urls || !settings.kibana_urls.length)
throw new Error('kibana_urls is missing');
const hostsWithoutProtocol = settings.kibana_urls.map((url) => {
const parsedURL = new URL(url);
return `${parsedURL.host}${parsedURL.pathname !== '/' ? parsedURL.pathname : ''}`;
});
fullAgentPolicy.fleet = {
kibana: {
hosts: settings.kibana_urls,
protocol: new URL(settings.kibana_urls[0]).protocol.replace(':', ''),
hosts: hostsWithoutProtocol,
},
};
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const { protocol, hostname, port } = kbnTestServer;

const kibanaUrl = Url.format({
protocol,
hostname,
port,
});
Expand Down Expand Up @@ -237,6 +236,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
fleet: {
kibana: {
hosts: [kibanaUrl],
protocol,
},
},
revision: 3,
Expand Down