From 2f9b9b6c00916bf0eb947cac95f8dbb0dff56a02 Mon Sep 17 00:00:00 2001 From: Bence Csati Date: Thu, 28 Nov 2024 16:01:09 +0100 Subject: [PATCH 1/2] breaking: remove sumologic filter and output, enchance_k8s filter Signed-off-by: Bence Csati --- .../logging.banzaicloud.io_clusterflows.yaml | 410 ------------------ ...logging.banzaicloud.io_clusteroutputs.yaml | 312 ------------- .../logging.banzaicloud.io_flows.yaml | 410 ------------------ .../logging.banzaicloud.io_loggings.yaml | 410 ------------------ .../logging.banzaicloud.io_outputs.yaml | 312 ------------- .../logging.banzaicloud.io_clusterflows.yaml | 410 ------------------ ...logging.banzaicloud.io_clusteroutputs.yaml | 312 ------------- .../crds/logging.banzaicloud.io_flows.yaml | 410 ------------------ .../crds/logging.banzaicloud.io_loggings.yaml | 410 ------------------ .../crds/logging.banzaicloud.io_outputs.yaml | 312 ------------- .../logging.banzaicloud.io_clusterflows.yaml | 410 ------------------ ...logging.banzaicloud.io_clusteroutputs.yaml | 312 ------------- .../bases/logging.banzaicloud.io_flows.yaml | 410 ------------------ .../logging.banzaicloud.io_loggings.yaml | 410 ------------------ .../bases/logging.banzaicloud.io_outputs.yaml | 312 ------------- docs/configuration/crds/v1beta1/flow_types.md | 6 - .../crds/v1beta1/output_types.md | 3 - docs/configuration/plugins/_index.md | 3 - pkg/resources/fluentd/rbac.go | 13 +- pkg/resources/syslogng/rbac.go | 13 +- pkg/sdk/logging/api/v1alpha1/output_types.go | 1 - .../api/v1alpha1/zz_generated.deepcopy.go | 5 - pkg/sdk/logging/api/v1beta1/flow_types.go | 2 - pkg/sdk/logging/api/v1beta1/output_types.go | 1 - .../api/v1beta1/zz_generated.deepcopy.go | 15 - pkg/sdk/logging/model/filter/enhance_k8s.go | 123 ------ .../logging/model/filter/enhance_k8s_test.go | 41 -- pkg/sdk/logging/model/filter/sumologic.go | 140 ------ .../logging/model/filter/sumologic_test.go | 43 -- .../model/filter/zz_generated.deepcopy.go | 68 --- pkg/sdk/logging/model/output/sumologic.go | 145 ------- .../logging/model/output/sumologic_test.go | 62 --- .../model/output/zz_generated.deepcopy.go | 35 -- 33 files changed, 4 insertions(+), 6277 deletions(-) delete mode 100644 pkg/sdk/logging/model/filter/enhance_k8s.go delete mode 100644 pkg/sdk/logging/model/filter/enhance_k8s_test.go delete mode 100644 pkg/sdk/logging/model/filter/sumologic.go delete mode 100644 pkg/sdk/logging/model/filter/sumologic_test.go delete mode 100644 pkg/sdk/logging/model/output/sumologic.go delete mode 100644 pkg/sdk/logging/model/output/sumologic_test.go diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusterflows.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusterflows.yaml index 0d4e3269b..08488bdfd 100644 --- a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusterflows.yaml +++ b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusterflows.yaml @@ -133,156 +133,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -917,61 +767,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1207,156 +1002,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1991,61 +1636,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml index 3c23e7306..2ba82ea6d 100644 --- a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml +++ b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml @@ -6597,162 +6597,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -14005,162 +13849,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_flows.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_flows.yaml index d7ead9cb6..f79e56436 100644 --- a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_flows.yaml +++ b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_flows.yaml @@ -133,156 +133,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -917,61 +767,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1199,156 +994,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1983,61 +1628,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml index 28a7d0d1f..780924e6c 100644 --- a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml +++ b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml @@ -179,156 +179,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -963,61 +813,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -7275,156 +7070,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -8059,61 +7704,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml index e207acb45..a384445bf 100644 --- a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml +++ b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml @@ -6259,162 +6259,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -13273,162 +13117,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml index 2d9f7b936..761240744 100644 --- a/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml +++ b/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml @@ -130,156 +130,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -914,61 +764,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1204,156 +999,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1988,61 +1633,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml index fa7ba985f..e579f2b27 100644 --- a/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml +++ b/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml @@ -6594,162 +6594,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -14002,162 +13846,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml index 8d86b111e..c483b9bc7 100644 --- a/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml +++ b/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml @@ -130,156 +130,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -914,61 +764,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1196,156 +991,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1980,61 +1625,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml index 4d4b71900..4462feae0 100644 --- a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml +++ b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml @@ -176,156 +176,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -960,61 +810,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -7272,156 +7067,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -8056,61 +7701,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml index 841c4f176..dff193ee1 100644 --- a/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml +++ b/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml @@ -6256,162 +6256,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -13270,162 +13114,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml b/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml index 2d9f7b936..761240744 100644 --- a/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml +++ b/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml @@ -130,156 +130,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -914,61 +764,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1204,156 +999,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1988,61 +1633,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml index fa7ba985f..e579f2b27 100644 --- a/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml +++ b/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml @@ -6594,162 +6594,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -14002,162 +13846,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/config/crd/bases/logging.banzaicloud.io_flows.yaml b/config/crd/bases/logging.banzaicloud.io_flows.yaml index 8d86b111e..c483b9bc7 100644 --- a/config/crd/bases/logging.banzaicloud.io_flows.yaml +++ b/config/crd/bases/logging.banzaicloud.io_flows.yaml @@ -130,156 +130,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -914,61 +764,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -1196,156 +991,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -1980,61 +1625,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml index 4d4b71900..4462feae0 100644 --- a/config/crd/bases/logging.banzaicloud.io_loggings.yaml +++ b/config/crd/bases/logging.banzaicloud.io_loggings.yaml @@ -176,156 +176,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -960,61 +810,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: @@ -7272,156 +7067,6 @@ spec: use_record_as_seed: type: boolean type: object - enhanceK8s: - properties: - api_groups: - items: - type: string - type: array - bearer_token_file: - type: string - ca_file: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - cache_refresh: - type: integer - cache_refresh_variation: - type: integer - cache_size: - type: integer - cache_ttl: - type: integer - client_cert: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - client_key: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - core_api_versions: - items: - type: string - type: array - data_type: - type: string - in_namespace_path: - items: - type: string - type: array - in_pod_path: - items: - type: string - type: array - kubernetes_url: - type: string - secret_dir: - type: string - ssl_partial_chain: - type: boolean - verify_ssl: - type: boolean - type: object geoip: properties: backend_library: @@ -8056,61 +7701,6 @@ spec: output_type: type: string type: object - sumologic: - properties: - collector_key_name: - type: string - collector_value: - type: string - exclude_container_regex: - type: string - exclude_facility_regex: - type: string - exclude_host_regex: - type: string - exclude_namespace_regex: - type: string - exclude_pod_regex: - type: string - exclude_priority_regex: - type: string - exclude_unit_regex: - type: string - log_format: - type: string - source_category: - type: string - source_category_key_name: - type: string - source_category_prefix: - type: string - source_category_replace_dash: - type: string - source_host: - type: string - source_host_key_name: - type: string - source_name: - type: string - source_name_key_name: - type: string - tracing_annotation_prefix: - type: string - tracing_container_name: - type: string - tracing_format: - type: boolean - tracing_host: - type: string - tracing_label_prefix: - type: string - tracing_namespace: - type: string - tracing_pod: - type: string - tracing_pod_id: - type: string - type: object tag_normaliser: properties: format: diff --git a/config/crd/bases/logging.banzaicloud.io_outputs.yaml b/config/crd/bases/logging.banzaicloud.io_outputs.yaml index 841c4f176..dff193ee1 100644 --- a/config/crd/bases/logging.banzaicloud.io_outputs.yaml +++ b/config/crd/bases/logging.banzaicloud.io_outputs.yaml @@ -6256,162 +6256,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: @@ -13270,162 +13114,6 @@ spec: tag_property_name: type: string type: object - sumologic: - properties: - add_timestamp: - type: boolean - buffer: - properties: - chunk_full_threshold: - type: string - chunk_limit_records: - type: integer - chunk_limit_size: - type: string - compress: - type: string - delayed_commit_timeout: - type: string - disable_chunk_backup: - type: boolean - disabled: - type: boolean - flush_at_shutdown: - type: boolean - flush_interval: - type: string - flush_mode: - type: string - flush_thread_burst_interval: - type: string - flush_thread_count: - type: integer - flush_thread_interval: - type: string - overflow_action: - type: string - path: - type: string - queue_limit_length: - type: integer - queued_chunks_limit_size: - type: integer - retry_exponential_backoff_base: - type: string - retry_forever: - type: boolean - retry_max_interval: - type: string - retry_max_times: - type: integer - retry_randomize: - type: boolean - retry_secondary_threshold: - type: string - retry_timeout: - type: string - retry_type: - type: string - retry_wait: - type: string - tags: - type: string - timekey: - type: string - timekey_use_utc: - type: boolean - timekey_wait: - type: string - timekey_zone: - type: string - total_limit_size: - type: string - type: - type: string - type: object - compress: - type: boolean - compress_encoding: - type: string - custom_dimensions: - type: string - custom_fields: - items: - type: string - type: array - data_type: - type: string - delimiter: - type: string - disable_cookies: - type: boolean - endpoint: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - default: "" - type: string - optional: - type: boolean - required: - - key - type: object - x-kubernetes-map-type: atomic - type: object - type: object - log_format: - type: string - log_key: - type: string - metric_data_format: - type: string - open_timeout: - type: integer - proxy_uri: - type: string - slow_flush_log_threshold: - type: string - source_category: - type: string - source_host: - type: string - source_name: - type: string - source_name_key: - type: string - sumo_client: - type: string - timestamp_key: - type: string - verify_ssl: - type: boolean - required: - - endpoint - - source_name - type: object syslog: properties: allow_self_signed_cert: diff --git a/docs/configuration/crds/v1beta1/flow_types.md b/docs/configuration/crds/v1beta1/flow_types.md index 959297fcf..f79360939 100644 --- a/docs/configuration/crds/v1beta1/flow_types.md +++ b/docs/configuration/crds/v1beta1/flow_types.md @@ -92,9 +92,6 @@ Filter definition for FlowSpec ### elasticsearch_genid (*filter.ElasticsearchGenId, optional) {#filter-elasticsearch_genid} -### enhanceK8s (*filter.EnhanceK8s, optional) {#filter-enhancek8s} - - ### geoip (*filter.GeoIP, optional) {#filter-geoip} @@ -119,9 +116,6 @@ Filter definition for FlowSpec ### stdout (*filter.StdOutFilterConfig, optional) {#filter-stdout} -### sumologic (*filter.SumoLogic, optional) {#filter-sumologic} - - ### tag_normaliser (*filter.TagNormaliser, optional) {#filter-tag_normaliser} diff --git a/docs/configuration/crds/v1beta1/output_types.md b/docs/configuration/crds/v1beta1/output_types.md index 383e04768..0d454c153 100644 --- a/docs/configuration/crds/v1beta1/output_types.md +++ b/docs/configuration/crds/v1beta1/output_types.md @@ -89,9 +89,6 @@ OutputSpec defines the desired state of Output ### splunkHec (*output.SplunkHecOutput, optional) {#outputspec-splunkhec} -### sumologic (*output.SumologicOutput, optional) {#outputspec-sumologic} - - ### syslog (*output.SyslogOutputConfig, optional) {#outputspec-syslog} diff --git a/docs/configuration/plugins/_index.md b/docs/configuration/plugins/_index.md index eacc0063e..a29fa2e4c 100644 --- a/docs/configuration/plugins/_index.md +++ b/docs/configuration/plugins/_index.md @@ -14,7 +14,6 @@ For more information please click on the plugin name | **[Dedot](filters/dedot/)** | filters | Concatenate multiline log separated in multiple events | GA | [1.0.0](https://github.com/lunardial/fluent-plugin-dedot_filter) | | **[Exception Detector](filters/detect_exceptions/)** | filters | Exception Detector | GA | [0.0.14](https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions) | | **[ElasticSearch GenId](filters/elasticsearch_genid/)** | filters | | | [](TODO) | -| **[Enhance K8s Metadata](filters/enhance_k8s/)** | filters | Fluentd output plugin to add extra Kubernetes metadata to the events. | GA | [2.0.0](https://github.com/SumoLogic/sumologic-kubernetes-fluentd/tree/main/fluent-plugin-enhance-k8s-metadata) | | **[Geo IP](filters/geoip/)** | filters | Fluentd GeoIP filter | GA | [1.3.2](https://github.com/y-ken/fluent-plugin-geoip) | | **[Grep](filters/grep/)** | filters | Grep events by the values | GA | [more info](https://docs.fluentd.org/filter/grep) | | **[Kubernetes Events Timestamp](filters/kube_events_timestamp/)** | filters | Fluentd Filter plugin to select particular timestamp into an additional field | GA | [0.1.4](https://github.com/kube-logging/fluentd-filter-kube-events-timestamp) | @@ -23,7 +22,6 @@ For more information please click on the plugin name | **[Record Modifier](filters/record_modifier/)** | filters | Modify each event record. | GA | [2.1.0](https://github.com/repeatedly/fluent-plugin-record-modifier) | | **[Record Transformer](filters/record_transformer/)** | filters | Mutates/transforms incoming event streams. | GA | [more info](https://docs.fluentd.org/filter/record_transformer) | | **[Stdout](filters/stdout/)** | filters | Prints events to stdout | GA | [more info](https://docs.fluentd.org/filter/stdout) | -| **[SumoLogic](filters/sumologic/)** | filters | Sumo Logic collection solution for Kubernetes | GA | [2.3.1](https://github.com/SumoLogic/sumologic-kubernetes-collection) | | **[Tag Normaliser](filters/tagnormaliser/)** | filters | Re-tag based on log metadata | GA | [0.1.1](https://github.com/kube-logging/fluent-plugin-tag-normaliser) | | **[Throttle](filters/throttle/)** | filters | A sentry plugin to throttle logs. Logs are grouped by a configurable key. When a group exceeds a configuration rate, logs are dropped for this group. | GA | [0.0.5](https://github.com/rubrikinc/fluent-plugin-throttle) | | **[UserAgent](filters/useragent/)** | filters | Fluentd UserAgent filter | GA | [1.2.0](https://github.com/bungoume/fluent-plugin-ua-parser) | @@ -56,7 +54,6 @@ For more information please click on the plugin name | **[Amazon S3](outputs/s3/)** | outputs | Store logs in Amazon S3 | GA | [1.6.1](https://github.com/fluent/fluent-plugin-s3/releases/tag/v1.6.1) | | **[Splunk Hec](outputs/splunk_hec/)** | outputs | Fluent Plugin Splunk Hec Release | GA | [1.2.9]() | | **[SQS](outputs/sqs/)** | outputs | Output plugin writes fluent-events as queue messages to Amazon SQS | Testing | [v2.1.0](https://github.com/ixixi/fluent-plugin-sqs) | -| **[SumoLogic](outputs/sumologic/)** | outputs | Send your logs to Sumologic | GA | [1.8.0](https://github.com/SumoLogic/fluentd-output-sumologic/releases/tag/1.8.0) | | **[Syslog](outputs/syslog/)** | outputs | Output plugin writes events to syslog | GA | [0.9.0.rc.8](https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424) | | **[VMwareLogIntelligence](outputs/vmware_log_intelligence/)** | outputs | Send your logs to VMware Log Intelligence | GA | [v2.0.8](https://github.com/vmware/fluent-plugin-vmware-log-intelligence/releases/tag/v2.0.8) | | **[VMware LogInsight](outputs/vmware_loginsight/)** | outputs | Store logs in VMware LogInsight | GA | [1.4.2](https://github.com/vmware/fluent-plugin-vmware-loginsight/releases/tag/v1.4.2) | diff --git a/pkg/resources/fluentd/rbac.go b/pkg/resources/fluentd/rbac.go index d1f966348..e9f5a454e 100644 --- a/pkg/resources/fluentd/rbac.go +++ b/pkg/resources/fluentd/rbac.go @@ -107,17 +107,8 @@ func (r *Reconciler) sccRoleBinding() (runtime.Object, reconciler.DesiredState, RoleRef: rbacv1.RoleRef{}}, reconciler.StateAbsent, nil } -func (r *Reconciler) isEnhanceK8sFilter() bool { - for _, f := range r.Logging.Spec.GlobalFilters { - if f.EnhanceK8s != nil { - return true - } - } - return false -} - func (r *Reconciler) clusterRole() (runtime.Object, reconciler.DesiredState, error) { - if *r.fluentdSpec.Security.RoleBasedAccessControlCreate && r.isEnhanceK8sFilter() { + if *r.fluentdSpec.Security.RoleBasedAccessControlCreate { return &rbacv1.ClusterRole{ ObjectMeta: r.FluentdObjectMetaClusterScope(clusterRoleName, ComponentFluentd), Rules: []rbacv1.PolicyRule{ @@ -158,7 +149,7 @@ func (r *Reconciler) clusterRole() (runtime.Object, reconciler.DesiredState, err } func (r *Reconciler) clusterRoleBinding() (runtime.Object, reconciler.DesiredState, error) { - if *r.fluentdSpec.Security.RoleBasedAccessControlCreate && r.isEnhanceK8sFilter() { + if *r.fluentdSpec.Security.RoleBasedAccessControlCreate { return &rbacv1.ClusterRoleBinding{ ObjectMeta: r.FluentdObjectMetaClusterScope(clusterRoleBindingName, ComponentFluentd), RoleRef: rbacv1.RoleRef{ diff --git a/pkg/resources/syslogng/rbac.go b/pkg/resources/syslogng/rbac.go index cd2de725f..e31f8aa98 100644 --- a/pkg/resources/syslogng/rbac.go +++ b/pkg/resources/syslogng/rbac.go @@ -62,20 +62,11 @@ func (r *Reconciler) roleBinding() (runtime.Object, reconciler.DesiredState, err return binding, reconciler.StatePresent, nil } -func (r *Reconciler) isEnhanceK8sFilter() bool { - for _, f := range r.Logging.Spec.GlobalFilters { - if f.EnhanceK8s != nil { - return true - } - } - return false -} - func (r *Reconciler) clusterRole() (runtime.Object, reconciler.DesiredState, error) { role := &rbacv1.ClusterRole{ ObjectMeta: r.SyslogNGObjectMetaClusterScope(clusterRoleName, ComponentSyslogNG), } - if r.syslogNGSpec == nil || r.syslogNGSpec.SkipRBACCreate || !r.isEnhanceK8sFilter() { + if r.syslogNGSpec == nil || r.syslogNGSpec.SkipRBACCreate { return role, reconciler.StateAbsent, nil } role.Rules = []rbacv1.PolicyRule{ @@ -116,7 +107,7 @@ func (r *Reconciler) clusterRoleBinding() (runtime.Object, reconciler.DesiredSta binding := &rbacv1.ClusterRoleBinding{ ObjectMeta: r.SyslogNGObjectMetaClusterScope(clusterRoleBindingName, ComponentSyslogNG), } - if r.syslogNGSpec == nil || r.syslogNGSpec.SkipRBACCreate || !r.isEnhanceK8sFilter() { + if r.syslogNGSpec == nil || r.syslogNGSpec.SkipRBACCreate { return binding, reconciler.StateAbsent, nil } binding.RoleRef = rbacv1.RoleRef{ diff --git a/pkg/sdk/logging/api/v1alpha1/output_types.go b/pkg/sdk/logging/api/v1alpha1/output_types.go index a38bdcfd7..ad70e9cdb 100644 --- a/pkg/sdk/logging/api/v1alpha1/output_types.go +++ b/pkg/sdk/logging/api/v1alpha1/output_types.go @@ -39,7 +39,6 @@ type OutputSpec struct { OpenSearchOutput *output.OpenSearchOutput `json:"opensearch,omitempty"` LogZOutput *output.LogZOutput `json:"logz,omitempty"` LokiOutput *output.LokiOutput `json:"loki,omitempty"` - SumologicOutput *output.SumologicOutput `json:"sumologic,omitempty"` DatadogOutput *output.DatadogOutput `json:"datadog,omitempty"` ForwardOutput *output.ForwardOutput `json:"forward,omitempty"` FileOutput *output.FileOutputConfig `json:"file,omitempty"` diff --git a/pkg/sdk/logging/api/v1alpha1/zz_generated.deepcopy.go b/pkg/sdk/logging/api/v1alpha1/zz_generated.deepcopy.go index 06c4aa93a..7546576ff 100644 --- a/pkg/sdk/logging/api/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/sdk/logging/api/v1alpha1/zz_generated.deepcopy.go @@ -391,11 +391,6 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) { *out = new(output.LokiOutput) (*in).DeepCopyInto(*out) } - if in.SumologicOutput != nil { - in, out := &in.SumologicOutput, &out.SumologicOutput - *out = new(output.SumologicOutput) - (*in).DeepCopyInto(*out) - } if in.DatadogOutput != nil { in, out := &in.DatadogOutput, &out.DatadogOutput *out = new(output.DatadogOutput) diff --git a/pkg/sdk/logging/api/v1beta1/flow_types.go b/pkg/sdk/logging/api/v1beta1/flow_types.go index 5bc3b4fae..6aa98bba8 100644 --- a/pkg/sdk/logging/api/v1beta1/flow_types.go +++ b/pkg/sdk/logging/api/v1beta1/flow_types.go @@ -78,8 +78,6 @@ type Filter struct { Grep *filter.GrepConfig `json:"grep,omitempty"` Prometheus *filter.PrometheusConfig `json:"prometheus,omitempty"` Throttle *filter.Throttle `json:"throttle,omitempty"` - SumoLogic *filter.SumoLogic `json:"sumologic,omitempty"` - EnhanceK8s *filter.EnhanceK8s `json:"enhanceK8s,omitempty"` KubeEventsTimestamp *filter.KubeEventsTimestampConfig `json:"kube_events_timestamp,omitempty"` } diff --git a/pkg/sdk/logging/api/v1beta1/output_types.go b/pkg/sdk/logging/api/v1beta1/output_types.go index b29412304..338e9318b 100644 --- a/pkg/sdk/logging/api/v1beta1/output_types.go +++ b/pkg/sdk/logging/api/v1beta1/output_types.go @@ -40,7 +40,6 @@ type OutputSpec struct { OpenSearchOutput *output.OpenSearchOutput `json:"opensearch,omitempty"` LogZOutput *output.LogZOutput `json:"logz,omitempty"` LokiOutput *output.LokiOutput `json:"loki,omitempty"` - SumologicOutput *output.SumologicOutput `json:"sumologic,omitempty"` DatadogOutput *output.DatadogOutput `json:"datadog,omitempty"` ForwardOutput *output.ForwardOutput `json:"forward,omitempty"` FileOutput *output.FileOutputConfig `json:"file,omitempty"` diff --git a/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go b/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go index 94a8c86c1..a1c0f5131 100644 --- a/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go +++ b/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go @@ -574,16 +574,6 @@ func (in *Filter) DeepCopyInto(out *Filter) { *out = new(filter.Throttle) **out = **in } - if in.SumoLogic != nil { - in, out := &in.SumoLogic, &out.SumoLogic - *out = new(filter.SumoLogic) - (*in).DeepCopyInto(*out) - } - if in.EnhanceK8s != nil { - in, out := &in.EnhanceK8s, &out.EnhanceK8s - *out = new(filter.EnhanceK8s) - (*in).DeepCopyInto(*out) - } if in.KubeEventsTimestamp != nil { in, out := &in.KubeEventsTimestamp, &out.KubeEventsTimestamp *out = new(filter.KubeEventsTimestampConfig) @@ -2483,11 +2473,6 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) { *out = new(output.LokiOutput) (*in).DeepCopyInto(*out) } - if in.SumologicOutput != nil { - in, out := &in.SumologicOutput, &out.SumologicOutput - *out = new(output.SumologicOutput) - (*in).DeepCopyInto(*out) - } if in.DatadogOutput != nil { in, out := &in.DatadogOutput, &out.DatadogOutput *out = new(output.DatadogOutput) diff --git a/pkg/sdk/logging/model/filter/enhance_k8s.go b/pkg/sdk/logging/model/filter/enhance_k8s.go deleted file mode 100644 index 5bf50fbe6..000000000 --- a/pkg/sdk/logging/model/filter/enhance_k8s.go +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright © 2019 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package filter - -import ( - "github.com/cisco-open/operator-tools/pkg/secret" - - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/types" -) - -// +name:"Enhance K8s Metadata" -// +weight:"200" -type _hugoEnhanceK8s interface{} //nolint:deadcode,unused - -// +kubebuilder:object:generate=true -// +docName:"[Enhance K8s Metadata](https://github.com/SumoLogic/sumologic-kubernetes-fluentd/tree/main/fluent-plugin-enhance-k8s-metadata)" -// Fluentd Filter plugin to fetch several metadata for a Pod -type _docEnhanceK8s interface{} //nolint:deadcode,unused - -// +name:"Enhance K8s Metadata" -// +url:"https://github.com/SumoLogic/sumologic-kubernetes-fluentd/tree/main/fluent-plugin-enhance-k8s-metadata" -// +version:"2.0.0" -// +description:"Fluentd output plugin to add extra Kubernetes metadata to the events." -// +status:"GA" -type _metaEnhanceK8s interface{} //nolint:deadcode,unused - -// +kubebuilder:object:generate=true -type EnhanceK8s struct { - // parameters for read/write record (default: `['$.namespace']`) - InNamespacePath []string `json:"in_namespace_path,omitempty"` - // (default: `['$.pod','$.pod_name']`) - InPodPath []string `json:"in_pod_path,omitempty"` - // Sumologic data type (default: metrics) - DataType string `json:"data_type,omitempty"` - // Kubernetes API URL (default: nil) - KubernetesUrl string `json:"kubernetes_url,omitempty"` - // Kubernetes API Client certificate (default: nil) - ClientCert secret.Secret `json:"client_cert,omitempty"` - // // Kubernetes API Client certificate key (default: nil) - ClientKey secret.Secret `json:"client_key,omitempty"` - // Kubernetes API CA file (default: nil) - CaFile secret.Secret `json:"ca_file,omitempty"` - // Service account directory (default: /var/run/secrets/kubernetes.io/serviceaccount) - SecretDir string `json:"secret_dir,omitempty"` - // Bearer token path (default: nil) - BearerTokenFile string `json:"bearer_token_file,omitempty"` - // Verify SSL (default: true) - VerifySSL *bool `json:"verify_ssl,omitempty"` - // Kubernetes core API version (for different Kubernetes versions) (default: ['v1']) - CoreAPIVersions []string `json:"core_api_versions,omitempty"` - // Kubernetes resources api groups (default: `["apps/v1", "extensions/v1beta1"]`) - APIGroups []string `json:"api_groups,omitempty"` - // If `ca_file` is for an intermediate CA, or otherwise we do not have the - // root CA and want to trust the intermediate CA certs we do have, set this - // to `true` - this corresponds to the openssl s_client -partial_chain flag - // and X509_V_FLAG_PARTIAL_CHAIN (default: false) - SSLPartialChain *bool `json:"ssl_partial_chain,omitempty"` - // Cache size (default: 1000) - CacheSize int `json:"cache_size,omitempty"` - // Cache TTL (default: 60*60*2) - CacheTTL int `json:"cache_ttl,omitempty"` - // Cache refresh (default: 60*60) - CacheRefresh int `json:"cache_refresh,omitempty"` - // Cache refresh variation (default: 60*15) - CacheRefreshVariation int `json:"cache_refresh_variation,omitempty"` -} - -// -/* -## Example `EnhanceK8s` filter configurations - -{{< highlight yaml >}} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: demo-flow -spec: - globalFilters: - - enhanceK8s: {} -{{}} - -Fluentd config result: - -{{< highlight xml >}} - - @type enhance_k8s_metadata - @id test_enhanceK8s - -{{}} -*/ -type _expEnhanceK8s interface{} //nolint:deadcode,unused - -func (c *EnhanceK8s) ToDirective(secretLoader secret.SecretLoader, id string) (types.Directive, error) { - const pluginType = "enhance_k8s_metadata" - enhanceK8s := &types.GenericDirective{ - PluginMeta: types.PluginMeta{ - Type: pluginType, - Directive: "filter", - Tag: "**", - Id: id, - }, - } - enhanceK8sConfig := c.DeepCopy() - - if params, err := types.NewStructToStringMapper(secretLoader).StringsMap(enhanceK8sConfig); err != nil { - return nil, err - } else { - enhanceK8s.Params = params - } - return enhanceK8s, nil -} diff --git a/pkg/sdk/logging/model/filter/enhance_k8s_test.go b/pkg/sdk/logging/model/filter/enhance_k8s_test.go deleted file mode 100644 index 19e59dd36..000000000 --- a/pkg/sdk/logging/model/filter/enhance_k8s_test.go +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright © 2019 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package filter_test - -import ( - "testing" - - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter" - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render" - "github.com/stretchr/testify/require" - "sigs.k8s.io/yaml" -) - -func TestEnahnceK8s(t *testing.T) { - CONFIG := []byte(` -verify_ssl: false -`) - expected := ` - - @type enhance_k8s_metadata - @id test - verify_ssl false - -` - parser := &filter.EnhanceK8s{} - require.NoError(t, yaml.Unmarshal(CONFIG, parser)) - test := render.NewOutputPluginTest(t, parser) - test.DiffResult(expected) -} diff --git a/pkg/sdk/logging/model/filter/sumologic.go b/pkg/sdk/logging/model/filter/sumologic.go deleted file mode 100644 index f81b40993..000000000 --- a/pkg/sdk/logging/model/filter/sumologic.go +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright © 2020 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package filter - -import ( - "github.com/cisco-open/operator-tools/pkg/secret" - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/types" -) - -// +name:"SumoLogic" -// +weight:"200" -type _hugoSumoLogic interface{} //nolint:deadcode,unused - -// +docName:"Sumo Logic collection solution for Kubernetes" -// More info at https://github.com/SumoLogic/sumologic-kubernetes-collection -type _docSumologic interface{} //nolint:deadcode,unused - -// +name:"SumoLogic" -// +url:"https://github.com/SumoLogic/sumologic-kubernetes-collection" -// +version:"2.3.1" -// +description:"Sumo Logic collection solution for Kubernetes" -// +status:"GA" -type _metaSumologic interface{} //nolint:deadcode,unused - -// +kubebuilder:object:generate=true -type SumoLogic struct { - // Source Category (default: `%{namespace}/%{pod_name}`) - SourceCategory string `json:"source_category,omitempty"` - // Source Category Replace Dash (default: "/") - SourceCategoryReplaceDash string `json:"source_category_replace_dash,omitempty"` - // Source Category Prefix (default: kubernetes/) - SourceCategoryPrefix string `json:"source_category_prefix,omitempty"` - // Source Name (default: `%{namespace}.%{pod}.%{container}`) - SourceName string `json:"source_name,omitempty"` - // Log Format (default: json) - LogFormat string `json:"log_format,omitempty"` - // Source Host (default: "") - SourceHost string `json:"source_host,omitempty"` - // Exclude Container Regex (default: "") - ExcludeContainerRegex string `json:"exclude_container_regex,omitempty"` - // Exclude Facility Regex (default: "") - ExcludeFacilityRegex string `json:"exclude_facility_regex,omitempty"` - // Exclude Host Regex (default: "") - ExcludeHostRegex string `json:"exclude_host_regex,omitempty"` - // Exclude Namespace Regex (default: "") - ExcludeNamespaceRegex string `json:"exclude_namespace_regex,omitempty"` - // Exclude Pod Regex (default: "") - ExcludePodRegex string `json:"exclude_pod_regex,omitempty"` - // Exclude Priority Regex (default: "") - ExcludePriorityRegex string `json:"exclude_priority_regex,omitempty"` - // Exclude Unit Regex (default: "") - ExcludeUnitRegex string `json:"exclude_unit_regex,omitempty"` - // Tracing Format (default: false) - TracingFormat *bool `json:"tracing_format,omitempty"` - // Tracing Namespace (default: "namespace") - TracingNamespace string `json:"tracing_namespace,omitempty"` - // Tracing Pod (default: "pod") - TracingPod string `json:"tracing_pod,omitempty"` - // Tracing Pod ID (default: "pod_id") - TracingPodId string `json:"tracing_pod_id,omitempty"` - // Tracing Container Name (default: "container_name") - TracingContainerName string `json:"tracing_container_name,omitempty"` - // Tracing Host (default: "hostname") - TracingHost string `json:"tracing_host,omitempty"` - // Tracing Label Prefix (default: `pod_label_`) - TracingLabelPrefix string `json:"tracing_label_prefix,omitempty"` - // Tracing Annotation Prefix (default: `pod_annotation_`) - TracingAnnotationPrefix string `json:"tracing_annotation_prefix,omitempty"` - // Source HostKey Name (default: `_sourceHost`) - SourceHostKeyName string `json:"source_host_key_name,omitempty"` - // Source CategoryKey Name (default: `_sourceCategory`) - SourceCategoryKeyName string `json:"source_category_key_name,omitempty"` - // Source NameKey Name (default: `_sourceName`) - SourceNameKeyName string `json:"source_name_key_name,omitempty"` - // CollectorKey Name (default: `_collector`) - CollectorKeyName string `json:"collector_key_name,omitempty"` - // Collector Value (default: "undefined") - CollectorValue string `json:"collector_value,omitempty"` -} - -// -/* -## Example `Parser` filter configurations - -{{< highlight yaml >}} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Flow -metadata: - name: demo-flow -spec: - filters: - - sumologic: - source_name: "elso" - selectors: {} - localOutputRefs: - - demo-output -{{}} - -Fluentd config result: - -{{< highlight xml >}} - - @type kubernetes_sumologic - @id test_sumologic - source_name elso - -{{}} -*/ -type _expSumologic interface{} //nolint:deadcode,unused - -func (s *SumoLogic) ToDirective(secretLoader secret.SecretLoader, id string) (types.Directive, error) { - const pluginType = "kubernetes_sumologic" - sumologic := &types.GenericDirective{ - PluginMeta: types.PluginMeta{ - Type: pluginType, - Directive: "filter", - Tag: "**", - Id: id, - }, - } - sumoLogicConfig := s.DeepCopy() - if params, err := types.NewStructToStringMapper(secretLoader).StringsMap(sumoLogicConfig); err != nil { - return nil, err - } else { - sumologic.Params = params - } - return sumologic, nil -} diff --git a/pkg/sdk/logging/model/filter/sumologic_test.go b/pkg/sdk/logging/model/filter/sumologic_test.go deleted file mode 100644 index 4976d66c1..000000000 --- a/pkg/sdk/logging/model/filter/sumologic_test.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright © 2020 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package filter_test - -import ( - "testing" - - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/filter" - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render" - "github.com/stretchr/testify/require" - "sigs.k8s.io/yaml" -) - -func TestSumoLogic(t *testing.T) { - CONFIG := []byte(` -source_name: "elso" -source_host: "masodik" -`) - expected := ` - - @type kubernetes_sumologic - @id test - source_host masodik - source_name elso - -` - parser := &filter.SumoLogic{} - require.NoError(t, yaml.Unmarshal(CONFIG, parser)) - test := render.NewOutputPluginTest(t, parser) - test.DiffResult(expected) -} diff --git a/pkg/sdk/logging/model/filter/zz_generated.deepcopy.go b/pkg/sdk/logging/model/filter/zz_generated.deepcopy.go index b8b9ca501..5f0eb7f79 100644 --- a/pkg/sdk/logging/model/filter/zz_generated.deepcopy.go +++ b/pkg/sdk/logging/model/filter/zz_generated.deepcopy.go @@ -117,54 +117,6 @@ func (in *ElasticsearchGenId) DeepCopy() *ElasticsearchGenId { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EnhanceK8s) DeepCopyInto(out *EnhanceK8s) { - *out = *in - if in.InNamespacePath != nil { - in, out := &in.InNamespacePath, &out.InNamespacePath - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.InPodPath != nil { - in, out := &in.InPodPath, &out.InPodPath - *out = make([]string, len(*in)) - copy(*out, *in) - } - in.ClientCert.DeepCopyInto(&out.ClientCert) - in.ClientKey.DeepCopyInto(&out.ClientKey) - in.CaFile.DeepCopyInto(&out.CaFile) - if in.VerifySSL != nil { - in, out := &in.VerifySSL, &out.VerifySSL - *out = new(bool) - **out = **in - } - if in.CoreAPIVersions != nil { - in, out := &in.CoreAPIVersions, &out.CoreAPIVersions - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.APIGroups != nil { - in, out := &in.APIGroups, &out.APIGroups - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.SSLPartialChain != nil { - in, out := &in.SSLPartialChain, &out.SSLPartialChain - *out = new(bool) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnhanceK8s. -func (in *EnhanceK8s) DeepCopy() *EnhanceK8s { - if in == nil { - return nil - } - out := new(EnhanceK8s) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ExcludeSection) DeepCopyInto(out *ExcludeSection) { *out = *in @@ -559,26 +511,6 @@ func (in *StdOutFilterConfig) DeepCopy() *StdOutFilterConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *SumoLogic) DeepCopyInto(out *SumoLogic) { - *out = *in - if in.TracingFormat != nil { - in, out := &in.TracingFormat, &out.TracingFormat - *out = new(bool) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SumoLogic. -func (in *SumoLogic) DeepCopy() *SumoLogic { - if in == nil { - return nil - } - out := new(SumoLogic) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Throttle) DeepCopyInto(out *Throttle) { *out = *in diff --git a/pkg/sdk/logging/model/output/sumologic.go b/pkg/sdk/logging/model/output/sumologic.go deleted file mode 100644 index 9cbe33310..000000000 --- a/pkg/sdk/logging/model/output/sumologic.go +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright © 2019 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package output - -import ( - "github.com/cisco-open/operator-tools/pkg/secret" - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/types" -) - -// +name:"SumoLogic" -// +weight:"200" -type _hugoSumoLogic interface{} //nolint:deadcode,unused - -// +docName:"SumoLogic output plugin for Fluentd" -/* -This plugin has been designed to output logs or metrics to SumoLogic via a HTTP collector endpoint -For details, see [https://github.com/SumoLogic/fluentd-output-sumologic](https://github.com/SumoLogic/fluentd-output-sumologic). - -## Example secret for HTTP input URL: - -``` -export URL='https://endpoint1.collection.eu.sumologic.com/receiver/v1/http/' -kubectl create secret generic sumo-output --from-literal "endpoint=$URL" -``` - -## Example ClusterOutput - -```yaml -apiVersion: logging.banzaicloud.io/v1beta1 -kind: ClusterOutput -metadata: - name: sumo-output -spec: - sumologic: - buffer: - flush_interval: 10s - flush_mode: interval - compress: true - endpoint: - valueFrom: - secretKeyRef: - key: endpoint - name: sumo-output - source_name: test1 -``` -*/ -type _docSumoLogic interface{} //nolint:deadcode,unused - -// +name:"SumoLogic" -// +url:"https://github.com/SumoLogic/fluentd-output-sumologic/releases/tag/1.8.0" -// +version:"1.8.0" -// +description:"Send your logs to Sumologic" -// +status:"GA" -type _metaSumologic interface{} //nolint:deadcode,unused - -// +kubebuilder:object:generate=true -// +docName:"Output Config" -type SumologicOutput struct { - // The type of data that will be sent to Sumo Logic, either logs or metrics (default: logs) - DataType string `json:"data_type,omitempty"` - // SumoLogic HTTP Collector URL - Endpoint *secret.Secret `json:"endpoint"` - // Verify ssl certificate. (default: true) - VerifySsl bool `json:"verify_ssl,omitempty"` - // The format of metrics you will be sending, either graphite or carbon2 or prometheus (default: graphite) - MetricDataFormat string `json:"metric_data_format,omitempty"` - // Format to post logs into Sumo. (default: json) - LogFormat string `json:"log_format,omitempty"` - // Used to specify the key when merging json or sending logs in text format (default: message) - LogKey string `json:"log_key,omitempty"` - // Set _sourceCategory metadata field within SumoLogic (default: nil) - SourceCategory string `json:"source_category,omitempty"` - // Set _sourceName metadata field within SumoLogic - overrides source_name_key (default is nil) - SourceName string `json:"source_name"` - // Set as source::path_key's value so that the source_name can be extracted from Fluentd's buffer (default: source_name) - SourceNameKey string `json:"source_name_key,omitempty"` - // Set _sourceHost metadata field within SumoLogic (default: nil) - SourceHost string `json:"source_host,omitempty"` - // Set timeout seconds to wait until connection is opened. (default: 60) - OpenTimeout int `json:"open_timeout,omitempty"` - // Add timestamp (or timestamp_key) field to logs before sending to SumoLogic (default: true) - AddTimestamp bool `json:"add_timestamp,omitempty"` - // Field name when add_timestamp is on (default: timestamp) - TimestampKey string `json:"timestamp_key,omitempty"` - // Add the uri of the proxy environment if present. - ProxyUri string `json:"proxy_uri,omitempty"` - // Option to disable cookies on the HTTP Client. (default: false) - DisableCookies bool `json:"disable_cookies,omitempty"` - // Delimiter (default: .) - Delimiter string `json:"delimiter,omitempty"` - // Comma-separated key=value list of fields to apply to every log. [More information](https://help.sumologic.com/Manage/Fields#http-source-fields) - CustomFields []string `json:"custom_fields,omitempty"` - // Name of sumo client which is send as X-Sumo-Client header (default: fluentd-output) - SumoClient string `json:"sumo_client,omitempty"` - // Compress payload (default: false) - Compress *bool `json:"compress,omitempty"` - // Encoding method of compression (either gzip or deflate) (default: gzip) - CompressEncoding string `json:"compress_encoding,omitempty"` - // Dimensions string (eg "cluster=payment, service=credit_card") which is going to be added to every metric record. - CustomDimensions string `json:"custom_dimensions,omitempty"` - // +docLink:"Buffer,../buffer/" - Buffer *Buffer `json:"buffer,omitempty"` - // The threshold for chunk flush performance check. - // Parameter type is float, not time, default: 20.0 (seconds) - // If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. - SlowFlushLogThreshold string `json:"slow_flush_log_threshold,omitempty"` -} - -func (s *SumologicOutput) ToDirective(secretLoader secret.SecretLoader, id string) (types.Directive, error) { - const pluginType = "sumologic" - sumologic := &types.OutputPlugin{ - PluginMeta: types.PluginMeta{ - Type: pluginType, - Directive: "match", - Tag: "**", - Id: id, - }, - } - if params, err := types.NewStructToStringMapper(secretLoader).StringsMap(s); err != nil { - return nil, err - } else { - sumologic.Params = params - } - if s.Buffer == nil { - s.Buffer = &Buffer{} - } - if buffer, err := s.Buffer.ToDirective(secretLoader, id); err != nil { - return nil, err - } else { - sumologic.SubDirectives = append(sumologic.SubDirectives, buffer) - } - return sumologic, nil -} diff --git a/pkg/sdk/logging/model/output/sumologic_test.go b/pkg/sdk/logging/model/output/sumologic_test.go deleted file mode 100644 index 449a7ef01..000000000 --- a/pkg/sdk/logging/model/output/sumologic_test.go +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright © 2019 Banzai Cloud -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package output_test - -import ( - "testing" - - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output" - "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render" - "github.com/stretchr/testify/require" - "sigs.k8s.io/yaml" -) - -func TestSumologic(t *testing.T) { - CONFIG := []byte(` -data_type: metrics -metric_data_format: carbon2 -log_format: json -source_category: prod/someapp/logs -source_name: AppA -compress: true -buffer: - type: file - timekey_wait: 5s - timekey: 30s -`) - expected := ` - - @type sumologic - @id test - compress true - data_type metrics - log_format json - metric_data_format carbon2 - source_category prod/someapp/logs - source_name AppA - - @type file - path /buffers/test.*.buffer - retry_forever true - timekey 30s - timekey_wait 5s - - -` - s := &output.SumologicOutput{} - require.NoError(t, yaml.Unmarshal(CONFIG, s)) - test := render.NewOutputPluginTest(t, s) - test.DiffResult(expected) -} diff --git a/pkg/sdk/logging/model/output/zz_generated.deepcopy.go b/pkg/sdk/logging/model/output/zz_generated.deepcopy.go index 2e9e77686..cca345225 100644 --- a/pkg/sdk/logging/model/output/zz_generated.deepcopy.go +++ b/pkg/sdk/logging/model/output/zz_generated.deepcopy.go @@ -1664,41 +1664,6 @@ func (in *SplunkHecOutput) DeepCopy() *SplunkHecOutput { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *SumologicOutput) DeepCopyInto(out *SumologicOutput) { - *out = *in - if in.Endpoint != nil { - in, out := &in.Endpoint, &out.Endpoint - *out = new(secret.Secret) - (*in).DeepCopyInto(*out) - } - if in.CustomFields != nil { - in, out := &in.CustomFields, &out.CustomFields - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Compress != nil { - in, out := &in.Compress, &out.Compress - *out = new(bool) - **out = **in - } - if in.Buffer != nil { - in, out := &in.Buffer, &out.Buffer - *out = new(Buffer) - (*in).DeepCopyInto(*out) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SumologicOutput. -func (in *SumologicOutput) DeepCopy() *SumologicOutput { - if in == nil { - return nil - } - out := new(SumologicOutput) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SyslogOutputConfig) DeepCopyInto(out *SyslogOutputConfig) { *out = *in From 2a4707bb51946f91275e4396dc37dc44133caf14 Mon Sep 17 00:00:00 2001 From: Bence Csati Date: Thu, 28 Nov 2024 18:15:44 +0100 Subject: [PATCH 2/2] chore: bump image versions Signed-off-by: Bence Csati --- e2e/common/helpers.go | 8 ++++++-- .../fluentd_aggregator_test.go | 2 +- e2e/fluentd-aggregator/fluentd_aggregator_test.go | 4 ++-- e2e/volumedrain/volumedrain_test.go | 2 +- pkg/sdk/logging/api/v1beta1/logging_types.go | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/e2e/common/helpers.go b/e2e/common/helpers.go index 82dfe8c32..48191058e 100644 --- a/e2e/common/helpers.go +++ b/e2e/common/helpers.go @@ -26,13 +26,17 @@ import ( "github.com/stretchr/testify/assert" v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1" "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output" ) +const ( + FluentdImageTag = "v1.17-5.0-base" +) + var sequence uint32 func RequireNoError(t *testing.T, err error) { @@ -125,7 +129,7 @@ func LoggingInfra( ControlNamespace: nsInfra, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: FluentdImageTag, }, DisablePvc: true, Resources: v12.ResourceRequirements{ diff --git a/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go b/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go index 53fa6e0c6..d3bf64a17 100644 --- a/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go +++ b/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go @@ -103,7 +103,7 @@ func TestFluentdAggregator_NamespaceLabel(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: common.FluentdImageTag, }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/e2e/fluentd-aggregator/fluentd_aggregator_test.go b/e2e/fluentd-aggregator/fluentd_aggregator_test.go index 544b1f9aa..a03646de7 100644 --- a/e2e/fluentd-aggregator/fluentd_aggregator_test.go +++ b/e2e/fluentd-aggregator/fluentd_aggregator_test.go @@ -91,7 +91,7 @@ func TestFluentdAggregator_MultiWorker(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: common.FluentdImageTag, }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ @@ -259,7 +259,7 @@ func TestFluentdAggregator_ConfigChecks(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: common.FluentdImageTag, }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/e2e/volumedrain/volumedrain_test.go b/e2e/volumedrain/volumedrain_test.go index 7f64cd626..17a01d17b 100644 --- a/e2e/volumedrain/volumedrain_test.go +++ b/e2e/volumedrain/volumedrain_test.go @@ -89,7 +89,7 @@ func TestVolumeDrain_Downscale(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: common.FluentdImageTag, }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/pkg/sdk/logging/api/v1beta1/logging_types.go b/pkg/sdk/logging/api/v1beta1/logging_types.go index cd496ef51..36bbd7921 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -180,7 +180,7 @@ const ( DefaultFluentbitConfigReloaderImageRepository = "ghcr.io/kube-logging/config-reloader" DefaultFluentbitConfigReloaderImageTag = "v0.0.6" DefaultFluentdImageRepository = "ghcr.io/kube-logging/fluentd" - DefaultFluentdImageTag = "v1.16-4.11-full" + DefaultFluentdImageTag = "v1.17-5.0-full" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer" DefaultFluentdDrainWatchImageRepository = "ghcr.io/kube-logging/fluentd-drain-watch" DefaultFluentdDrainWatchImageTag = "v0.2.3"