WIP: catalog api bss

Breaking-Changes.md

@@ -1,5 +1,29 @@
 # 2GIS On-Premise Breaking-Changes
 
+## [1.27.0]
+
+### PRO
+- ui.strategy renamed to strategy
+- ui.image renamed to image
+- ui.replicas renamed to replicas
+- ui.revisionHistoryLimit renamed to revisionHistoryLimit
+- ui.terminationGracePeriodSeconds renamed to terminationGracePeriodSeconds
+- ui.nodeSelector renamed to nodeSelector
+- ui.affinity renamed to affinity
+- ui.tolerations renamed to tolerations
+- ui.podAnnotations renamed to podAnnotations
+- ui.podLabels renamed to podLabels
+- ui.annotations renamed to annotations
+- ui.labels renamed to labels
+- ui.readinessProbe renamed to readinessProbe
+- ui.livenessProbe renamed to livenessProbe
+- ui.containerPort renamed to containerPort
+- ui.service renamed to service
+- ui.ingress renamed to ingress
+- ui.resources renamed to resources
+- ui.hpa renamed to hpa
+
+
 ## [1.26.0]
 
 ### citylens

charts/catalog-api/README.md

@@ -152,10 +152,13 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo
 
 ### Search settings
 
-| Name                    | Description                                                                                                                                          | Value   |
-| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `search.url`            | URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required** | `""`    |
-| `search.connectTimeout` | Timeout for connect to the Search service                                                                                                            | `300ms` |
+| Name                     | Description                                                                                                                                          | Value   |
+| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `search.url`             | URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required** | `""`    |
+| `search.connectTimeout`  | Timeout for connect to the Search service                                                                                                            | `300ms` |
+| `search.minConnections`  | The minimum number connections to the Search service                                                                                                 | `10`    |
+| `search.maxConnections`  | The maximum number connections to the Search service                                                                                                 | `100`   |
+| `search.maxOpenRequests` | The maximum number open requests to the Search service                                                                                               | `128`   |
 
 ### Keys settings
 
@@ -178,6 +181,32 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo
 | `license.url`            | Address of the License service v1. Ex: http://license.svc **Required** | `""`  |
 | `license.requestTimeout` | Timeout for requests to the License service                            | `1s`  |
 
+### Statistic settings
+
+| Name                                | Description                                                                                                                                     | Value   |
+| ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `stat.request.enabled`              | If statistic by request is enabled                                                                                                              | `false` |
+| `stat.request.buffer.lifetime`      | Lifetime of request Statistic buffer                                                                                                            | `5s`    |
+| `stat.request.buffer.sendTimeout`   | Timeout between sending request statistic messages                                                                                              | `2s`    |
+| `stat.request.buffer.sendLimit`     | The maximum number of request messages in the buffer before they are sent to the Statistic                                                      | `256`   |
+| `stat.search.enabled`               | If statistic by search is enabled                                                                                                               | `false` |
+| `stat.search.buffer.lifetime`       | Lifetime of search Statistic buffer                                                                                                             | `5s`    |
+| `stat.search.buffer.sendTimeout`    | Timeout between sending search statistic messages                                                                                               | `2s`    |
+| `stat.search.buffer.sendLimit`      | The maximum number of search messages in the buffer before they are sent to the Statistic                                                       | `256`   |
+| `stat.client.url`                   | URL of the statistic service. Ex: http(s)://stat.svc                                                                                            | `""`    |
+| `stat.client.connectingTimeout`     | The time period within which the TCP connecting process must be completed                                                                       | `500ms` |
+| `stat.client.idleTimeout`           | The time after which an idle connection will be automatically closed                                                                            | `250ms` |
+| `stat.client.minConnections`        | The minimum number of parallel connections that a pool should keep alive ("hot")                                                                | `1`     |
+| `stat.client.maxConnections`        | The maximum number of parallel connections that a connection pool to a single host endpoint is allowed to establish. Must be greater than zero  | `2`     |
+| `stat.client.maxOpenRequests`       | The maximum number of open requests accepted into the pool across all  materializations of any of its client flows                              | `4`     |
+| `stat.client.maxRetries`            | The maximum number of times failed requests are attempted again, (if the request can be safely retried) before giving up and returning an error | `4`     |
+| `stat.client.maxConnectionLifetime` | The maximum duration for a connection to be kept alive                                                                                          | `5m`    |
+| `stat.client.baseConnectionBackoff` | The minimum duration to backoff new connection attempts after the previous connection attempt failed                                            | `500ms` |
+| `stat.client.maxConnectionBackoff`  | Maximum backoff duration between failed connection attempts                                                                                     | `10s`   |
+| `stat.client.responseTimeout`       | The time period after the response was dispatched                                                                                               | `250ms` |
+| `stat.dispatcher.fixedPoolSize`     | Fixed number of threads used                                                                                                                    | `1`     |
+| `stat.dispatcher.throughput`        | Throughput defines the maximum number of messages to be processed per actor before the thread jumps to the next actor                           | `4`     |
+
 ### Kubernetes Importer job settings
 
 | Name                                  | Description                                                                                                        | Value |

charts/catalog-api/templates/api/deployment.yaml

@@ -79,6 +79,7 @@ spec:
             {{- include "catalog.env.search" . | nindent 12 }}
             {{- include "catalog.env.keys" . | nindent 12 }}
             {{- include "catalog.env.license" . | nindent 12 }}
+            {{- include "catalog.env.stat" . | nindent 12 }}
             {{- if .Values.customCAs.bundle }}
             {{- include "catalog.env.custom.ca.path" . | nindent 12 }}
             {{- end }}

charts/catalog-api/templates/helpers.tpl

@@ -149,6 +149,12 @@ onprem
   value: "{{ required "A valid .Values.search.url entry required" .Values.search.url }}"
 - name: CATALOG_SAPPHIRE_CONNECTION_TIMEOUT
   value: "{{ .Values.search.connectTimeout }}"
+- name: CATALOG_SAPPHIRE_MIN_CONNECTIONS
+  value: "{{ .Values.search.minConnections }}"
+- name: CATALOG_SAPPHIRE_MAX_CONNECTIONS
+  value: "{{ .Values.search.maxConnections }}"
+- name: CATALOG_SAPPHIRE_MAX_OPEN_REQUESTS
+  value: "{{ .Values.search.maxOpenRequests }}"
 {{- end }}
 
 {{- define "catalog.env.keys" -}}
@@ -182,6 +188,51 @@ onprem
   value: "{{ .Values.license.requestTimeout }}"
 {{- end }}
 
+{{- define "catalog.env.stat" -}}
+- name: CATALOG_BSS_ENDPOINT
+  value: "{{ .Values.stat.url }}"
+- name: CATALOG_BSS_REQUEST_ENABLED
+  value: "{{ .Values.stat.request.enabled }}"
+- name: CATALOG_BSS_REQUEST_BUFFER_LIFETIME
+  value: "{{ .Values.stat.request.buffer.lifetime }}"
+- name: CATALOG_BSS_REQUEST_BUFFER_SEND_TIMEOUT
+  value: "{{ .Values.stat.request.buffer.sendTimeout }}"
+- name: CATALOG_BSS_REQUEST_BUFFER_SEND_LIMIT
+  value: "{{ .Values.stat.request.buffer.sendLimit }}"
+- name: CATALOG_BSS_SEARCH_ENABLED
+  value: "{{ .Values.stat.search.enabled }}"
+- name: CATALOG_BSS_SEARCH_BUFFER_LIFETIME
+  value: "{{ .Values.stat.search.buffer.lifetime }}"
+- name: CATALOG_BSS_SEARCH_BUFFER_SEND_TIMEOUT
+  value: "{{ .Values.stat.search.buffer.sendTimeout }}"
+- name: CATALOG_BSS_SEARCH_BUFFER_SEND_LIMIT
+  value: "{{ .Values.stat.search.buffer.sendLimit }}"
+- name: CATALOG_BSS_CONNECTING_TIMEOUT
+  value: "{{ .Values.stat.client.connectingTimeout }}"
+- name: CATALOG_BSS_IDLE_TIMEOUT
+  value: "{{ .Values.stat.client.Idle_timeout }}"
+- name: CATALOG_BSS_MIN_CONNECTIONS
+  value: "{{ .Values.stat.client.minConnections }}"
+- name: CATALOG_BSS_MAX_CONNECTIONS
+  value: "{{ .Values.stat.client.maxConnections }}"
+- name: CATALOG_BSS_MAX_OPEN_REQUESTS
+  value: "{{ .Values.stat.client.maxOpenRequests }}"
+- name: CATALOG_BSS_MAX_RETRIES
+  value: "{{ .Values.stat.client.maxRetries }}"
+- name: CATALOG_BSS_CONNECTION_LIFETIME
+  value: "{{ .Values.stat.client.maxConnectionLifetime }}"
+- name: CATALOG_BSS_BASE_CONNECTION_BACKOFF
+  value: "{{ .Values.stat.client.baseConnectionBackoff }}"
+- name: CATALOG_BSS_MAX_CONNECTION_BACKOFF
+  value: "{{ .Values.stat.client.maxConnectionBackoff }}"
+- name: CATALOG_BSS_RESPONSE_TIMEOUT
+  value: "{{ .Values.stat.client.responseTimeout }}"
+- name: CATALOG_BSS_DISPATCHER_FIXED_POOL_SIZE
+  value: "{{ .Values.stat.dispatcher.fixedPoolSize }}"
+- name: CATALOG_BSS_DISPATCHER_THROUGHPUT
+  value: "{{ .Values.stat.dispatcherThroughput }}"
+{{- end }}
+
 {{- define "catalog.env.importer" -}}
 - name: IMPORTER_DB_CATALOG_SCHEMA
   value: "{{ include "catalog.manifestCode" . }}"

charts/catalog-api/values.yaml

@@ -213,10 +213,16 @@ api:
 
 # @param search.url URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required**
 # @param search.connectTimeout Timeout for connect to the Search service
+# @param search.minConnections The minimum number connections to the Search service
+# @param search.maxConnections The maximum number connections to the Search service
+# @param search.maxOpenRequests The maximum number open requests to the Search service
 
 search:
   url: ''
   connectTimeout: 300ms
+  minConnections: 10
+  maxConnections: 100
+  maxOpenRequests: 128
 
 # @section Keys settings
 
@@ -251,6 +257,58 @@ license:
   url: ''
   requestTimeout: 1s
 
+# @section Statistic settings
+
+# @param stat.request.enabled If statistic by request is enabled
+# @param stat.request.buffer.lifetime Lifetime of request Statistic buffer
+# @param stat.request.buffer.sendTimeout Timeout between sending request statistic messages
+# @param stat.request.buffer.sendLimit The maximum number of request messages in the buffer before they are sent to the Statistic
+# @param stat.search.enabled If statistic by search is enabled
+# @param stat.search.buffer.lifetime Lifetime of search Statistic buffer
+# @param stat.search.buffer.sendTimeout Timeout between sending search statistic messages
+# @param stat.search.buffer.sendLimit The maximum number of search messages in the buffer before they are sent to the Statistic
+# @param stat.client.url URL of the statistic service. Ex: http(s)://stat.svc
+# @param stat.client.connectingTimeout The time period within which the TCP connecting process must be completed
+# @param stat.client.idleTimeout The time after which an idle connection will be automatically closed
+# @param stat.client.minConnections The minimum number of parallel connections that a pool should keep alive ("hot")
+# @param stat.client.maxConnections The maximum number of parallel connections that a connection pool to a single host endpoint is allowed to establish. Must be greater than zero
+# @param stat.client.maxOpenRequests The maximum number of open requests accepted into the pool across all  materializations of any of its client flows
+# @param stat.client.maxRetries The maximum number of times failed requests are attempted again, (if the request can be safely retried) before giving up and returning an error
+# @param stat.client.maxConnectionLifetime The maximum duration for a connection to be kept alive
+# @param stat.client.baseConnectionBackoff The minimum duration to backoff new connection attempts after the previous connection attempt failed
+# @param stat.client.maxConnectionBackoff Maximum backoff duration between failed connection attempts
+# @param stat.client.responseTimeout The time period after the response was dispatched
+# @param stat.dispatcher.fixedPoolSize Fixed number of threads used
+# @param stat.dispatcher.throughput Throughput defines the maximum number of messages to be processed per actor before the thread jumps to the next actor
+
+stat:
+  request:
+    enabled: false
+    buffer:
+      lifetime: 5s
+      sendTimeout: 2s
+      sendLimit: 256
+  search:
+    enabled: false
+    buffer:
+      lifetime: 5s
+      sendTimeout: 2s
+      sendLimit: 256
+  client:
+    url: ''
+    connectingTimeout: 500ms
+    idleTimeout: 250ms
+    minConnections: 1
+    maxConnections: 2
+    maxOpenRequests: 4
+    maxRetries: 4
+    maxConnectionLifetime: 5m
+    baseConnectionBackoff: 500ms
+    maxConnectionBackoff: 10s
+    responseTimeout: 250ms
+  dispatcher:
+    fixedPoolSize: 1
+    throughput: 4
 
 # @section Kubernetes Importer job settings
 

charts/citylens/Chart.yaml

@@ -4,7 +4,7 @@ type: application
 description: A Helm chart for Kubernetes to deploy Citylens service
 
 version: 1.26.0
-appVersion: 1.11.1
+appVersion: 1.12.0
 
 maintainers:
 - name: 2gis

charts/citylens/README.md

@@ -47,7 +47,7 @@ See the [documentation]() to learn about:
 | Name                   | Description  | Value                          |
 | ---------------------- | ------------ | ------------------------------ |
 | `api.image.repository` | Repository.  | `2gis-on-premise/citylens-api` |
-| `api.image.tag`        | Tag.         | `1.11.1`                       |
+| `api.image.tag`        | Tag.         | `1.12.0`                       |
 | `api.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -133,7 +133,7 @@ See the [documentation]() to learn about:
 | Name                   | Description  | Value                          |
 | ---------------------- | ------------ | ------------------------------ |
 | `web.image.repository` | Repository.  | `2gis-on-premise/citylens-web` |
-| `web.image.tag`        | Tag.         | `1.11.1`                       |
+| `web.image.tag`        | Tag.         | `1.12.0`                       |
 | `web.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -351,7 +351,7 @@ See the [documentation]() to learn about:
 | Name                                               | Description                                                                                                                                    | Value                              |
 | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
 | `worker.dashboardBatchEvents.image.repository`     | Repository.                                                                                                                                    | `2gis-on-premise/citylens-workers` |
-| `worker.dashboardBatchEvents.image.tag`            | Tag.                                                                                                                                           | `1.11.1`                           |
+| `worker.dashboardBatchEvents.image.tag`            | Tag.                                                                                                                                           | `1.12.0`                           |
 | `worker.dashboardBatchEvents.image.pullPolicy`     | Pull Policy.                                                                                                                                   | `IfNotPresent`                     |
 | `worker.dashboardBatchEvents.logLevel`             | Worker's log level.                                                                                                                            | `INFO`                             |
 | `worker.dashboardBatchEvents.revisionHistoryLimit` | Revision history limit (used for [rolling back](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) a deployment). | `3`                                |
@@ -369,7 +369,7 @@ See the [documentation]() to learn about:
 | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------- |
 | `migrations.enabled`                   | If migrations needed.                                                                                                   | `true`                              |
 | `migrations.image.repository`          | Repository.                                                                                                             | `2gis-on-premise/citylens-database` |
-| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.11.0`                            |
+| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.12.0`                            |
 | `migrations.image.pullPolicy`          | Pull Policy                                                                                                             | `IfNotPresent`                      |
 | `migrations.resources.requests.cpu`    | A CPU request.                                                                                                          | `100m`                              |
 | `migrations.resources.requests.memory` | A memory request.                                                                                                       | `1Gi`                               |

charts/citylens/templates/api/configmap.yaml

@@ -44,3 +44,6 @@ data:
     show_docs: {{ .Values.api.showDocs }}
     log_level: {{ .Values.api.logLevel }}
     metrics_app_name: {{ .Values.api.metricsAppName }}
+    {{- if .Values.api.routesApiBaseUrl }}
+    routes_api_base_url: {{ .Values.api.routesApiBaseUrl | squote }}
+    {{- end }}