Skip to content

Commit 9df7614

Browse files
csatib02csatib02
authored
Merge pull request #2118 from kube-logging/fix/disable-metrics-endpoint-by-default
fix: enable disabling metrics endpoint and service creation by default
2 parents c224a45 + f5916d5 commit 9df7614

36 files changed

+287
-35
lines changed

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,8 @@ spec:
792792
type: object
793793
bufferVolumeMetrics:
794794
properties:
795+
enabled:
796+
type: boolean
795797
interval:
796798
type: string
797799
path:
@@ -1711,6 +1713,8 @@ spec:
17111713
type: string
17121714
metrics:
17131715
properties:
1716+
enabled:
1717+
type: boolean
17141718
interval:
17151719
type: string
17161720
path:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,8 @@ spec:
782782
type: object
783783
bufferVolumeMetrics:
784784
properties:
785+
enabled:
786+
type: boolean
785787
interval:
786788
type: string
787789
path:
@@ -1866,6 +1868,8 @@ spec:
18661868
type: string
18671869
metrics:
18681870
properties:
1871+
enabled:
1872+
type: boolean
18691873
interval:
18701874
type: string
18711875
path:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,6 +1653,8 @@ spec:
16531653
type: object
16541654
bufferVolumeMetrics:
16551655
properties:
1656+
enabled:
1657+
type: boolean
16561658
interval:
16571659
type: string
16581660
path:
@@ -2572,6 +2574,8 @@ spec:
25722574
type: string
25732575
metrics:
25742576
properties:
2577+
enabled:
2578+
type: boolean
25752579
interval:
25762580
type: string
25772581
path:
@@ -4371,6 +4375,8 @@ spec:
43714375
type: object
43724376
bufferVolumeMetrics:
43734377
properties:
4378+
enabled:
4379+
type: boolean
43744380
interval:
43754381
type: string
43764382
path:
@@ -5455,6 +5461,8 @@ spec:
54555461
type: string
54565462
metrics:
54575463
properties:
5464+
enabled:
5465+
type: boolean
54585466
interval:
54595467
type: string
54605468
path:
@@ -7821,6 +7829,8 @@ spec:
78217829
properties:
78227830
bufferVolumeMetrics:
78237831
properties:
7832+
enabled:
7833+
type: boolean
78247834
interval:
78257835
type: string
78267836
mount_name:
@@ -11877,6 +11887,8 @@ spec:
1187711887
type: integer
1187811888
metrics:
1187911889
properties:
11890+
enabled:
11891+
type: boolean
1188011892
interval:
1188111893
type: string
1188211894
path:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
properties:
3434
bufferVolumeMetrics:
3535
properties:
36+
enabled:
37+
type: boolean
3638
interval:
3739
type: string
3840
mount_name:
@@ -4089,6 +4091,8 @@ spec:
40894091
type: integer
40904092
metrics:
40914093
properties:
4094+
enabled:
4095+
type: boolean
40924096
interval:
40934097
type: string
40944098
path:

‎charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,8 @@ spec:
789789
type: object
790790
bufferVolumeMetrics:
791791
properties:
792+
enabled:
793+
type: boolean
792794
interval:
793795
type: string
794796
path:
@@ -1708,6 +1710,8 @@ spec:
17081710
type: string
17091711
metrics:
17101712
properties:
1713+
enabled:
1714+
type: boolean
17111715
interval:
17121716
type: string
17131717
path:

‎charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ spec:
779779
type: object
780780
bufferVolumeMetrics:
781781
properties:
782+
enabled:
783+
type: boolean
782784
interval:
783785
type: string
784786
path:
@@ -1863,6 +1865,8 @@ spec:
18631865
type: string
18641866
metrics:
18651867
properties:
1868+
enabled:
1869+
type: boolean
18661870
interval:
18671871
type: string
18681872
path:

‎charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,6 +1650,8 @@ spec:
16501650
type: object
16511651
bufferVolumeMetrics:
16521652
properties:
1653+
enabled:
1654+
type: boolean
16531655
interval:
16541656
type: string
16551657
path:
@@ -2569,6 +2571,8 @@ spec:
25692571
type: string
25702572
metrics:
25712573
properties:
2574+
enabled:
2575+
type: boolean
25722576
interval:
25732577
type: string
25742578
path:
@@ -4368,6 +4372,8 @@ spec:
43684372
type: object
43694373
bufferVolumeMetrics:
43704374
properties:
4375+
enabled:
4376+
type: boolean
43714377
interval:
43724378
type: string
43734379
path:
@@ -5452,6 +5458,8 @@ spec:
54525458
type: string
54535459
metrics:
54545460
properties:
5461+
enabled:
5462+
type: boolean
54555463
interval:
54565464
type: string
54575465
path:
@@ -7818,6 +7826,8 @@ spec:
78187826
properties:
78197827
bufferVolumeMetrics:
78207828
properties:
7829+
enabled:
7830+
type: boolean
78217831
interval:
78227832
type: string
78237833
mount_name:
@@ -11874,6 +11884,8 @@ spec:
1187411884
type: integer
1187511885
metrics:
1187611886
properties:
11887+
enabled:
11888+
type: boolean
1187711889
interval:
1187811890
type: string
1187911891
path:

‎charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ spec:
3030
properties:
3131
bufferVolumeMetrics:
3232
properties:
33+
enabled:
34+
type: boolean
3335
interval:
3436
type: string
3537
mount_name:
@@ -4086,6 +4088,8 @@ spec:
40864088
type: integer
40874089
metrics:
40884090
properties:
4091+
enabled:
4092+
type: boolean
40894093
interval:
40904094
type: string
40914095
path:

‎config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,8 @@ spec:
789789
type: object
790790
bufferVolumeMetrics:
791791
properties:
792+
enabled:
793+
type: boolean
792794
interval:
793795
type: string
794796
path:
@@ -1708,6 +1710,8 @@ spec:
17081710
type: string
17091711
metrics:
17101712
properties:
1713+
enabled:
1714+
type: boolean
17111715
interval:
17121716
type: string
17131717
path:

‎config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ spec:
779779
type: object
780780
bufferVolumeMetrics:
781781
properties:
782+
enabled:
783+
type: boolean
782784
interval:
783785
type: string
784786
path:
@@ -1863,6 +1865,8 @@ spec:
18631865
type: string
18641866
metrics:
18651867
properties:
1868+
enabled:
1869+
type: boolean
18661870
interval:
18671871
type: string
18681872
path:

0 commit comments

Comments
 (0)