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

Jump to bottom

[Fleet][Kafka] When compression is enabled, "None" shouldn't be an option for codec #164416

Merged
merged 2 commits into from
Aug 22, 2023
Merged

[Fleet][Kafka] When compression is enabled, "None" shouldn't be an option for codec #164416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6b532
update store after successful put
szwarckonrad Aug 22, 2023
de77d03
proper check
szwarckonrad Aug 22, 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
2 changes: 0 additions & 2 deletions x-pack/plugins/fleet/cypress/e2e/fleet_settings_outputs.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ describe('Outputs', () => {
// Compression
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_CODEC_INPUT).should('not.exist');
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_SWITCH).click();
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_LEVEL_INPUT).should('not.exist');
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_CODEC_INPUT).select('gzip');
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_LEVEL_INPUT).should('exist');
cy.getBySel(SETTINGS_OUTPUTS_KAFKA.COMPRESSION_LEVEL_INPUT).select('1');

Expand Down
8 changes: 4 additions & 4 deletions ...s/fleet/sections/settings/components/edit_output_flyout/output_form_kafka_compression.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ export const OutputFormKafkaCompression: React.FunctionComponent<{

const kafkaCompressionTypeOptions = useMemo(
() =>
(Object.keys(kafkaCompressionType) as Array<keyof typeof kafkaCompressionType>).map(
(key) => ({
(Object.keys(kafkaCompressionType) as Array<keyof typeof kafkaCompressionType>)
.filter((c) => c !== 'None')
.map((key) => ({
text: kafkaCompressionType[key],
label: kafkaCompressionType[key],
})
),
})),
[]
);

Expand Down
12 changes: 9 additions & 3 deletions ...ic/applications/fleet/sections/settings/components/edit_output_flyout/use_output_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ export function useOutputForm(onSucess: () => void, output?: Output) {
isDisabled('compression_level')
);
const kafkaCompressionCodecInput = useInput(
kafkaOutput?.compression ?? kafkaCompressionType.None,
kafkaOutput?.compression && kafkaOutput.compression !== kafkaCompressionType.None
? kafkaOutput.compression
: kafkaCompressionType.Gzip,
undefined,
isDisabled('compression')
);
Expand Down Expand Up @@ -642,8 +644,11 @@ export function useOutputForm(onSucess: () => void, output?: Output) {
client_id: kafkaClientIdInput.value || undefined,
version: kafkaVersionInput.value,
...(kafkaKeyInput.value ? { key: kafkaKeyInput.value } : {}),
compression: kafkaCompressionCodecInput.value,
...(kafkaCompressionCodecInput.value === kafkaCompressionType.Gzip
compression: kafkaCompressionInput.value
? kafkaCompressionCodecInput.value
: kafkaCompressionType.None,
...(kafkaCompressionInput.value &&
kafkaCompressionCodecInput.value === kafkaCompressionType.Gzip
? {
compression_level: parseIntegerIfStringDefined(
kafkaCompressionLevelInput.value
Expand Down Expand Up @@ -785,6 +790,7 @@ export function useOutputForm(onSucess: () => void, output?: Output) {
loadBalanceEnabledInput.value,
typeInput.value,
kafkaSslCertificateAuthoritiesInput.value,
kafkaCompressionInput.value,
nameInput.value,
kafkaHostsInput.value,
defaultOutputInput.value,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import type {
} from '../../types';
import type { FullAgentPolicyOutputPermissions, PackageInfo } from '../../../common/types';
import { agentPolicyService } from '../agent_policy';
import { dataTypes, outputType } from '../../../common/constants';
import { dataTypes, kafkaCompressionType, outputType } from '../../../common/constants';
import { DEFAULT_OUTPUT } from '../../constants';

import { getPackageInfo } from '../epm/packages';
Expand Down Expand Up @@ -344,7 +344,7 @@ export function transformOutputToFullPolicyOutput(
version,
key,
compression,
compression_level,
...(compression === kafkaCompressionType.Gzip ? { compression_level } : {}),
...(username ? { username } : {}),
...(password ? { password } : {}),
...(sasl ? { sasl } : {}),
Expand Down
5 changes: 5 additions & 0 deletions x-pack/plugins/fleet/server/services/output.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,11 @@ class OutputService {
) {
updateData.compression_level = 4;
}
if (data.compression && data.compression !== kafkaCompressionType.Gzip) {
// Clear compression level if compression is not gzip
updateData.compression_level = null;
}

if (!data.client_id) {
updateData.client_id = 'Elastic';
}
Expand Down
Loading