diff --git a/charts/logging/Chart.yaml b/charts/logging/Chart.yaml index b75373f..17f30b2 100644 --- a/charts/logging/Chart.yaml +++ b/charts/logging/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: logging-operator -version: 3.8.1 +version: 3.8.2 kubeVersion: ">= 1.16.0-0" -appVersion: 3.17.4 +appVersion: 3.17.6 description: "A Kubernetes logging stack based on Logging Operator" type: application keywords: @@ -22,5 +22,7 @@ maintainers: url: https://github.com/lterrac - name: "Daniele Della Rocca" url: https://github.com/ddellarocca + - name: "Giorgia Fiscaletti" + url: https://github.com/fiscafusca icon: https://github.com/banzaicloud/logging-operator/blob/master/docs/img/icon.png deprecated: false diff --git a/charts/logging/crds/clusterflow.yaml b/charts/logging/crds/clusterflow.yaml index 1161840..ed43717 100644 --- a/charts/logging/crds/clusterflow.yaml +++ b/charts/logging/crds/clusterflow.yaml @@ -383,6 +383,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -395,6 +397,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -403,6 +430,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -462,6 +491,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -474,6 +505,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -482,6 +538,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -1154,6 +1212,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -1166,6 +1226,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -1174,6 +1259,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -1233,6 +1320,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -1245,6 +1334,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -1253,6 +1367,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string diff --git a/charts/logging/crds/clusteroutput.yaml b/charts/logging/crds/clusteroutput.yaml index e02d204..6aad160 100644 --- a/charts/logging/crds/clusteroutput.yaml +++ b/charts/logging/crds/clusteroutput.yaml @@ -39,6 +39,41 @@ spec: properties: awsElasticsearch: properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -108,6 +143,160 @@ spec: type: type: string type: object + bulk_message_request_threshold: + type: string + ca_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key_pass: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + content_type: + type: string + custom_headers: + type: string + customize_template: + type: string + data_stream_enable: + type: boolean + data_stream_ilm_name: + type: string + data_stream_name: + type: string + data_stream_template_name: + type: string + default_elasticsearch_version: + type: string + deflector_alias: + type: string + enable_ilm: + type: boolean endpoint: properties: access_key_id: @@ -346,6 +535,14 @@ spec: url: type: string type: object + exception_backup: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string flush_interval: type: string format: @@ -365,30 +562,49 @@ spec: - single_value type: string type: object + host: + type: string + hosts: + type: string + http_backend: + type: string + id_key: + type: string + ignore_exceptions: + type: string + ilm_policy: + type: string + ilm_policy_id: + type: string + ilm_policy_overwrite: + type: boolean + include_index_in_url: + type: boolean include_tag_key: type: boolean include_timestamp: + type: boolean + index_date_pattern: type: string index_name: type: string + index_prefix: + type: string + log_es_400_reason: + type: boolean + logstash_dateformat: + type: string logstash_format: type: boolean logstash_prefix: type: string - tag_key: - type: string - type: object - azurestorage: - properties: - auto_create_container: - type: boolean - azure_container: + logstash_prefix_separator: type: string - azure_imds_api_version: + max_retry_get_es_version: type: string - azure_object_key_format: + max_retry_putting_template: type: string - azure_storage_access_key: + password: properties: mountFrom: properties: @@ -421,24 +637,185 @@ spec: type: object type: object type: object - azure_storage_account: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys: + type: string + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + rollover_index: + type: boolean + routing_key: + type: string + scheme: + type: string + sniffer_class_name: + type: string + ssl_max_version: + type: string + ssl_min_version: + type: string + ssl_verify: + type: boolean + ssl_version: + type: string + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_key: + type: string + target_type_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + type_name: + type: string + unrecoverable_error_types: + type: string + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_es_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string + type: object + azurestorage: + properties: + auto_create_container: + type: boolean + azure_container: + type: string + azure_imds_api_version: + type: string + azure_object_key_format: + type: string + azure_storage_access_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + azure_storage_account: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string valueFrom: properties: secretKeyRef: @@ -785,8 +1162,6 @@ spec: use_tag_as_stream: type: boolean required: - - log_group_name - - log_stream_name - region type: object datadog: @@ -1293,6 +1668,8 @@ spec: type: boolean reload_on_failure: type: boolean + remove_keys: + type: string remove_keys_on_update: type: string remove_keys_on_update_key: @@ -3139,6 +3516,10 @@ spec: type: type: string type: object + bulk_limit: + type: integer + bulk_limit_warning_limit: + type: integer endpoint: properties: port: @@ -3530,77 +3911,9 @@ spec: type: object nullout: type: object - oss: + opensearch: properties: - aaccess_key_secret: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - access_key_id: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - auto_create_bucket: - type: boolean - bucket: + application_name: type: string buffer: properties: @@ -3671,156 +3984,44 @@ spec: type: type: string type: object - check_bucket: - type: boolean - check_object: - type: boolean - download_crc_enable: - type: boolean - endpoint: + bulk_message_request_threshold: type: string - format: + ca_file: properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object type: object - hex_random_length: - type: integer - index_format: - type: string - key_format: - type: string - open_timeout: - type: integer - oss_sdk_log_dir: - type: string - overwrite: - type: boolean - path: - type: string - read_timeout: - type: integer - store_as: - type: string - upload_crc_enable: - type: boolean - warn_for_delay: - type: string - required: - - aaccess_key_secret - - access_key_id - - bucket - - endpoint - type: object - redis: - properties: - allow_duplicate_key: + catch_transport_exception_on_retry: 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 - db_number: - type: integer - format: - properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value - type: string - type: object - host: - type: string - insert_key_prefix: - type: string - password: + client_cert: properties: mountFrom: properties: @@ -3853,38 +4054,7 @@ spec: type: object type: object type: object - port: - type: integer - strftime_format: - type: string - ttl: - type: integer - type: object - s3: - properties: - acl: - type: string - assume_role_credentials: - properties: - duration_seconds: - type: string - external_id: - type: string - policy: - type: string - role_arn: - type: string - role_session_name: - type: string - required: - - role_arn - - role_session_name - type: object - auto_create_bucket: - type: string - aws_iam_retries: - type: string - aws_key_id: + client_key: properties: mountFrom: properties: @@ -3917,7 +4087,7 @@ spec: type: object type: object type: object - aws_sec_key: + client_key_pass: properties: mountFrom: properties: @@ -3950,52 +4120,683 @@ spec: type: object type: object type: object - 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 + compression_level: + type: string + custom_headers: + type: string + customize_template: + type: string + default_opensearch_version: + type: integer + emit_error_for_missing_id: + type: boolean + emit_error_label_event: + type: boolean + exception_backup: + type: boolean + fail_on_detecting_os_version_retry_exceed: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + host: + type: string + hosts: + type: string + http_backend: + type: string + http_backend_excon_nonblock: + type: boolean + id_key: + type: string + ignore_exceptions: + type: string + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_separator: + type: string + log_os_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_os_version: + type: integer + max_retry_putting_template: + type: string + parent_key: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + routing_key: + type: string + scheme: + type: string + selector_class_name: + type: string + sniffer_class_name: + type: string + ssl_verify: + type: boolean + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_affinity: + type: boolean + target_index_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_exclude_timestamp: + type: boolean + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + truncate_caches_interval: + type: string + unrecoverable_error_types: + type: string + unrecoverable_record_types: + type: string + use_legacy_template: + type: boolean + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_os_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string + type: object + oss: + properties: + aaccess_key_secret: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + access_key_id: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + auto_create_bucket: + type: boolean + bucket: + type: string + 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 + check_bucket: + type: boolean + check_object: + type: boolean + download_crc_enable: + type: boolean + endpoint: + type: string + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + hex_random_length: + type: integer + index_format: + type: string + key_format: + type: string + open_timeout: + type: integer + oss_sdk_log_dir: + type: string + overwrite: + type: boolean + path: + type: string + read_timeout: + type: integer + store_as: + type: string + upload_crc_enable: + type: boolean + warn_for_delay: + type: string + required: + - aaccess_key_secret + - access_key_id + - bucket + - endpoint + type: object + redis: + properties: + allow_duplicate_key: + 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 + db_number: + type: integer + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + host: + type: string + insert_key_prefix: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + port: + type: integer + strftime_format: + type: string + ttl: + type: integer + type: object + s3: + properties: + acl: + type: string + assume_role_credentials: + properties: + duration_seconds: + type: string + external_id: + type: string + policy: + type: string + role_arn: + type: string + role_session_name: + type: string + required: + - role_arn + - role_session_name + type: object + auto_create_bucket: + type: string + aws_iam_retries: + type: string + aws_key_id: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + aws_sec_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + 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: @@ -5044,6 +5845,41 @@ spec: properties: awsElasticsearch: properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -5113,6 +5949,160 @@ spec: type: type: string type: object + bulk_message_request_threshold: + type: string + ca_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key_pass: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + content_type: + type: string + custom_headers: + type: string + customize_template: + type: string + data_stream_enable: + type: boolean + data_stream_ilm_name: + type: string + data_stream_name: + type: string + data_stream_template_name: + type: string + default_elasticsearch_version: + type: string + deflector_alias: + type: string + enable_ilm: + type: boolean endpoint: properties: access_key_id: @@ -5302,85 +6292,273 @@ spec: type: string valueFrom: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + sts_credentials_region: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + url: + type: string + type: object + exception_backup: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + flush_interval: + type: string + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + host: + type: string + hosts: + type: string + http_backend: + type: string + id_key: + type: string + ignore_exceptions: + type: string + ilm_policy: + type: string + ilm_policy_id: + type: string + ilm_policy_overwrite: + type: boolean + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_prefix: + type: string + log_es_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_es_version: + type: string + max_retry_putting_template: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys: + type: string + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + rollover_index: + type: boolean + routing_key: + type: string + scheme: + type: string + sniffer_class_name: + type: string + ssl_max_version: + type: string + ssl_min_version: + type: string + ssl_verify: + type: boolean + ssl_version: + type: string + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_key: + type: string + target_type_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - sts_credentials_region: + value: + type: string + valueFrom: properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - url: - type: string type: object - flush_interval: + template_name: type: string - format: - properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value - type: string - type: object - include_tag_key: + template_overwrite: type: boolean - include_timestamp: + templates: type: string - index_name: + time_key: type: string - logstash_format: - type: boolean - logstash_prefix: + time_key_format: type: string - tag_key: + time_parse_error_tag: + type: string + time_precision: + type: string + type_name: + type: string + unrecoverable_error_types: + type: string + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_es_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: type: string type: object azurestorage: @@ -5790,8 +6968,6 @@ spec: use_tag_as_stream: type: boolean required: - - log_group_name - - log_stream_name - region type: object datadog: @@ -6298,6 +7474,8 @@ spec: type: boolean reload_on_failure: type: boolean + remove_keys: + type: string remove_keys_on_update: type: string remove_keys_on_update_key: @@ -8071,9 +9249,139 @@ spec: - api_key - hostname type: object - loggingRef: - type: string - logz: + loggingRef: + type: string + logz: + properties: + 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 + bulk_limit: + type: integer + bulk_limit_warning_limit: + type: integer + endpoint: + properties: + port: + type: integer + token: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + url: + type: string + type: object + gzip: + type: boolean + http_idle_timeout: + type: integer + output_include_tags: + type: boolean + output_include_time: + type: boolean + retry_count: + type: integer + retry_sleep: + type: integer + required: + - endpoint + type: object + loki: properties: buffer: properties: @@ -8144,63 +9452,275 @@ spec: type: type: string type: object - endpoint: + ca_cert: properties: - port: - type: integer - token: + mountFrom: properties: - mountFrom: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + configure_kubernetes_labels: + type: boolean + drop_single_key: + type: boolean + extra_labels: + additionalProperties: + type: string + type: object + extract_kubernetes_labels: + type: boolean + insecure_tls: + type: boolean + key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + labels: + additionalProperties: + type: string + type: object + line_format: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + remove_keys: + items: + type: string + type: array + tenant: + type: string + url: + type: string + username: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + type: object + newrelic: + properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + base_uri: + type: string + license_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object - value: - type: string - valueFrom: + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - url: - type: string type: object - gzip: - type: boolean - http_idle_timeout: - type: integer - output_include_tags: - type: boolean - output_include_time: - type: boolean - retry_count: - type: integer - retry_sleep: - type: integer - required: - - endpoint type: object - loki: + nullout: + type: object + opensearch: properties: + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -8270,7 +9790,9 @@ spec: type: type: string type: object - ca_cert: + bulk_message_request_threshold: + type: string + ca_file: properties: mountFrom: properties: @@ -8303,7 +9825,9 @@ spec: type: object type: object type: object - cert: + catch_transport_exception_on_retry: + type: boolean + client_cert: properties: mountFrom: properties: @@ -8336,19 +9860,7 @@ spec: type: object type: object type: object - configure_kubernetes_labels: - type: boolean - drop_single_key: - type: boolean - extra_labels: - additionalProperties: - type: string - type: object - extract_kubernetes_labels: - type: boolean - insecure_tls: - type: boolean - key: + client_key: properties: mountFrom: properties: @@ -8381,13 +9893,7 @@ spec: type: object type: object type: object - labels: - additionalProperties: - type: string - type: object - line_format: - type: string - password: + client_key_pass: properties: mountFrom: properties: @@ -8420,51 +9926,69 @@ spec: type: object type: object type: object - remove_keys: - items: - type: string - type: array - tenant: + compression_level: type: string - url: + custom_headers: type: string - username: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - type: object - newrelic: - properties: - api_key: + customize_template: + type: string + default_opensearch_version: + type: integer + emit_error_for_missing_id: + type: boolean + emit_error_label_event: + type: boolean + exception_backup: + type: boolean + fail_on_detecting_os_version_retry_exceed: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + host: + type: string + hosts: + type: string + http_backend: + type: string + http_backend_excon_nonblock: + type: boolean + id_key: + type: string + ignore_exceptions: + type: string + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_separator: + type: string + log_os_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_os_version: + type: integer + max_retry_putting_template: + type: string + parent_key: + type: string + password: properties: mountFrom: properties: @@ -8497,9 +10021,53 @@ spec: type: object type: object type: object - base_uri: + path: type: string - license_key: + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + routing_key: + type: string + scheme: + type: string + selector_class_name: + type: string + sniffer_class_name: + type: string + ssl_verify: + type: boolean + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_affinity: + type: boolean + target_index_key: + type: string + template_file: properties: mountFrom: properties: @@ -8532,8 +10100,42 @@ spec: type: object type: object type: object - type: object - nullout: + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_exclude_timestamp: + type: boolean + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + truncate_caches_interval: + type: string + unrecoverable_error_types: + type: string + unrecoverable_record_types: + type: string + use_legacy_template: + type: boolean + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_os_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string type: object oss: properties: diff --git a/charts/logging/crds/flow.yaml b/charts/logging/crds/flow.yaml index c17b75b..22cdc90 100644 --- a/charts/logging/crds/flow.yaml +++ b/charts/logging/crds/flow.yaml @@ -383,6 +383,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -395,6 +397,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -403,6 +430,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -462,6 +491,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -474,6 +505,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -482,6 +538,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -1150,6 +1208,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -1162,6 +1222,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -1170,6 +1255,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -1229,6 +1316,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -1241,6 +1330,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -1249,6 +1363,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string diff --git a/charts/logging/crds/hosttailers.yaml b/charts/logging/crds/hosttailers.yaml index 08dc762..e009f6c 100644 --- a/charts/logging/crds/hosttailers.yaml +++ b/charts/logging/crds/hosttailers.yaml @@ -310,6 +310,8 @@ spec: type: string path: type: string + read_from_head: + type: boolean skip_long_lines: type: string required: diff --git a/charts/logging/crds/logging.yaml b/charts/logging/crds/logging.yaml index 89d49bd..44337a3 100644 --- a/charts/logging/crds/logging.yaml +++ b/charts/logging/crds/logging.yaml @@ -399,6 +399,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -411,6 +413,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -419,6 +446,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -478,6 +507,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -490,6 +521,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -498,6 +554,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -1382,6 +1440,8 @@ spec: type: string Buffer_Size: type: string + Cache_Use_Docker_Id: + type: string DNS_Retries: type: string DNS_Wait_Time: @@ -1644,6 +1704,8 @@ spec: type: string Path_Key: type: string + Read_From_Head: + type: boolean Refresh_Interval: type: string Rotate_Wait: @@ -4665,6 +4727,8 @@ spec: type: string parse: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -4677,6 +4741,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -4685,6 +4774,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -4744,6 +4835,8 @@ spec: parsers: items: properties: + custom_pattern_path: + type: string delimiter: type: string delimiter_pattern: @@ -4756,6 +4849,31 @@ spec: type: string format_firstline: type: string + grok_failure_key: + type: string + grok_name_key: + type: string + grok_pattern: + type: string + grok_patterns: + items: + properties: + keep_time_key: + type: boolean + name: + type: string + pattern: + type: string + time_format: + type: string + time_key: + type: string + timezone: + type: string + required: + - pattern + type: object + type: array keep_time_key: type: boolean keys: @@ -4764,6 +4882,8 @@ spec: type: string local_time: type: boolean + multi_line_start_regexp: + type: string multiline: items: type: string @@ -8310,6 +8430,8 @@ spec: type: string Buffer_Size: type: string + Cache_Use_Docker_Id: + type: string DNS_Retries: type: string DNS_Wait_Time: @@ -8420,6 +8542,8 @@ spec: type: string Path_Key: type: string + Read_From_Head: + type: boolean Refresh_Interval: type: string Rotate_Wait: @@ -9039,6 +9163,8 @@ spec: type: string type: object type: array + skipInvalidResources: + type: boolean watchNamespaces: items: type: string diff --git a/charts/logging/crds/output.yaml b/charts/logging/crds/output.yaml index 351d407..14f644a 100644 --- a/charts/logging/crds/output.yaml +++ b/charts/logging/crds/output.yaml @@ -39,6 +39,41 @@ spec: properties: awsElasticsearch: properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -108,6 +143,160 @@ spec: type: type: string type: object + bulk_message_request_threshold: + type: string + ca_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key_pass: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + content_type: + type: string + custom_headers: + type: string + customize_template: + type: string + data_stream_enable: + type: boolean + data_stream_ilm_name: + type: string + data_stream_name: + type: string + data_stream_template_name: + type: string + default_elasticsearch_version: + type: string + deflector_alias: + type: string + enable_ilm: + type: boolean endpoint: properties: access_key_id: @@ -346,6 +535,14 @@ spec: url: type: string type: object + exception_backup: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string flush_interval: type: string format: @@ -365,30 +562,49 @@ spec: - single_value type: string type: object + host: + type: string + hosts: + type: string + http_backend: + type: string + id_key: + type: string + ignore_exceptions: + type: string + ilm_policy: + type: string + ilm_policy_id: + type: string + ilm_policy_overwrite: + type: boolean + include_index_in_url: + type: boolean include_tag_key: type: boolean include_timestamp: + type: boolean + index_date_pattern: type: string index_name: type: string + index_prefix: + type: string + log_es_400_reason: + type: boolean + logstash_dateformat: + type: string logstash_format: type: boolean logstash_prefix: type: string - tag_key: - type: string - type: object - azurestorage: - properties: - auto_create_container: - type: boolean - azure_container: + logstash_prefix_separator: type: string - azure_imds_api_version: + max_retry_get_es_version: type: string - azure_object_key_format: + max_retry_putting_template: type: string - azure_storage_access_key: + password: properties: mountFrom: properties: @@ -421,24 +637,185 @@ spec: type: object type: object type: object - azure_storage_account: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys: + type: string + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + rollover_index: + type: boolean + routing_key: + type: string + scheme: + type: string + sniffer_class_name: + type: string + ssl_max_version: + type: string + ssl_min_version: + type: string + ssl_verify: + type: boolean + ssl_version: + type: string + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_key: + type: string + target_type_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + type_name: + type: string + unrecoverable_error_types: + type: string + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_es_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string + type: object + azurestorage: + properties: + auto_create_container: + type: boolean + azure_container: + type: string + azure_imds_api_version: + type: string + azure_object_key_format: + type: string + azure_storage_access_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + azure_storage_account: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string valueFrom: properties: secretKeyRef: @@ -785,8 +1162,6 @@ spec: use_tag_as_stream: type: boolean required: - - log_group_name - - log_stream_name - region type: object datadog: @@ -1293,6 +1668,8 @@ spec: type: boolean reload_on_failure: type: boolean + remove_keys: + type: string remove_keys_on_update: type: string remove_keys_on_update_key: @@ -3135,6 +3512,10 @@ spec: type: type: string type: object + bulk_limit: + type: integer + bulk_limit_warning_limit: + type: integer endpoint: properties: port: @@ -3526,77 +3907,9 @@ spec: type: object nullout: type: object - oss: + opensearch: properties: - aaccess_key_secret: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - access_key_id: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - auto_create_bucket: - type: boolean - bucket: + application_name: type: string buffer: properties: @@ -3667,156 +3980,44 @@ spec: type: type: string type: object - check_bucket: - type: boolean - check_object: - type: boolean - download_crc_enable: - type: boolean - endpoint: + bulk_message_request_threshold: type: string - format: + ca_file: properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object type: object - hex_random_length: - type: integer - index_format: - type: string - key_format: - type: string - open_timeout: - type: integer - oss_sdk_log_dir: - type: string - overwrite: - type: boolean - path: - type: string - read_timeout: - type: integer - store_as: - type: string - upload_crc_enable: - type: boolean - warn_for_delay: - type: string - required: - - aaccess_key_secret - - access_key_id - - bucket - - endpoint - type: object - redis: - properties: - allow_duplicate_key: + catch_transport_exception_on_retry: 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 - db_number: - type: integer - format: - properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value - type: string - type: object - host: - type: string - insert_key_prefix: - type: string - password: + client_cert: properties: mountFrom: properties: @@ -3849,38 +4050,7 @@ spec: type: object type: object type: object - port: - type: integer - strftime_format: - type: string - ttl: - type: integer - type: object - s3: - properties: - acl: - type: string - assume_role_credentials: - properties: - duration_seconds: - type: string - external_id: - type: string - policy: - type: string - role_arn: - type: string - role_session_name: - type: string - required: - - role_arn - - role_session_name - type: object - auto_create_bucket: - type: string - aws_iam_retries: - type: string - aws_key_id: + client_key: properties: mountFrom: properties: @@ -3913,7 +4083,7 @@ spec: type: object type: object type: object - aws_sec_key: + client_key_pass: properties: mountFrom: properties: @@ -3946,52 +4116,683 @@ spec: type: object type: object type: object - 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 + compression_level: + type: string + custom_headers: + type: string + customize_template: + type: string + default_opensearch_version: + type: integer + emit_error_for_missing_id: + type: boolean + emit_error_label_event: + type: boolean + exception_backup: + type: boolean + fail_on_detecting_os_version_retry_exceed: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + host: + type: string + hosts: + type: string + http_backend: + type: string + http_backend_excon_nonblock: + type: boolean + id_key: + type: string + ignore_exceptions: + type: string + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_separator: + type: string + log_os_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_os_version: + type: integer + max_retry_putting_template: + type: string + parent_key: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + routing_key: + type: string + scheme: + type: string + selector_class_name: + type: string + sniffer_class_name: + type: string + ssl_verify: + type: boolean + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_affinity: + type: boolean + target_index_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_exclude_timestamp: + type: boolean + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + truncate_caches_interval: + type: string + unrecoverable_error_types: + type: string + unrecoverable_record_types: + type: string + use_legacy_template: + type: boolean + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_os_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string + type: object + oss: + properties: + aaccess_key_secret: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + access_key_id: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + auto_create_bucket: + type: boolean + bucket: + type: string + 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 + check_bucket: + type: boolean + check_object: + type: boolean + download_crc_enable: + type: boolean + endpoint: + type: string + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + hex_random_length: + type: integer + index_format: + type: string + key_format: + type: string + open_timeout: + type: integer + oss_sdk_log_dir: + type: string + overwrite: + type: boolean + path: + type: string + read_timeout: + type: integer + store_as: + type: string + upload_crc_enable: + type: boolean + warn_for_delay: + type: string + required: + - aaccess_key_secret + - access_key_id + - bucket + - endpoint + type: object + redis: + properties: + allow_duplicate_key: + 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 + db_number: + type: integer + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + host: + type: string + insert_key_prefix: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + port: + type: integer + strftime_format: + type: string + ttl: + type: integer + type: object + s3: + properties: + acl: + type: string + assume_role_credentials: + properties: + duration_seconds: + type: string + external_id: + type: string + policy: + type: string + role_arn: + type: string + role_session_name: + type: string + required: + - role_arn + - role_session_name + type: object + auto_create_bucket: + type: string + aws_iam_retries: + type: string + aws_key_id: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + aws_sec_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + 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: @@ -5038,6 +5839,41 @@ spec: properties: awsElasticsearch: properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -5107,6 +5943,160 @@ spec: type: type: string type: object + bulk_message_request_threshold: + type: string + ca_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + client_key_pass: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + content_type: + type: string + custom_headers: + type: string + customize_template: + type: string + data_stream_enable: + type: boolean + data_stream_ilm_name: + type: string + data_stream_name: + type: string + data_stream_template_name: + type: string + default_elasticsearch_version: + type: string + deflector_alias: + type: string + enable_ilm: + type: boolean endpoint: properties: access_key_id: @@ -5296,85 +6286,273 @@ spec: type: string valueFrom: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + sts_credentials_region: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + url: + type: string + type: object + exception_backup: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + flush_interval: + type: string + format: + properties: + add_newline: + type: boolean + message_key: + type: string + type: + enum: + - out_file + - json + - ltsv + - csv + - msgpack + - hash + - single_value + type: string + type: object + host: + type: string + hosts: + type: string + http_backend: + type: string + id_key: + type: string + ignore_exceptions: + type: string + ilm_policy: + type: string + ilm_policy_id: + type: string + ilm_policy_overwrite: + type: boolean + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_prefix: + type: string + log_es_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_es_version: + type: string + max_retry_putting_template: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + path: + type: string + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys: + type: string + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + rollover_index: + type: boolean + routing_key: + type: string + scheme: + type: string + sniffer_class_name: + type: string + ssl_max_version: + type: string + ssl_min_version: + type: string + ssl_verify: + type: boolean + ssl_version: + type: string + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_key: + type: string + target_type_key: + type: string + template_file: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - sts_credentials_region: + value: + type: string + valueFrom: properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - url: - type: string type: object - flush_interval: + template_name: type: string - format: - properties: - add_newline: - type: boolean - message_key: - type: string - type: - enum: - - out_file - - json - - ltsv - - csv - - msgpack - - hash - - single_value - type: string - type: object - include_tag_key: + template_overwrite: type: boolean - include_timestamp: + templates: type: string - index_name: + time_key: type: string - logstash_format: - type: boolean - logstash_prefix: + time_key_format: type: string - tag_key: + time_parse_error_tag: + type: string + time_precision: + type: string + type_name: + type: string + unrecoverable_error_types: + type: string + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_es_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: type: string type: object azurestorage: @@ -5784,8 +6962,6 @@ spec: use_tag_as_stream: type: boolean required: - - log_group_name - - log_stream_name - region type: object datadog: @@ -6292,6 +7468,8 @@ spec: type: boolean reload_on_failure: type: boolean + remove_keys: + type: string remove_keys_on_update: type: string remove_keys_on_update_key: @@ -8061,9 +9239,139 @@ spec: - api_key - hostname type: object - loggingRef: - type: string - logz: + loggingRef: + type: string + logz: + properties: + 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 + bulk_limit: + type: integer + bulk_limit_warning_limit: + type: integer + endpoint: + properties: + port: + type: integer + token: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + url: + type: string + type: object + gzip: + type: boolean + http_idle_timeout: + type: integer + output_include_tags: + type: boolean + output_include_time: + type: boolean + retry_count: + type: integer + retry_sleep: + type: integer + required: + - endpoint + type: object + loki: properties: buffer: properties: @@ -8134,63 +9442,275 @@ spec: type: type: string type: object - endpoint: + ca_cert: properties: - port: - type: integer - token: + mountFrom: properties: - mountFrom: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + cert: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + configure_kubernetes_labels: + type: boolean + drop_single_key: + type: boolean + extra_labels: + additionalProperties: + type: string + type: object + extract_kubernetes_labels: + type: boolean + insecure_tls: + type: boolean + key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + labels: + additionalProperties: + type: string + type: object + line_format: + type: string + password: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + remove_keys: + items: + type: string + type: array + tenant: + type: string + url: + type: string + username: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + type: object + newrelic: + properties: + api_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + type: object + base_uri: + type: string + license_key: + properties: + mountFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object - value: - type: string - valueFrom: + type: object + value: + type: string + valueFrom: + properties: + secretKeyRef: properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key type: object type: object - url: - type: string type: object - gzip: - type: boolean - http_idle_timeout: - type: integer - output_include_tags: - type: boolean - output_include_time: - type: boolean - retry_count: - type: integer - retry_sleep: - type: integer - required: - - endpoint type: object - loki: + nullout: + type: object + opensearch: properties: + application_name: + type: string buffer: properties: chunk_full_threshold: @@ -8260,7 +9780,9 @@ spec: type: type: string type: object - ca_cert: + bulk_message_request_threshold: + type: string + ca_file: properties: mountFrom: properties: @@ -8293,7 +9815,9 @@ spec: type: object type: object type: object - cert: + catch_transport_exception_on_retry: + type: boolean + client_cert: properties: mountFrom: properties: @@ -8326,19 +9850,7 @@ spec: type: object type: object type: object - configure_kubernetes_labels: - type: boolean - drop_single_key: - type: boolean - extra_labels: - additionalProperties: - type: string - type: object - extract_kubernetes_labels: - type: boolean - insecure_tls: - type: boolean - key: + client_key: properties: mountFrom: properties: @@ -8371,13 +9883,7 @@ spec: type: object type: object type: object - labels: - additionalProperties: - type: string - type: object - line_format: - type: string - password: + client_key_pass: properties: mountFrom: properties: @@ -8410,51 +9916,69 @@ spec: type: object type: object type: object - remove_keys: - items: - type: string - type: array - tenant: + compression_level: type: string - url: + custom_headers: type: string - username: - properties: - mountFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - value: - type: string - valueFrom: - properties: - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - type: object - type: object - newrelic: - properties: - api_key: + customize_template: + type: string + default_opensearch_version: + type: integer + emit_error_for_missing_id: + type: boolean + emit_error_label_event: + type: boolean + exception_backup: + type: boolean + fail_on_detecting_os_version_retry_exceed: + type: boolean + fail_on_putting_template_retry_exceed: + type: boolean + flatten_hashes: + type: boolean + flatten_hashes_separator: + type: string + host: + type: string + hosts: + type: string + http_backend: + type: string + http_backend_excon_nonblock: + type: boolean + id_key: + type: string + ignore_exceptions: + type: string + include_index_in_url: + type: boolean + include_tag_key: + type: boolean + include_timestamp: + type: boolean + index_date_pattern: + type: string + index_name: + type: string + index_separator: + type: string + log_os_400_reason: + type: boolean + logstash_dateformat: + type: string + logstash_format: + type: boolean + logstash_prefix: + type: string + logstash_prefix_separator: + type: string + max_retry_get_os_version: + type: integer + max_retry_putting_template: + type: string + parent_key: + type: string + password: properties: mountFrom: properties: @@ -8487,9 +10011,53 @@ spec: type: object type: object type: object - base_uri: + path: type: string - license_key: + pipeline: + type: string + port: + type: integer + prefer_oj_serializer: + type: boolean + reconnect_on_error: + type: boolean + reload_after: + type: string + reload_connections: + type: boolean + reload_on_failure: + type: boolean + remove_keys_on_update: + type: string + remove_keys_on_update_key: + type: string + request_timeout: + type: string + resurrect_after: + type: string + retry_tag: + type: string + routing_key: + type: string + scheme: + type: string + selector_class_name: + type: string + sniffer_class_name: + type: string + ssl_verify: + type: boolean + suppress_doc_wrap: + type: boolean + suppress_type_name: + type: boolean + tag_key: + type: string + target_index_affinity: + type: boolean + target_index_key: + type: string + template_file: properties: mountFrom: properties: @@ -8522,8 +10090,42 @@ spec: type: object type: object type: object - type: object - nullout: + template_name: + type: string + template_overwrite: + type: boolean + templates: + type: string + time_key: + type: string + time_key_exclude_timestamp: + type: boolean + time_key_format: + type: string + time_parse_error_tag: + type: string + time_precision: + type: string + truncate_caches_interval: + type: string + unrecoverable_error_types: + type: string + unrecoverable_record_types: + type: string + use_legacy_template: + type: boolean + user: + type: string + utc_index: + type: boolean + validate_client_version: + type: boolean + verify_os_version_at_startup: + type: boolean + with_transporter_log: + type: boolean + write_operation: + type: string type: object oss: properties: diff --git a/charts/logging/values.yaml b/charts/logging/values.yaml index 531a65e..ea538dc 100644 --- a/charts/logging/values.yaml +++ b/charts/logging/values.yaml @@ -13,7 +13,7 @@ image: # Override the default Docker image name if you use a custom image or a repository mirror name: "ghcr.io/banzaicloud/logging-operator" # Use this optional value to override the tag of the image to relase instead of relying on the Chart one - # version: 3.17.4 + # version: 3.17.6 # Customize the deployment of the Logging Operator image deploy: @@ -59,7 +59,7 @@ defaultLogging: fluentbit: # image: # name: "fluent/fluent-bit" - # version: 1.8.15 + # version: 1.9.3 # Override this value to change where the logs are saved on the cluster nodes logFilesPattern: "/var/log/containers/*.log" # Run the fluentbit pods as root user, enable it if the logs on the nodes are written by root @@ -86,7 +86,7 @@ defaultLogging: fluentd: # image: # name: "ghcr.io/banzaicloud/fluentd" - # version: v1.14.5-alpine-1 + # version: 1.14.6-alpine-4 # Override this value to choose how many replicas of fluentd you want. replicas: 1 # Change this value to increase or decrease the volume dimension dedicated to the buffer diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml index 70a46b1..773f6fe 100644 --- a/charts/monitoring/Chart.yaml +++ b/charts/monitoring/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: monitoring -version: 1.3.0 +version: 1.3.1 kubeVersion: ">= 1.20.0-0" -appVersion: "v0.55.1" +appVersion: "v0.56.2" description: "A Kubernetes monitoring stack based on Prometheus Operator" type: application keywords: @@ -20,5 +20,7 @@ maintainers: url: https://github.com/lterrac - name: "Daniele Della Rocca" url: https://github.com/ddellarocca + - name: "Giorgia Fiscaletti" + url: https://github.com/fiscafusca icon: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/master/Documentation/logos/prometheus-operator-logo.png deprecated: false diff --git a/charts/monitoring/crds/alertmanagerconfigs.yaml b/charts/monitoring/crds/alertmanagerconfigs.yaml index 948386a..7b03c0f 100644 --- a/charts/monitoring/crds/alertmanagerconfigs.yaml +++ b/charts/monitoring/crds/alertmanagerconfigs.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: alertmanagerconfigs.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: AlertmanagerConfig listKind: AlertmanagerConfigList plural: alertmanagerconfigs + shortNames: + - amcfg singular: alertmanagerconfig scope: Namespaced versions: @@ -444,6 +446,10 @@ spec: description: OpsGenieConfig configures notifications via OpsGenie. See https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config properties: + actions: + description: Comma separated list of actions that will + be available for the alert. + type: string apiKey: description: The secret's key that contains the OpsGenie API key. The secret needs to be in the same namespace @@ -490,6 +496,10 @@ spec: - value type: object type: array + entity: + description: Optional field that can be used to specify + which domain alert is related to. + type: string httpConfig: description: HTTP client configuration. properties: diff --git a/charts/monitoring/crds/alertmanagers.yaml b/charts/monitoring/crds/alertmanagers.yaml index c2e6772..7222c29 100644 --- a/charts/monitoring/crds/alertmanagers.yaml +++ b/charts/monitoring/crds/alertmanagers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: alertmanagers.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: Alertmanager listKind: AlertmanagerList plural: alertmanagers + shortNames: + - am singular: alertmanager scope: Namespaced versions: @@ -973,14 +975,14 @@ spec: alertmanagerConfiguration: description: 'EXPERIMENTAL: alertmanagerConfiguration specifies the global Alertmanager configuration. If defined, it takes precedence - over the `configSecret` field. This field may change in future releases. - The specified global alertmanager config will not force add a namespace - label in routes and inhibitRules.' + over the `configSecret` field. This field may change in future releases.' properties: name: description: The name of the AlertmanagerConfig resource which - holds the global configuration. It must be in the same namespace - as the Alertmanager. + is used to generate the global configuration. It must be defined + in the same namespace as the Alertmanager object. The operator + will not enforce a `namespace` label for routes and inhibition + rules. minLength: 1 type: string type: object @@ -1010,10 +1012,15 @@ spec: type: string type: array configSecret: - description: ConfigSecret is the name of a Kubernetes Secret in the - same namespace as the Alertmanager object, which contains configuration - for this Alertmanager instance. Defaults to 'alertmanager-' - The secret is mounted into /etc/alertmanager/config. + description: "ConfigSecret is the name of a Kubernetes Secret in the + same namespace as the Alertmanager object, which contains the configuration + for this Alertmanager instance. If empty, it defaults to 'alertmanager-'. + \n The Alertmanager configuration should be available under the + `alertmanager.yaml` key. Additional keys from the original secret + are copied to the generated secret. \n If either the secret or the + `alertmanager.yaml` key is missing, the operator provisions an Alertmanager + configuration with one empty receiver (effectively dropping alert + notifications)." type: string containers: description: 'Containers allows injecting additional containers. This @@ -3502,9 +3509,19 @@ spec: type: boolean logFormat: description: Log format for Alertmanager to be configured with. + enum: + - "" + - logfmt + - json type: string logLevel: description: Log level for Alertmanager to be configured with. + enum: + - "" + - debug + - info + - warn + - error type: string minReadySeconds: description: Minimum number of seconds for which a newly created pod @@ -3907,13 +3924,13 @@ spec: automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource - only allows two specific types of objects, DataSourceRef allows - any non-core object, as well as PersistentVolumeClaim + only allows two specific types of objects, DataSourceRef + allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values - (dropping them), DataSourceRef preserves all values, - and generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + (dropping them), DataSourceRef preserves all values, + and generates an error if a disallowed value is + specified. (Alpha) Using this field requires the + AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource @@ -4130,11 +4147,11 @@ spec: and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as well - as PersistentVolumeClaim objects. * While DataSource - ignores disallowed values (dropping them), DataSourceRef preserves + DataSourceRef allows any non-core object, as well as + PersistentVolumeClaim objects. * While DataSource ignores + disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value - is specified. (Alpha) Using this field requires the + is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: @@ -4464,10 +4481,10 @@ spec: description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway - tells the scheduler to schedule the pod in any location, but + tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce - the skew. A constraint is considered "Unsatisfiable" for - an incoming pod if and only if every possible node assignment + the skew. A constraint is considered "Unsatisfiable" for an + incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 @@ -4919,18 +4936,17 @@ spec: pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity - \ tracking are needed, c) the storage driver is specified - through a storage class, and d) the storage driver supports - dynamic volume provisioning through a PersistentVolumeClaim - (see EphemeralVolumeSource for more information on the - connection between this volume type and PersistentVolumeClaim). - \n Use PersistentVolumeClaim or one of the vendor-specific - APIs for volumes that persist for longer than the lifecycle - of an individual pod. \n Use CSI for light-weight local ephemeral - volumes if the CSI driver is meant to be used that way - see - the documentation of the driver for more information. \n A - pod can use both types of ephemeral volumes and persistent - volumes at the same time." + tracking are needed, c) the storage driver is specified through + a storage class, and d) the storage driver supports dynamic + volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource + for more information on the connection between this volume + type and PersistentVolumeClaim). \n Use PersistentVolumeClaim + or one of the vendor-specific APIs for volumes that persist + for longer than the lifecycle of an individual pod. \n Use + CSI for light-weight local ephemeral volumes if the CSI driver + is meant to be used that way - see the documentation of the + driver for more information. \n A pod can use both types of + ephemeral volumes and persistent volumes at the same time." properties: volumeClaimTemplate: description: "Will be used to create a stand-alone PVC to @@ -5018,13 +5034,13 @@ spec: other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as - well as PersistentVolumeClaim objects. * While - DataSource ignores disallowed values (dropping - them), DataSourceRef preserves all values, and - generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + DataSourceRef allows any non-core object, as well + as PersistentVolumeClaim objects. * While DataSource + ignores disallowed values (dropping them), DataSourceRef + preserves all values, and generates an error if + a disallowed value is specified. (Alpha) Using + this field requires the AnyVolumeDataSource feature + gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource diff --git a/charts/monitoring/crds/podmonitors.yaml b/charts/monitoring/crds/podmonitors.yaml index 9e448d3..f3788ef 100644 --- a/charts/monitoring/crds/podmonitors.yaml +++ b/charts/monitoring/crds/podmonitors.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: podmonitors.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: PodMonitor listKind: PodMonitorList plural: podmonitors + shortNames: + - pmon singular: podmonitor scope: Namespaced versions: @@ -180,7 +182,9 @@ spec: the timestamps present in scraped data. type: boolean interval: - description: Interval at which metrics should be scraped + description: Interval at which metrics should be scraped If + not specified Prometheus' global scrape interval is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string metricRelabelings: description: MetricRelabelConfigs to apply to samples before @@ -409,7 +413,9 @@ spec: description: HTTP scheme to use for scraping. type: string scrapeTimeout: - description: Timeout after which the scrape is ended + description: Timeout after which the scrape is ended If not + specified, the Prometheus global scrape interval is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string targetPort: anyOf: diff --git a/charts/monitoring/crds/probes.yaml b/charts/monitoring/crds/probes.yaml index 3438544..492ee8b 100644 --- a/charts/monitoring/crds/probes.yaml +++ b/charts/monitoring/crds/probes.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: probes.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: Probe listKind: ProbeList plural: probes + shortNames: + - prb singular: probe scope: Namespaced versions: @@ -129,6 +131,7 @@ spec: interval: description: Interval at which targets are probed using the configured prober. If not specified Prometheus' global scrape interval is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string jobName: description: The job name assigned to scraped metrics by default. @@ -319,6 +322,8 @@ spec: type: integer scrapeTimeout: description: Timeout for scraping metrics from the Prometheus exporter. + If not specified, the Prometheus global scrape interval is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string targetLimit: description: TargetLimit defines a limit on the number of scraped diff --git a/charts/monitoring/crds/prometheuses.yaml b/charts/monitoring/crds/prometheuses.yaml index 61579aa..3b1ffab 100644 --- a/charts/monitoring/crds/prometheuses.yaml +++ b/charts/monitoring/crds/prometheuses.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: prometheuses.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: Prometheus listKind: PrometheusList plural: prometheuses + shortNames: + - prom singular: prometheus scope: Namespaced versions: @@ -2660,6 +2662,16 @@ spec: items: type: string type: array + enableRemoteWriteReceiver: + description: 'Enable Prometheus to be used as a receiver for the Prometheus + remote write protocol. Defaults to the value of `false`. WARNING: + This is not considered an efficient way of ingesting samples. Use + it with caution for specific low-volume use cases. It is not suitable + for replacing the ingestion via scraping and turning Prometheus + into a push-based metrics collection system. For more information + see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver + Only valid in Prometheus versions 2.33.0 and newer.' + type: boolean enforcedBodySizeLimit: description: 'EnforcedBodySizeLimit defines the maximum size of uncompressed response body that will be accepted by Prometheus. Targets responding @@ -2668,6 +2680,7 @@ spec: monitors and probes. This is an experimental feature, this behaviour could change or be removed in the future. Only valid in Prometheus versions 2.28.0 and newer.' + pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$ type: string enforcedLabelLimit: description: Per-scrape limit on number of labels that will be accepted @@ -2694,8 +2707,8 @@ spec: description: "EnforcedNamespaceLabel If set, a label will be added to \n 1. all user-metrics (created by `ServiceMonitor`, `PodMonitor` and `Probe` objects) and 2. in all `PrometheusRule` objects (except - the ones excluded in `prometheusRulesExcludedFromEnforce`) to * - alerting & recording rules and * the metrics used in their expressions + the ones excluded in `prometheusRulesExcludedFromEnforce`) to * + alerting & recording rules and * the metrics used in their expressions (`expr`). \n Label name is this field's value. Label value is the namespace of the created object (mentioned above)." type: string @@ -2720,8 +2733,46 @@ spec: format: int64 type: integer evaluationInterval: - description: 'Interval between consecutive evaluations. Default: `1m`' + default: 30s + description: 'Interval between consecutive evaluations. Default: `30s`' + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string + excludedFromEnforcement: + description: List of references to PodMonitor, ServiceMonitor, Probe + and PrometheusRule objects to be excluded from enforcing a namespace + label of origin. Applies only if enforcedNamespaceLabel set to true. + items: + description: ObjectReference references a PodMonitor, ServiceMonitor, + Probe or PrometheusRule object. + properties: + group: + default: monitoring.coreos.com + description: Group of the referent. When not specified, it defaults + to `monitoring.coreos.com` + enum: + - monitoring.coreos.com + type: string + name: + description: Name of the referent. When not set, all resources + are matched. + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + minLength: 1 + type: string + resource: + description: Resource of the referent. + enum: + - prometheusrules + - servicemonitors + - podmonitors + - probes + type: string + required: + - namespace + - resource + type: object + type: array externalLabels: additionalProperties: type: string @@ -3992,9 +4043,19 @@ spec: type: boolean logFormat: description: Log format for Prometheus to be configured with. + enum: + - "" + - logfmt + - json type: string logLevel: description: Log level for Prometheus to be configured with. + enum: + - "" + - debug + - info + - warn + - error type: string minReadySeconds: description: Minimum number of seconds for which a newly created pod @@ -4245,10 +4306,11 @@ spec: will _not_ be added when value is set to empty string (`""`). type: string prometheusRulesExcludedFromEnforce: - description: PrometheusRulesExcludedFromEnforce - list of prometheus + description: 'PrometheusRulesExcludedFromEnforce - list of prometheus rules to be excluded from enforcing of adding namespace labels. Works only if enforcedNamespaceLabel set to true. Make sure both - ruleNamespace and ruleName are set for each pair + ruleNamespace and ruleName are set for each pair. Deprecated: use + excludedFromEnforcement instead.' items: description: PrometheusRuleExcludeConfig enables users to configure excluded PrometheusRule names and their namespaces to be ignored @@ -4286,6 +4348,7 @@ spec: type: integer timeout: description: Maximum time a query may take before being aborted. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string type: object queryLogFile: @@ -4493,6 +4556,7 @@ spec: type: boolean remoteTimeout: description: Timeout for requests to the remote read endpoint. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string requiredMatchers: additionalProperties: @@ -4738,6 +4802,7 @@ spec: sendInterval: description: How frequently metric metadata is sent to the remote storage. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string type: object name: @@ -4876,6 +4941,7 @@ spec: type: object remoteTimeout: description: Timeout for requests to the remote write endpoint. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string sendExemplars: description: Enables sending of exemplars over remote write. @@ -5170,10 +5236,11 @@ spec: is '24h' if retentionSize is not set, and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds seconds minutes hours days weeks years). + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string retentionSize: - description: 'Maximum amount of disk space used by blocks. Supported - units: B, KB, MB, GB, TB, PB, EB. Ex: `512MB`.' + description: Maximum amount of disk space used by blocks. + pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$ type: string routePrefix: description: The route prefix Prometheus registers HTTP handlers for. @@ -5299,11 +5366,14 @@ spec: type: object type: object scrapeInterval: - description: 'Interval between consecutive scrapes. Default: `1m`' + default: 30s + description: 'Interval between consecutive scrapes. Default: `30s`' + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string scrapeTimeout: description: Number of seconds to wait for target to respond before erroring. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string secrets: description: Secrets is a list of Secrets in the same namespace as @@ -5711,13 +5781,13 @@ spec: automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource - only allows two specific types of objects, DataSourceRef allows - any non-core object, as well as PersistentVolumeClaim + only allows two specific types of objects, DataSourceRef + allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values - (dropping them), DataSourceRef preserves all values, - and generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + (dropping them), DataSourceRef preserves all values, + and generates an error if a disallowed value is + specified. (Alpha) Using this field requires the + AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource @@ -5934,11 +6004,11 @@ spec: and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as well - as PersistentVolumeClaim objects. * While DataSource - ignores disallowed values (dropping them), DataSourceRef preserves + DataSourceRef allows any non-core object, as well as + PersistentVolumeClaim objects. * While DataSource ignores + disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value - is specified. (Alpha) Using this field requires the + is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: @@ -6301,9 +6371,19 @@ spec: type: boolean logFormat: description: LogFormat for Thanos sidecar to be configured with. + enum: + - "" + - logfmt + - json type: string logLevel: description: LogLevel for Thanos sidecar to be configured with. + enum: + - "" + - debug + - info + - warn + - error type: string minTime: description: MinTime for Thanos sidecar to be configured with. @@ -6339,6 +6419,7 @@ spec: readyTimeout: description: ReadyTimeout is the maximum time Thanos sidecar will wait for Prometheus to start. Eg 10m + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string resources: description: Resources defines the resource requirements for the @@ -6573,10 +6654,10 @@ spec: description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway - tells the scheduler to schedule the pod in any location, but + tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce - the skew. A constraint is considered "Unsatisfiable" for - an incoming pod if and only if every possible node assignment + the skew. A constraint is considered "Unsatisfiable" for an + incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 @@ -7028,18 +7109,17 @@ spec: pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity - \ tracking are needed, c) the storage driver is specified - through a storage class, and d) the storage driver supports - dynamic volume provisioning through a PersistentVolumeClaim - (see EphemeralVolumeSource for more information on the - connection between this volume type and PersistentVolumeClaim). - \n Use PersistentVolumeClaim or one of the vendor-specific - APIs for volumes that persist for longer than the lifecycle - of an individual pod. \n Use CSI for light-weight local ephemeral - volumes if the CSI driver is meant to be used that way - see - the documentation of the driver for more information. \n A - pod can use both types of ephemeral volumes and persistent - volumes at the same time." + tracking are needed, c) the storage driver is specified through + a storage class, and d) the storage driver supports dynamic + volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource + for more information on the connection between this volume + type and PersistentVolumeClaim). \n Use PersistentVolumeClaim + or one of the vendor-specific APIs for volumes that persist + for longer than the lifecycle of an individual pod. \n Use + CSI for light-weight local ephemeral volumes if the CSI driver + is meant to be used that way - see the documentation of the + driver for more information. \n A pod can use both types of + ephemeral volumes and persistent volumes at the same time." properties: volumeClaimTemplate: description: "Will be used to create a stand-alone PVC to @@ -7127,13 +7207,13 @@ spec: other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as - well as PersistentVolumeClaim objects. * While - DataSource ignores disallowed values (dropping - them), DataSourceRef preserves all values, and - generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + DataSourceRef allows any non-core object, as well + as PersistentVolumeClaim objects. * While DataSource + ignores disallowed values (dropping them), DataSourceRef + preserves all values, and generates an error if + a disallowed value is specified. (Alpha) Using + this field requires the AnyVolumeDataSource feature + gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource @@ -8274,14 +8354,43 @@ spec: type: object status: description: 'Most recent observed status of the Prometheus cluster. Read-only. - Not included when requesting from the apiserver, only from the Prometheus - Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' properties: availableReplicas: description: Total number of available pods (ready for at least minReadySeconds) targeted by this Prometheus deployment. format: int32 type: integer + conditions: + description: The current state of the Prometheus deployment. + items: + description: PrometheusCondition represents the state of the resources + associated with the Prometheus resource. + properties: + lastTransitionTime: + description: lastTransitionTime is the time of the last update + to the current status property. + format: date-time + type: string + message: + description: Human-readable message indicating details for the + condition's last transition. + type: string + reason: + description: Reason for the condition's last transition. + type: string + status: + description: status of the condition. + type: string + type: + description: Type of the condition being reported. + type: string + required: + - lastTransitionTime + - status + - type + type: object + type: array paused: description: Represents whether any actions on the underlying managed objects are being performed. Only delete actions will be performed. @@ -8291,6 +8400,41 @@ spec: Prometheus deployment (their labels match the selector). format: int32 type: integer + shardStatuses: + description: The list has one entry per shard. Each entry provides + a summary of the shard status. + items: + properties: + availableReplicas: + description: Total number of available pods (ready for at least + minReadySeconds) targeted by this shard. + format: int32 + type: integer + replicas: + description: Total number of pods targeted by this shard. + format: int32 + type: integer + shardID: + description: Identifier of the shard. + type: string + unavailableReplicas: + description: Total number of unavailable pods targeted by this + shard. + format: int32 + type: integer + updatedReplicas: + description: Total number of non-terminated pods targeted by + this shard that have the desired spec. + format: int32 + type: integer + required: + - availableReplicas + - replicas + - shardID + - unavailableReplicas + - updatedReplicas + type: object + type: array unavailableReplicas: description: Total number of unavailable pods targeted by this Prometheus deployment. @@ -8313,7 +8457,8 @@ spec: type: object served: true storage: true - subresources: {} + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/charts/monitoring/crds/prometheusrules.yaml b/charts/monitoring/crds/prometheusrules.yaml index 1dd0243..02241a6 100644 --- a/charts/monitoring/crds/prometheusrules.yaml +++ b/charts/monitoring/crds/prometheusrules.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: prometheusrules.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: PrometheusRule listKind: PrometheusRuleList plural: prometheusrules + shortNames: + - promrule singular: prometheusrule scope: Namespaced versions: diff --git a/charts/monitoring/crds/servicemonitors.yaml b/charts/monitoring/crds/servicemonitors.yaml index 90fe834..f9887bc 100644 --- a/charts/monitoring/crds/servicemonitors.yaml +++ b/charts/monitoring/crds/servicemonitors.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: servicemonitors.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: ServiceMonitor listKind: ServiceMonitorList plural: servicemonitors + shortNames: + - smon singular: servicemonitor scope: Namespaced versions: @@ -149,7 +151,9 @@ spec: the timestamps present in scraped data. type: boolean interval: - description: Interval at which metrics should be scraped + description: Interval at which metrics should be scraped If + not specified Prometheus' global scrape interval is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string metricRelabelings: description: MetricRelabelConfigs to apply to samples before @@ -378,7 +382,10 @@ spec: description: HTTP scheme to use for scraping. type: string scrapeTimeout: - description: Timeout after which the scrape is ended + description: Timeout after which the scrape is ended If not + specified, the Prometheus global scrape timeout is used unless + it is less than `Interval` in which the latter is used. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ type: string targetPort: anyOf: diff --git a/charts/monitoring/crds/thanosrulers.yaml b/charts/monitoring/crds/thanosrulers.yaml index 79df29c..0c9aa9c 100644 --- a/charts/monitoring/crds/thanosrulers.yaml +++ b/charts/monitoring/crds/thanosrulers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: thanosrulers.monitoring.coreos.com spec: @@ -13,6 +13,8 @@ spec: kind: ThanosRuler listKind: ThanosRulerList plural: thanosrulers + shortNames: + - ruler singular: thanosruler scope: Namespaced versions: @@ -2168,6 +2170,42 @@ spec: evaluationInterval: description: Interval between consecutive evaluations. type: string + excludedFromEnforcement: + description: List of references to PrometheusRule objects to be excluded + from enforcing a namespace label of origin. Applies only if enforcedNamespaceLabel + set to true. + items: + description: ObjectReference references a PodMonitor, ServiceMonitor, + Probe or PrometheusRule object. + properties: + group: + default: monitoring.coreos.com + description: Group of the referent. When not specified, it defaults + to `monitoring.coreos.com` + enum: + - monitoring.coreos.com + type: string + name: + description: Name of the referent. When not set, all resources + are matched. + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + minLength: 1 + type: string + resource: + description: Resource of the referent. + enum: + - prometheusrules + - servicemonitors + - podmonitors + - probes + type: string + required: + - namespace + - resource + type: object + type: array externalPrefix: description: The external URL the Thanos Ruler instances will be available under. This is necessary to generate correct URLs. This is necessary @@ -3549,9 +3587,19 @@ spec: type: boolean logFormat: description: Log format for ThanosRuler to be configured with. + enum: + - "" + - logfmt + - json type: string logLevel: description: Log level for ThanosRuler to be configured with. + enum: + - "" + - debug + - info + - warn + - error type: string minReadySeconds: description: Minimum number of seconds for which a newly created pod @@ -3629,10 +3677,11 @@ spec: description: Priority class assigned to the Pods type: string prometheusRulesExcludedFromEnforce: - description: PrometheusRulesExcludedFromEnforce - list of Prometheus + description: 'PrometheusRulesExcludedFromEnforce - list of Prometheus rules to be excluded from enforcing of adding namespace labels. Works only if enforcedNamespaceLabel set to true. Make sure both - ruleNamespace and ruleName are set for each pair + ruleNamespace and ruleName are set for each pair Deprecated: use + excludedFromEnforcement instead.' items: description: PrometheusRuleExcludeConfig enables users to configure excluded PrometheusRule names and their namespaces to be ignored @@ -4095,13 +4144,13 @@ spec: automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource - only allows two specific types of objects, DataSourceRef allows - any non-core object, as well as PersistentVolumeClaim + only allows two specific types of objects, DataSourceRef + allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values - (dropping them), DataSourceRef preserves all values, - and generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + (dropping them), DataSourceRef preserves all values, + and generates an error if a disallowed value is + specified. (Alpha) Using this field requires the + AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource @@ -4318,11 +4367,11 @@ spec: and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as well - as PersistentVolumeClaim objects. * While DataSource - ignores disallowed values (dropping them), DataSourceRef preserves + DataSourceRef allows any non-core object, as well as + PersistentVolumeClaim objects. * While DataSource ignores + disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value - is specified. (Alpha) Using this field requires the + is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.' properties: apiGroup: @@ -4646,10 +4695,10 @@ spec: description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway - tells the scheduler to schedule the pod in any location, but + tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce - the skew. A constraint is considered "Unsatisfiable" for - an incoming pod if and only if every possible node assignment + the skew. A constraint is considered "Unsatisfiable" for an + incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 @@ -5075,18 +5124,17 @@ spec: pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity - \ tracking are needed, c) the storage driver is specified - through a storage class, and d) the storage driver supports - dynamic volume provisioning through a PersistentVolumeClaim - (see EphemeralVolumeSource for more information on the - connection between this volume type and PersistentVolumeClaim). - \n Use PersistentVolumeClaim or one of the vendor-specific - APIs for volumes that persist for longer than the lifecycle - of an individual pod. \n Use CSI for light-weight local ephemeral - volumes if the CSI driver is meant to be used that way - see - the documentation of the driver for more information. \n A - pod can use both types of ephemeral volumes and persistent - volumes at the same time." + tracking are needed, c) the storage driver is specified through + a storage class, and d) the storage driver supports dynamic + volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource + for more information on the connection between this volume + type and PersistentVolumeClaim). \n Use PersistentVolumeClaim + or one of the vendor-specific APIs for volumes that persist + for longer than the lifecycle of an individual pod. \n Use + CSI for light-weight local ephemeral volumes if the CSI driver + is meant to be used that way - see the documentation of the + driver for more information. \n A pod can use both types of + ephemeral volumes and persistent volumes at the same time." properties: volumeClaimTemplate: description: "Will be used to create a stand-alone PVC to @@ -5174,13 +5222,13 @@ spec: other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, - DataSourceRef allows any non-core object, as - well as PersistentVolumeClaim objects. * While - DataSource ignores disallowed values (dropping - them), DataSourceRef preserves all values, and - generates an error if a disallowed value is specified. - (Alpha) Using this field requires the AnyVolumeDataSource - feature gate to be enabled.' + DataSourceRef allows any non-core object, as well + as PersistentVolumeClaim objects. * While DataSource + ignores disallowed values (dropping them), DataSourceRef + preserves all values, and generates an error if + a disallowed value is specified. (Alpha) Using + this field requires the AnyVolumeDataSource feature + gate to be enabled.' properties: apiGroup: description: APIGroup is the group for the resource diff --git a/charts/monitoring/templates/rbac/clusterrole.yaml b/charts/monitoring/templates/rbac/clusterrole.yaml index 93777b8..5beaafa 100644 --- a/charts/monitoring/templates/rbac/clusterrole.yaml +++ b/charts/monitoring/templates/rbac/clusterrole.yaml @@ -16,6 +16,7 @@ rules: - "alertmanagers/finalizers" - "alertmanagerconfigs" - "prometheuses" + - "prometheuses/status" - "prometheuses/finalizers" - "thanosrulers" - "thanosrulers/finalizers" diff --git a/charts/monitoring/values.yaml b/charts/monitoring/values.yaml index 692d034..9b09148 100644 --- a/charts/monitoring/values.yaml +++ b/charts/monitoring/values.yaml @@ -13,7 +13,7 @@ image: # Override the default Docker image name if you use a custom image or a repository mirror name: "quay.io/prometheus-operator/prometheus-operator" # Use this optional value to override the tag of the image to relase instead of relying on the Chart one - # version: "v0.55.1" + # version: "v0.56.2" # Customize the deployment of the Prometheus Operator image deploy: @@ -69,7 +69,7 @@ prometheus: # Override the default Docker image name if you use a custom image or a repository mirror name: "quay.io/prometheus/prometheus" # Use this optional value to override the tag of the image to relase instead of relying on the Chart one - version: "v2.33.5" + version: "v2.35.0" # You are encouraged to setup the resources that the application can use via this # property or at least via a LimitRange resource in the namespace @@ -108,7 +108,7 @@ prometheus: # Override the default Docker image name if you use a custom image or a repository mirror name: "quay.io/prometheus-operator/prometheus-config-reloader" # Use this optional value to override the tag of the image to relase instead of relying on the Chart one - version: "v0.55.1" + version: "v0.56.2" resources: cpu: "100m" diff --git a/charts/traefik-ingress/Chart.yaml b/charts/traefik-ingress/Chart.yaml index 0e251e8..6ec15df 100644 --- a/charts/traefik-ingress/Chart.yaml +++ b/charts/traefik-ingress/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: traefik-ingress -version: 1.5.4 +version: 1.5.5 kubeVersion: ">= 1.17.0-0" -appVersion: 2.6.3 +appVersion: 2.7.0 description: "A Kubernetes Ingress Controller based on Traefik" type: application keywords: @@ -20,5 +20,7 @@ maintainers: url: https://github.com/lterrac - name: "Daniele Della Rocca" url: https://github.com/ddellarocca + - name: "Giorgia Fiscaletti" + url: https://github.com/fiscafusca icon: https://docs.traefik.io/assets/img/traefik.logo.png deprecated: false diff --git a/charts/traefik-ingress/values.yaml b/charts/traefik-ingress/values.yaml index 2363fec..ffa5c44 100644 --- a/charts/traefik-ingress/values.yaml +++ b/charts/traefik-ingress/values.yaml @@ -26,7 +26,7 @@ image: # Override the default Docker image name if you use a custom image or a repository mirror name: "traefik" # Use this optional value to override the tag of the image to relase instead of relying on the Chart one - # version: 2.6.3 + # version: 2.7.0 # Customize the deployment of Traefik image deploy: