From 151f110d86973ffdb78c22df2a6ec795b2f3a7ce Mon Sep 17 00:00:00 2001 From: yenienserrano Date: Tue, 15 Mar 2022 14:37:04 -0300 Subject: [PATCH 1/2] fix(labels pie chart): Labels removed in pie chart --- .../visualizations/agents/agents-audit.ts | 3 +++ .../visualizations/agents/agents-fim.ts | 7 +++++-- .../visualizations/agents/agents-gdpr.ts | 5 ++++- .../visualizations/agents/agents-nist.ts | 4 ++-- .../visualizations/agents/agents-oscap.ts | 6 ++++++ .../visualizations/agents/agents-pci.ts | 5 ++++- .../visualizations/agents/agents-tsc.ts | 5 ++++- .../visualizations/overview/overview-audit.ts | 4 ++++ .../visualizations/overview/overview-gdpr.ts | 3 ++- .../visualizations/overview/overview-oscap.ts | 17 ++++++++++++++--- .../visualizations/overview/overview-pci.ts | 3 ++- .../visualizations/overview/overview-tsc.ts | 3 ++- 12 files changed, 52 insertions(+), 13 deletions(-) diff --git a/server/integration-files/visualizations/agents/agents-audit.ts b/server/integration-files/visualizations/agents/agents-audit.ts index 8ea15105f3..ca83a843b6 100644 --- a/server/integration-files/visualizations/agents/agents-audit.ts +++ b/server/integration-files/visualizations/agents/agents-audit.ts @@ -349,6 +349,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -387,6 +388,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -528,6 +530,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-fim.ts b/server/integration-files/visualizations/agents/agents-fim.ts index fe808d8a6e..1eeb695ed0 100644 --- a/server/integration-files/visualizations/agents/agents-fim.ts +++ b/server/integration-files/visualizations/agents/agents-fim.ts @@ -23,7 +23,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -71,7 +71,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -245,6 +245,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -316,6 +317,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -381,6 +383,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-gdpr.ts b/server/integration-files/visualizations/agents/agents-gdpr.ts index 61719f8bbd..a4508d3e49 100644 --- a/server/integration-files/visualizations/agents/agents-gdpr.ts +++ b/server/integration-files/visualizations/agents/agents-gdpr.ts @@ -23,6 +23,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -61,6 +62,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -99,6 +101,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -137,7 +140,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-nist.ts b/server/integration-files/visualizations/agents/agents-nist.ts index 35556a42e5..9819657997 100644 --- a/server/integration-files/visualizations/agents/agents-nist.ts +++ b/server/integration-files/visualizations/agents/agents-nist.ts @@ -81,7 +81,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, - labels: { show: false, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, dimensions: { metric: { accessor: 0, format: { id: 'number' }, params: {}, aggType: 'count' }, }, @@ -264,7 +264,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-oscap.ts b/server/integration-files/visualizations/agents/agents-oscap.ts index 1d08d8de65..99b6030d8a 100644 --- a/server/integration-files/visualizations/agents/agents-oscap.ts +++ b/server/integration-files/visualizations/agents/agents-oscap.ts @@ -245,6 +245,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -283,6 +284,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -379,6 +381,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -470,6 +473,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -671,6 +675,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -736,6 +741,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-pci.ts b/server/integration-files/visualizations/agents/agents-pci.ts index e4be9be4fc..a41ebe0164 100644 --- a/server/integration-files/visualizations/agents/agents-pci.ts +++ b/server/integration-files/visualizations/agents/agents-pci.ts @@ -23,6 +23,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -61,6 +62,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -99,6 +101,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -137,7 +140,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/agents/agents-tsc.ts b/server/integration-files/visualizations/agents/agents-tsc.ts index ac962b17e5..c70bbb974f 100644 --- a/server/integration-files/visualizations/agents/agents-tsc.ts +++ b/server/integration-files/visualizations/agents/agents-tsc.ts @@ -23,6 +23,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -61,6 +62,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -99,6 +101,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -137,7 +140,7 @@ export default [ addLegend: false, legendPosition: 'right', isDonut: true, - labels: { show: true, values: true, last_level: true, truncate: 100 }, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/overview/overview-audit.ts b/server/integration-files/visualizations/overview/overview-audit.ts index f154d180dd..5b29e42f1e 100644 --- a/server/integration-files/visualizations/overview/overview-audit.ts +++ b/server/integration-files/visualizations/overview/overview-audit.ts @@ -23,6 +23,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -61,6 +62,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -99,6 +101,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -137,6 +140,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/overview/overview-gdpr.ts b/server/integration-files/visualizations/overview/overview-gdpr.ts index 676d7ee5f7..bfd5cfdda7 100644 --- a/server/integration-files/visualizations/overview/overview-gdpr.ts +++ b/server/integration-files/visualizations/overview/overview-gdpr.ts @@ -348,7 +348,8 @@ export default [ addTooltip: true, addLegend: true, legendPosition: 'right', - isDonut: false, + isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/overview/overview-oscap.ts b/server/integration-files/visualizations/overview/overview-oscap.ts index 67fbde89c1..9e6e89da91 100644 --- a/server/integration-files/visualizations/overview/overview-oscap.ts +++ b/server/integration-files/visualizations/overview/overview-oscap.ts @@ -170,9 +170,15 @@ export default [ _source: { title: 'Agents', visState: JSON.stringify({ - params: { isDonut: false, shareYAxis: true, addTooltip: true, addLegend: true }, listeners: {}, type: 'pie', + params: { + isDonut: true, + shareYAxis: true, + addTooltip: true, + addLegend: true, + labels: { show: false } + }, aggs: [ { type: 'count', enabled: true, id: '1', params: {}, schema: 'metric' }, { @@ -231,11 +237,12 @@ export default [ title: 'Profiles', visState: JSON.stringify({ params: { - isDonut: false, + isDonut: true, legendPosition: 'right', shareYAxis: true, addTooltip: true, addLegend: true, + labels: { show: false } }, listeners: {}, type: 'pie', @@ -302,11 +309,12 @@ export default [ title: 'Content', visState: JSON.stringify({ params: { - isDonut: false, + isDonut: true, legendPosition: 'right', shareYAxis: true, addTooltip: true, addLegend: true, + labels: { show: false } }, listeners: {}, type: 'pie', @@ -375,6 +383,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -569,6 +578,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, @@ -634,6 +644,7 @@ export default [ addLegend: true, legendPosition: 'right', isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/overview/overview-pci.ts b/server/integration-files/visualizations/overview/overview-pci.ts index bbdded7601..8250e34e78 100644 --- a/server/integration-files/visualizations/overview/overview-pci.ts +++ b/server/integration-files/visualizations/overview/overview-pci.ts @@ -348,7 +348,8 @@ export default [ addTooltip: true, addLegend: true, legendPosition: 'right', - isDonut: false, + isDonut: true, + labels: { show: false } }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, diff --git a/server/integration-files/visualizations/overview/overview-tsc.ts b/server/integration-files/visualizations/overview/overview-tsc.ts index d083a04bcd..67a5f335cc 100644 --- a/server/integration-files/visualizations/overview/overview-tsc.ts +++ b/server/integration-files/visualizations/overview/overview-tsc.ts @@ -348,7 +348,8 @@ export default [ addTooltip: true, addLegend: true, legendPosition: 'right', - isDonut: false, + isDonut: true, + labels: { show: false }, }, aggs: [ { id: '1', enabled: true, type: 'count', schema: 'metric', params: {} }, From 0a4060cfb1ce242d523481dc060ccec95dfc6ad0 Mon Sep 17 00:00:00 2001 From: yenienserrano Date: Tue, 5 Apr 2022 12:13:15 +0200 Subject: [PATCH 2/2] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 034a00c15b..386f19c6bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ All notable changes to the Wazuh app project will be documented in this file. - Changed user for sample data management [#3795](https://github.com/wazuh/wazuh-kibana-app/pull/3795) - Changed agent install codeblock copy button and powershell terminal warning [#3792](https://github.com/wazuh/wazuh-kibana-app/pull/3792) - Refactored as the plugin platform name and references is managed [#3811](https://github.com/wazuh/wazuh-kibana-app/pull/3811) +- Labels removed in the pie chart [#3898](https://github.com/wazuh/wazuh-kibana-app/pull/3898) ### Fixed