From b13711cb95145adb1a067a4164ec3c4bdc430ea5 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Wed, 15 Jan 2025 11:22:51 +0100 Subject: [PATCH] fixup! fixup! Merge limits_config and runtime_config Signed-off-by: Christian Haudum --- pkg/runtime/limits.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/runtime/limits.go b/pkg/runtime/limits.go index e8fc9c75c53a7..0502135b6a833 100644 --- a/pkg/runtime/limits.go +++ b/pkg/runtime/limits.go @@ -247,14 +247,12 @@ type Limits struct { S3SSEKMSKeyID string `yaml:"s3_sse_kms_key_id" json:"s3_sse_kms_key_id" doc:"nocli|description=S3 server-side encryption KMS Key ID. Ignored if the SSE type override is not set."` S3SSEKMSEncryptionContext string `yaml:"s3_sse_kms_encryption_context" json:"s3_sse_kms_encryption_context" doc:"nocli|description=S3 server-side encryption KMS encryption context. If unset and the key ID override is set, the encryption context will not be provided to S3. Ignored if the SSE type override is not set."` - LogStreamCreation bool `yaml:"log_stream_creation"` - LogPushRequest bool `yaml:"log_push_request"` - LogPushRequestStreams bool `yaml:"log_push_request_streams"` - LogDuplicateMetrics bool `yaml:"log_duplicate_metrics"` - LogDuplicateStreamInfo bool `yaml:"log_duplicate_stream_info"` - - // LimitedLogPushErrors is to be implemented and will allow logging push failures at a controlled pace. - LimitedLogPushErrors bool `yaml:"limited_log_push_errors"` + LogStreamCreation bool `yaml:"log_stream_creation" json:"log_stream_creation"` + LogPushRequest bool `yaml:"log_push_request" json:"log_stream_request"` + LogPushRequestStreams bool `yaml:"log_push_request_streams" json:"log_push_request_streams"` + LogDuplicateMetrics bool `yaml:"log_duplicate_metrics" json:"log_duplicate_metrics"` + LogDuplicateStreamInfo bool `yaml:"log_duplicate_stream_info" json:"log_duplicate_stream_info"` + LimitedLogPushErrors bool `yaml:"limited_log_push_errors" json:"limited_log_push_errors"` } type FieldDetectorConfig struct {