build(deps): bump the main group with 2 updates (#789)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
aiven · Jul 16, 2024 · e29c3f5 · e29c3f5
1 parent 59691fa
commit e29c3f5
Show file tree

Hide file tree

Showing 17 changed files with 122 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD
 
+- Add `Cassandra` field `userConfig.cassandra.read_request_timeout_in_ms`, type `integer`: How long the
+  coordinator waits for read operations to complete before timing it out
+- Add `Cassandra` field `userConfig.cassandra.write_request_timeout_in_ms`, type `integer`: How long
+  the coordinator waits for write requests to complete with at least one node in the local datacenter
+- Add `OpenSearch` field `userConfig.opensearch.knn_memory_circuit_breaker_enabled`, type `boolean`:
+  Enable or disable KNN memory circuit breaker. Defaults to true
+- Add `OpenSearch` field `userConfig.opensearch.knn_memory_circuit_breaker_limit`, type `integer`: Maximum
+  amount of memory that can be used for KNN index. Defaults to 50% of the JVM heap size
+- Change `PostgreSQL` field `userConfig.pg.log_line_prefix`: enum ~~`['%m [%p] %q[user=%u,db=%d,app=%a]
+', '%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h ', 'pid=%p,user=%u,db=%d,app=%a,client=%h ']`~~
+  → `['%m [%p] %q[user=%u,db=%d,app=%a] ', '%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h ',
+'pid=%p,user=%u,db=%d,app=%a,client=%h ', 'pid=%p,user=%u,db=%d,app=%a,client=%h,txid=%x,qid=%Q ']`
+
 ## v0.23.0 - 2024-07-12
 
 - Ignore `http.StatusBadRequest` on `ClickhouseGrant` deletion

diff --git a/api/v1alpha1/userconfig/service/cassandra/cassandra.go b/api/v1alpha1/userconfig/service/cassandra/cassandra.go
diff --git a/api/v1alpha1/userconfig/service/cassandra/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/cassandra/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/opensearch/opensearch.go b/api/v1alpha1/userconfig/service/opensearch/opensearch.go
diff --git a/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go
diff --git a/api/v1alpha1/userconfig/service/pg/pg.go b/api/v1alpha1/userconfig/service/pg/pg.go
diff --git a/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml b/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml
@@ -271,6 +271,21 @@ spec:
                             service belong. Can be set only when creating the service.
                           maxLength: 128
                           type: string
+                        read_request_timeout_in_ms:
+                          description:
+                            How long the coordinator waits for read operations
+                            to complete before timing it out. 5 seconds by default.
+                          maximum: 10000
+                          minimum: 1000
+                          type: integer
+                        write_request_timeout_in_ms:
+                          description:
+                            How long the coordinator waits for write requests
+                            to complete with at least one node in the local datacenter.
+                            2 seconds by default.
+                          maximum: 10000
+                          minimum: 1000
+                          type: integer
                       type: object
                     cassandra_version:
                       description: Cassandra version

diff --git a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
@@ -707,6 +707,18 @@ spec:
                           maximum: 2147483647
                           minimum: 1
                           type: integer
+                        knn_memory_circuit_breaker_enabled:
+                          description:
+                            Enable or disable KNN memory circuit breaker.
+                            Defaults to true.
+                          type: boolean
+                        knn_memory_circuit_breaker_limit:
+                          description:
+                            Maximum amount of memory that can be used for
+                            KNN index. Defaults to 50% of the JVM heap size.
+                          maximum: 100
+                          minimum: 3
+                          type: integer
                         override_main_response_version:
                           description:
                             Compatibility mode sets OpenSearch to report

diff --git a/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml b/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml
@@ -522,6 +522,8 @@ spec:
                             - "'pid=%p,user=%u,db=%d,app=%a,client=%h '"
                             - "'%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h '"
                             - "'%m [%p] %q[user=%u,db=%d,app=%a] '"
+                            - "'pid=%p,user=%u,db=%d,app=%a,client=%h,txid=%x,qid=%Q
+                              '"
                           type: string
                         log_min_duration_statement:
                           description:

diff --git a/config/crd/bases/aiven.io_cassandras.yaml b/config/crd/bases/aiven.io_cassandras.yaml
@@ -271,6 +271,21 @@ spec:
                             service belong. Can be set only when creating the service.
                           maxLength: 128
                           type: string
+                        read_request_timeout_in_ms:
+                          description:
+                            How long the coordinator waits for read operations
+                            to complete before timing it out. 5 seconds by default.
+                          maximum: 10000
+                          minimum: 1000
+                          type: integer
+                        write_request_timeout_in_ms:
+                          description:
+                            How long the coordinator waits for write requests
+                            to complete with at least one node in the local datacenter.
+                            2 seconds by default.
+                          maximum: 10000
+                          minimum: 1000
+                          type: integer
                       type: object
                     cassandra_version:
                       description: Cassandra version

diff --git a/config/crd/bases/aiven.io_opensearches.yaml b/config/crd/bases/aiven.io_opensearches.yaml
@@ -707,6 +707,18 @@ spec:
                           maximum: 2147483647
                           minimum: 1
                           type: integer
+                        knn_memory_circuit_breaker_enabled:
+                          description:
+                            Enable or disable KNN memory circuit breaker.
+                            Defaults to true.
+                          type: boolean
+                        knn_memory_circuit_breaker_limit:
+                          description:
+                            Maximum amount of memory that can be used for
+                            KNN index. Defaults to 50% of the JVM heap size.
+                          maximum: 100
+                          minimum: 3
+                          type: integer
                         override_main_response_version:
                           description:
                             Compatibility mode sets OpenSearch to report

diff --git a/config/crd/bases/aiven.io_postgresqls.yaml b/config/crd/bases/aiven.io_postgresqls.yaml
@@ -522,6 +522,8 @@ spec:
                             - "'pid=%p,user=%u,db=%d,app=%a,client=%h '"
                             - "'%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h '"
                             - "'%m [%p] %q[user=%u,db=%d,app=%a] '"
+                            - "'pid=%p,user=%u,db=%d,app=%a,client=%h,txid=%x,qid=%Q
+                              '"
                           type: string
                         log_min_duration_statement:
                           description:

diff --git a/docs/docs/api-reference/cassandra.md b/docs/docs/api-reference/cassandra.md
@@ -229,6 +229,8 @@ cassandra configuration values.
 - [`batch_size_fail_threshold_in_kb`](#spec.userConfig.cassandra.batch_size_fail_threshold_in_kb-property){: name='spec.userConfig.cassandra.batch_size_fail_threshold_in_kb-property'} (integer, Minimum: 1, Maximum: 1000000). Fail any multiple-partition batch exceeding this value. 50kb (10x warn threshold) by default.
 - [`batch_size_warn_threshold_in_kb`](#spec.userConfig.cassandra.batch_size_warn_threshold_in_kb-property){: name='spec.userConfig.cassandra.batch_size_warn_threshold_in_kb-property'} (integer, Minimum: 1, Maximum: 1000000). Log a warning message on any multiple-partition batch size exceeding this value.5kb per batch by default.Caution should be taken on increasing the size of this thresholdas it can lead to node instability.
 - [`datacenter`](#spec.userConfig.cassandra.datacenter-property){: name='spec.userConfig.cassandra.datacenter-property'} (string, MaxLength: 128). Name of the datacenter to which nodes of this service belong. Can be set only when creating the service.
+- [`read_request_timeout_in_ms`](#spec.userConfig.cassandra.read_request_timeout_in_ms-property){: name='spec.userConfig.cassandra.read_request_timeout_in_ms-property'} (integer, Minimum: 1000, Maximum: 10000). How long the coordinator waits for read operations to complete before timing it out. 5 seconds by default.
+- [`write_request_timeout_in_ms`](#spec.userConfig.cassandra.write_request_timeout_in_ms-property){: name='spec.userConfig.cassandra.write_request_timeout_in_ms-property'} (integer, Minimum: 1000, Maximum: 10000). How long the coordinator waits for write requests to complete with at least one node in the local datacenter. 2 seconds by default.
 
 ### ip_filter {: #spec.userConfig.ip_filter }
 

diff --git a/docs/docs/api-reference/opensearch.md b/docs/docs/api-reference/opensearch.md
@@ -313,6 +313,8 @@ OpenSearch settings.
 - [`ism_history_max_docs`](#spec.userConfig.opensearch.ism_history_max_docs-property){: name='spec.userConfig.opensearch.ism_history_max_docs-property'} (integer, Minimum: 1). The maximum number of documents before rolling over the audit history index.
 - [`ism_history_rollover_check_period`](#spec.userConfig.opensearch.ism_history_rollover_check_period-property){: name='spec.userConfig.opensearch.ism_history_rollover_check_period-property'} (integer, Minimum: 1, Maximum: 2147483647). The time between rollover checks for the audit history index in hours.
 - [`ism_history_rollover_retention_period`](#spec.userConfig.opensearch.ism_history_rollover_retention_period-property){: name='spec.userConfig.opensearch.ism_history_rollover_retention_period-property'} (integer, Minimum: 1, Maximum: 2147483647). How long audit history indices are kept in days.
+- [`knn_memory_circuit_breaker_enabled`](#spec.userConfig.opensearch.knn_memory_circuit_breaker_enabled-property){: name='spec.userConfig.opensearch.knn_memory_circuit_breaker_enabled-property'} (boolean). Enable or disable KNN memory circuit breaker. Defaults to true.
+- [`knn_memory_circuit_breaker_limit`](#spec.userConfig.opensearch.knn_memory_circuit_breaker_limit-property){: name='spec.userConfig.opensearch.knn_memory_circuit_breaker_limit-property'} (integer, Minimum: 3, Maximum: 100). Maximum amount of memory that can be used for KNN index. Defaults to 50% of the JVM heap size.
 - [`override_main_response_version`](#spec.userConfig.opensearch.override_main_response_version-property){: name='spec.userConfig.opensearch.override_main_response_version-property'} (boolean). Compatibility mode sets OpenSearch to report its version as 7.10 so clients continue to work. Default is false.
 - [`plugins_alerting_filter_by_backend_roles`](#spec.userConfig.opensearch.plugins_alerting_filter_by_backend_roles-property){: name='spec.userConfig.opensearch.plugins_alerting_filter_by_backend_roles-property'} (boolean). Enable or disable filtering of alerting by backend roles. Requires Security plugin. Defaults to false.
 - [`reindex_remote_whitelist`](#spec.userConfig.opensearch.reindex_remote_whitelist-property){: name='spec.userConfig.opensearch.reindex_remote_whitelist-property'} (array of strings, MaxItems: 32). Whitelisted addresses for reindexing. Changing this value will cause all OpenSearch instances to restart.

diff --git a/docs/docs/api-reference/postgresql.md b/docs/docs/api-reference/postgresql.md
@@ -290,7 +290,7 @@ postgresql.conf configuration values.
 - [`jit`](#spec.userConfig.pg.jit-property){: name='spec.userConfig.pg.jit-property'} (boolean). Controls system-wide use of Just-in-Time Compilation (JIT).
 - [`log_autovacuum_min_duration`](#spec.userConfig.pg.log_autovacuum_min_duration-property){: name='spec.userConfig.pg.log_autovacuum_min_duration-property'} (integer, Minimum: -1, Maximum: 2147483647). Causes each action executed by autovacuum to be logged if it ran for at least the specified number of milliseconds. Setting this to zero logs all autovacuum actions. Minus-one (the default) disables logging autovacuum actions.
 - [`log_error_verbosity`](#spec.userConfig.pg.log_error_verbosity-property){: name='spec.userConfig.pg.log_error_verbosity-property'} (string, Enum: `TERSE`, `DEFAULT`, `VERBOSE`). Controls the amount of detail written in the server log for each message that is logged.
-- [`log_line_prefix`](#spec.userConfig.pg.log_line_prefix-property){: name='spec.userConfig.pg.log_line_prefix-property'} (string, Enum: `'pid=%p,user=%u,db=%d,app=%a,client=%h '`, `'%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h '`, `'%m [%p] %q[user=%u,db=%d,app=%a] '`). Choose from one of the available log formats.
+- [`log_line_prefix`](#spec.userConfig.pg.log_line_prefix-property){: name='spec.userConfig.pg.log_line_prefix-property'} (string, Enum: `'pid=%p,user=%u,db=%d,app=%a,client=%h '`, `'%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h '`, `'%m [%p] %q[user=%u,db=%d,app=%a] '`, `'pid=%p,user=%u,db=%d,app=%a,client=%h,txid=%x,qid=%Q '`). Choose from one of the available log formats.
 - [`log_min_duration_statement`](#spec.userConfig.pg.log_min_duration_statement-property){: name='spec.userConfig.pg.log_min_duration_statement-property'} (integer, Minimum: -1, Maximum: 86400000). Log statements that take more than this number of milliseconds to run, -1 disables.
 - [`log_temp_files`](#spec.userConfig.pg.log_temp_files-property){: name='spec.userConfig.pg.log_temp_files-property'} (integer, Minimum: -1, Maximum: 2147483647). Log statements for each temporary file created larger than this number of kilobytes, -1 disables.
 - [`max_files_per_process`](#spec.userConfig.pg.max_files_per_process-property){: name='spec.userConfig.pg.max_files_per_process-property'} (integer, Minimum: 1000, Maximum: 4096). PostgreSQL maximum number of files that can be open per process.

diff --git a/go.mod b/go.mod
@@ -5,13 +5,14 @@ go 1.22
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.26.0
 	github.com/aiven/aiven-go-client/v2 v2.23.1-0.20240708122045-b60dda2ba032
-	github.com/aiven/go-api-schemas v1.78.0
-	github.com/aiven/go-client-codegen v0.13.0
+	github.com/aiven/go-api-schemas v1.79.0
+	github.com/aiven/go-client-codegen v0.15.0
 	github.com/dave/jennifer v1.7.0
 	github.com/docker/go-units v0.5.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
+	github.com/hashicorp/go-multierror v1.1.1
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/liip/sheriff v0.12.0
 	github.com/otiai10/copy v1.14.0
@@ -52,7 +53,6 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect

diff --git a/go.sum b/go.sum
@@ -39,10 +39,10 @@ github.com/ClickHouse/clickhouse-go/v2 v2.26.0 h1:j4/y6NYaCcFkJwN/TU700ebW+nmsIy
 github.com/ClickHouse/clickhouse-go/v2 v2.26.0/go.mod h1:iDTViXk2Fgvf1jn2dbJd1ys+fBkdD1UMRnXlwmhijhQ=
 github.com/aiven/aiven-go-client/v2 v2.23.1-0.20240708122045-b60dda2ba032 h1:Z6yrLuINkO+Wc3aVf0atS9JmokB8D7+1lxmOXGBzGks=
 github.com/aiven/aiven-go-client/v2 v2.23.1-0.20240708122045-b60dda2ba032/go.mod h1:KdHfLIlIRZIfCSEBd39j1Q81jlSb6Nd+oCQKqERfnuA=
-github.com/aiven/go-api-schemas v1.78.0 h1:XAOfoP5kH3sevzLuVYqDHsUkbInouybjgWj0ugn+W1s=
-github.com/aiven/go-api-schemas v1.78.0/go.mod h1:FYR22WcKLisZ1CYqyyGk6XqNSyxfAUtaQd+P2ydwc5A=
-github.com/aiven/go-client-codegen v0.13.0 h1:fPB0D4Y/jp3IyfrwRLWeZ2Ipa2T97zkudJcnnGuHUys=
-github.com/aiven/go-client-codegen v0.13.0/go.mod h1:Sajbdpjn1/m5g2D6EDfiSnxl9pj9hxe8+hpG1CkCkhs=
+github.com/aiven/go-api-schemas v1.79.0 h1:V6H7XKbsgfwWWLBazj53ZiQygCZdMB9os2ZP5wvgzIw=
+github.com/aiven/go-api-schemas v1.79.0/go.mod h1:FYR22WcKLisZ1CYqyyGk6XqNSyxfAUtaQd+P2ydwc5A=
+github.com/aiven/go-client-codegen v0.15.0 h1:ZM2qboMC7mrvpMJbjyd5C71XxfHDjh7G285N+HwiFH4=
+github.com/aiven/go-client-codegen v0.15.0/go.mod h1:Sajbdpjn1/m5g2D6EDfiSnxl9pj9hxe8+hpG1CkCkhs=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=