Skip to content

Commit 6c98f48

Browse files
jpinsonneaujpinsonneau
committed
removed unecessary fields in the setup and improve display
1 parent 0de5d17 commit 6c98f48

File tree

2 files changed

+75
-12
lines changed

2 files changed

+75
-12
lines changed

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

Lines changed: 74 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ export const FlowCollectorUISchema: UiSchema = {
6262
sasl: {
6363
'ui:title': 'SASL',
6464
'ui:description': 'SASL authentication configuration. Unsupported.',
65+
type: {
66+
'ui:title': 'Type'
67+
},
6568
clientIDReference: {
69+
'ui:title': 'Client ID reference',
6670
'ui:order': ['file', 'name', 'namespace', 'type']
6771
},
6872
clientSecretReference: {
73+
'ui:title': 'Client secret reference',
6974
'ui:order': ['file', 'name', 'namespace', 'type']
7075
},
7176
'ui:order': ['type', 'clientIDReference', 'clientSecretReference']
@@ -994,6 +999,7 @@ export const FlowCollectorUISchema: UiSchema = {
994999
manual: {
9951000
'ui:title': 'Manual',
9961001
'ui:description': 'Prometheus configuration for manual mode.',
1002+
'ui:flat': 'true',
9971003
'ui:dependency': {
9981004
controlFieldPath: ['prometheus', 'querier', 'mode'],
9991005
controlFieldValue: 'Manual',
@@ -1044,6 +1050,7 @@ export const FlowCollectorUISchema: UiSchema = {
10441050
},
10451051
manual: {
10461052
'ui:title': 'Manual',
1053+
'ui:flat': 'true',
10471054
'ui:dependency': {
10481055
controlFieldPath: ['loki', 'mode'],
10491056
controlFieldValue: 'Manual',
@@ -1104,6 +1111,7 @@ export const FlowCollectorUISchema: UiSchema = {
11041111
},
11051112
monolithic: {
11061113
'ui:title': 'Monolithic',
1114+
'ui:flat': 'true',
11071115
'ui:dependency': {
11081116
controlFieldPath: ['loki', 'mode'],
11091117
controlFieldValue: 'Monolithic',
@@ -1137,6 +1145,7 @@ export const FlowCollectorUISchema: UiSchema = {
11371145
},
11381146
microservices: {
11391147
'ui:title': 'Microservices',
1148+
'ui:flat': 'true',
11401149
'ui:dependency': {
11411150
controlFieldPath: ['loki', 'mode'],
11421151
controlFieldValue: 'Microservices',
@@ -1173,6 +1182,7 @@ export const FlowCollectorUISchema: UiSchema = {
11731182
},
11741183
lokiStack: {
11751184
'ui:title': 'Loki stack',
1185+
'ui:flat': 'true',
11761186
'ui:dependency': {
11771187
controlFieldPath: ['loki', 'mode'],
11781188
controlFieldValue: 'LokiStack',
@@ -1188,24 +1198,30 @@ export const FlowCollectorUISchema: UiSchema = {
11881198
},
11891199
readTimeout: {
11901200
'ui:title': 'Read timeout',
1191-
'ui:description': 'The maximum console plugin loki query total time limit.\nA timeout of zero means no timeout.'
1201+
'ui:description':
1202+
'The maximum console plugin loki query total time limit.\nA timeout of zero means no timeout.',
1203+
'ui:widget': 'hidden'
11921204
},
11931205
writeTimeout: {
11941206
'ui:title': 'Write timeout',
1195-
'ui:description': 'The maximum Loki time connection / request limit.\nA timeout of zero means no timeout.'
1207+
'ui:description': 'The maximum Loki time connection / request limit.\nA timeout of zero means no timeout.',
1208+
'ui:widget': 'hidden'
11961209
},
11971210
writeBatchWait: {
11981211
'ui:title': 'Write batch wait',
1199-
'ui:description': 'The maximum time to wait before sending a Loki batch.'
1212+
'ui:description': 'The maximum time to wait before sending a Loki batch.',
1213+
'ui:widget': 'hidden'
12001214
},
12011215
writeBatchSize: {
12021216
'ui:title': 'Write batch size',
1203-
'ui:description': 'The maximum batch size (in bytes) of Loki logs to accumulate before sending.'
1217+
'ui:description': 'The maximum batch size (in bytes) of Loki logs to accumulate before sending.',
1218+
'ui:widget': 'hidden'
12041219
},
12051220
advanced: {
12061221
'ui:title': 'Advanced configuration',
12071222
'ui:description':
12081223
'Internal configuration of the Loki clients.\nThis section is aimed mostly for debugging and fine-grained performance optimizations.',
1224+
'ui:widget': 'hidden',
12091225
staticLabels: {
12101226
'ui:title': 'Static labels',
12111227
'ui:description': 'A map of common labels to set on each flow in Loki storage.'
@@ -1255,6 +1271,7 @@ export const FlowCollectorUISchema: UiSchema = {
12551271
portNaming: {
12561272
'ui:title': 'Port naming',
12571273
'ui:description': 'The configuration of the port-to-service name translation',
1274+
'ui:widget': 'hidden',
12581275
enable: {
12591276
'ui:title': 'Enable'
12601277
},
@@ -1276,6 +1293,7 @@ export const FlowCollectorUISchema: UiSchema = {
12761293
quickFilters: {
12771294
'ui:title': 'Quick filters',
12781295
'ui:description': 'Configure quick filter presets for the Console plugin',
1296+
'ui:widget': 'hidden',
12791297
items: {
12801298
'ui:order': ['filter', 'name', 'default']
12811299
}
@@ -1364,6 +1382,7 @@ export const FlowCollectorUISchema: UiSchema = {
13641382
'ui:title': 'Advanced configuration',
13651383
'ui:description':
13661384
'Internal configuration of the console plugin.\nThis section is aimed mostly for debugging and fine-grained performance optimizations, such as `GOGC` and `GOMAXPROCS` env vars. Set these values at your own risk.',
1385+
'ui:widget': 'hidden',
13671386
'ui:order': ['args', 'env', 'port', 'register', 'scheduling'],
13681387
scheduling: {
13691388
'ui:widget': 'hidden',
@@ -1589,20 +1608,37 @@ export const FlowCollectorUISchema: UiSchema = {
15891608
},
15901609
ipfix: {
15911610
'ui:title': 'IPFIX configuration',
1611+
'ui:flat': 'true',
15921612
'ui:dependency': {
15931613
controlFieldPath: ['exporters', 'type'],
15941614
controlFieldValue: 'IPFIX',
15951615
controlFieldName: 'type'
15961616
},
1617+
targetHost: {
1618+
'ui:title': 'Target host'
1619+
},
1620+
targetPort: {
1621+
'ui:title': 'Target port'
1622+
},
1623+
transport: {
1624+
'ui:title': 'Transport'
1625+
},
15971626
'ui:order': ['targetHost', 'targetPort', 'transport']
15981627
},
15991628
kafka: {
16001629
'ui:title': 'Kafka configuration',
1630+
'ui:flat': 'true',
16011631
'ui:dependency': {
16021632
controlFieldPath: ['exporters', 'type'],
16031633
controlFieldValue: 'Kafka',
16041634
controlFieldName: 'type'
16051635
},
1636+
address: {
1637+
'ui:title': 'Address'
1638+
},
1639+
topic: {
1640+
'ui:title': 'Topic'
1641+
},
16061642
tls: {
16071643
'ui:title': 'TLS configuration',
16081644
enable: {
@@ -1624,10 +1660,15 @@ export const FlowCollectorUISchema: UiSchema = {
16241660
sasl: {
16251661
'ui:title': 'SASL',
16261662
'ui:description': 'SASL authentication configuration. Unsupported.',
1663+
type: {
1664+
'ui:title': 'Type'
1665+
},
16271666
clientIDReference: {
1667+
'ui:title': 'Client ID reference',
16281668
'ui:order': ['file', 'name', 'namespace', 'type']
16291669
},
16301670
clientSecretReference: {
1671+
'ui:title': 'Client secret reference',
16311672
'ui:order': ['file', 'name', 'namespace', 'type']
16321673
},
16331674
'ui:order': ['type', 'clientIDReference', 'clientSecretReference']
@@ -1636,18 +1677,44 @@ export const FlowCollectorUISchema: UiSchema = {
16361677
},
16371678
openTelemetry: {
16381679
'ui:title': 'OpenTelemetry configuration',
1680+
'ui:flat': 'true',
16391681
'ui:dependency': {
16401682
controlFieldPath: ['exporters', 'type'],
16411683
controlFieldValue: 'OpenTelemetry',
16421684
controlFieldName: 'type'
16431685
},
1644-
'ui:order': ['targetHost', 'targetPort', 'fieldsMapping', 'headers', 'logs', 'metrics', 'protocol', 'tls'],
1686+
targetHost: {
1687+
'ui:title': 'Target host'
1688+
},
1689+
targetPort: {
1690+
'ui:title': 'Target port'
1691+
},
1692+
protocol: {
1693+
'ui:title': 'Protocol'
1694+
},
16451695
fieldsMapping: {
1696+
'ui:title': 'Fields mapping',
16461697
items: {
1698+
input: {
1699+
'ui:title': 'Input field'
1700+
},
1701+
multiplier: {
1702+
'ui:title': 'Multiplier'
1703+
},
1704+
output: {
1705+
'ui:title': 'Output field'
1706+
},
16471707
'ui:order': ['input', 'multiplier', 'output']
16481708
}
16491709
},
16501710
metrics: {
1711+
'ui:title': 'Metrics',
1712+
enable: {
1713+
'ui:title': 'Enable'
1714+
},
1715+
pushTimeInterval: {
1716+
'ui:title': 'Push time interval'
1717+
},
16511718
'ui:order': ['enable', 'pushTimeInterval']
16521719
},
16531720
tls: {
@@ -1667,7 +1734,8 @@ export const FlowCollectorUISchema: UiSchema = {
16671734
'ui:title': 'Insecure skip verify'
16681735
},
16691736
'ui:order': ['enable', 'caCert', 'userCert', 'insecureSkipVerify']
1670-
}
1737+
},
1738+
'ui:order': ['targetHost', 'targetPort', 'protocol', 'fieldsMapping', 'headers', 'logs', 'metrics', 'tls']
16711739
},
16721740
'ui:order': ['type', 'ipfix', 'kafka', 'openTelemetry']
16731741
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ export const FlowCollectorWizard: FC<FlowCollectorWizardProps> = props => {
7777
setPaths([
7878
'spec.deploymentModel',
7979
'spec.kafka',
80-
'spec.agent.ebpf.kafkaBatchSize',
81-
'spec.processor.kafkaConsumerQueueCapacity',
82-
'spec.processor.kafkaConsumerAutoscaler',
83-
'spec.processor.kafkaConsumerReplicas',
84-
'spec.processor.kafkaConsumerBatchSize',
8580
'spec.processor.advanced.secondaryNetworks.items',
8681
'spec.exporters.items'
8782
]);
@@ -93,7 +88,7 @@ export const FlowCollectorWizard: FC<FlowCollectorWizardProps> = props => {
9388
setPaths(['spec.prometheus.querier']);
9489
break;
9590
case 'console':
96-
setPaths(['spec.consolePlugin']);
91+
setPaths(['spec.consolePlugin.enable', 'spec.consolePlugin.replicas']);
9792
break;
9893
default:
9994
setPaths([]);

0 commit comments

Comments
 (0)