hide filters from forms

Author: jpinsonneau

web/locales/en/plugin__netobserv-plugin.json

@@ -199,8 +199,6 @@
   "Network Observability Operator deploys a monitoring pipeline that consists in:\n - an eBPF agent, that generates network flows from captured packets\n - flowlogs-pipeline, a component that collects, enriches and exports these flows\n - a Console plugin for flows visualization with powerful filtering options, a topology representation and more\n\nFlow data is then available in multiple ways, each optional:\n - As Prometheus metrics\n - As raw flow logs stored in Grafana Loki\n - As raw flow logs exported to a collector\n\nThe FlowCollector resource is used to configure the operator and its managed components.\nThis setup will guide you on the common aspects of the FlowCollector configuration.": "Network Observability Operator deploys a monitoring pipeline that consists in:\n - an eBPF agent, that generates network flows from captured packets\n - flowlogs-pipeline, a component that collects, enriches and exports these flows\n - a Console plugin for flows visualization with powerful filtering options, a topology representation and more\n\nFlow data is then available in multiple ways, each optional:\n - As Prometheus metrics\n - As raw flow logs stored in Grafana Loki\n - As raw flow logs exported to a collector\n\nThe FlowCollector resource is used to configure the operator and its managed components.\nThis setup will guide you on the common aspects of the FlowCollector configuration.",
   "Operator configuration": "Operator configuration",
   "Capture": "Capture",
-  "Filters": "Filters",
-  "Options": "Options",
   "Pipeline": "Pipeline",
   "Storage": "Storage",
   "Integration": "Integration",

web/src/components/forms/config/uiSchema.ts

@@ -102,6 +102,7 @@ export const FlowCollectorUISchema: UiSchema = {
         flowFilter: {
           'ui:title': 'Filters',
           'ui:description': 'The eBPF agent configuration regarding flow filtering.',
+          'ui:widget': 'hidden',
           enable: {
             'ui:title': 'Enable flow filtering'
           },
@@ -479,6 +480,7 @@ export const FlowCollectorUISchema: UiSchema = {
         'ui:title': 'Filters',
         'ui:description':
           'Define custom filters to limit the amount of generated flows.\nThese filters provide more flexibility than the eBPF Agent filters (in `spec.agent.ebpf.flowFilter`), such as allowing to filter by Kubernetes namespace, but with a lesser improvement in performance. Unsupported.',
+        'ui:widget': 'hidden',
         items: {
           'ui:order': ['allOf', 'outputTarget', 'sampling'],
           allOf: {

web/src/components/forms/flowCollector-wizard.tsx

@@ -66,10 +66,7 @@ export const FlowCollectorWizard: FC<FlowCollectorWizardProps> = props => {
         case 'overview':
           setPaths(defaultPaths);
           break;
-        case 'filters':
-          setPaths(['spec.agent.ebpf.flowFilter.enable', 'spec.agent.ebpf.flowFilter.rules', 'spec.processor.filters']);
-          break;
-        case 'options':
+        case 'capture':
           setPaths([
             'spec.agent.ebpf.sampling',
             'spec.agent.ebpf.privileged',
@@ -151,11 +148,9 @@ export const FlowCollectorWizard: FC<FlowCollectorWizardProps> = props => {
                     </span>
                     {form()}
                   </WizardStep>
-                  <WizardStep
-                    name={t('Capture')}
-                    id="capture"
-                    steps={[step('filters', t('Filters')), step('options', t('Options'))]}
-                  />
+                  <WizardStep name={t('Capture')} id="capture">
+                    {form()}
+                  </WizardStep>
                   <WizardStep name={t('Pipeline')} id="pipeline">
                     {form()}
                   </WizardStep>