From 64cdcdd8d5f2bb1bc5748aedef0df7d4d52b4b45 Mon Sep 17 00:00:00 2001
From: Anna Khanova <32508607+khanova@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:09:45 +0200
Subject: [PATCH] Proxy: consumptions events for to s3 config (#74)

* Proxy: consumptions events for to s3 config

* Readme
---
 charts/neon-proxy/Chart.yaml                | 2 +-
 charts/neon-proxy/README.md                 | 5 ++++-
 charts/neon-proxy/templates/deployment.yaml | 9 +++++++++
 charts/neon-proxy/values.yaml               | 6 ++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/charts/neon-proxy/Chart.yaml b/charts/neon-proxy/Chart.yaml
index b3e7355..29a0ad7 100644
--- a/charts/neon-proxy/Chart.yaml
+++ b/charts/neon-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: neon-proxy
 description: Neon Proxy
 type: application
-version: 1.7.19
+version: 1.7.20
 appVersion: "0.1.0"
 kubeVersion: "^1.18.x-x"
 home: https://neon.tech
diff --git a/charts/neon-proxy/README.md b/charts/neon-proxy/README.md
index 483f3e5..9443794 100644
--- a/charts/neon-proxy/README.md
+++ b/charts/neon-proxy/README.md
@@ -1,6 +1,6 @@
 # neon-proxy
 
-![Version: 1.7.19](https://img.shields.io/badge/Version-1.7.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
+![Version: 1.7.20](https://img.shields.io/badge/Version-1.7.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
 
 Neon Proxy
 
@@ -74,6 +74,9 @@ Kubernetes: `^1.18.x-x`
 | settings.endpointRpsLimits[1] | string | `"250@10m"` |  |
 | settings.extraDomains | list | `[]` | domains used in extra TLS certs for client postgres connections |
 | settings.httpPoolOptIn | bool | `true` | (bool) Sets the SQL over HTTP Pool to opt-in-only mode if true. Set false to enable it always |
+| settings.metricBackupCollectionChunkSize | string | `"4194304"` | (string) How large each chunk of the metric backup files should be in bytes |
+| settings.metricBackupCollectionInterval | string | `"10m"` |  |
+| settings.metricBackupCollectionRemoteStorage | string | `""` | (string) Storage location to upload the metric backup files to |
 | settings.metricCollectionEndpoint | string | `""` | (url) endpoint used to send metrics to. If null, metrics will not be sent. |
 | settings.metricCollectionInterval | string | `""` | (string) how often metrics should be sent. |
 | settings.otelExporterDisabled | bool | `false` | Disables OpenTelemetry (will be converted into `OTEL_SDK_DISABLED` environment variable) |
diff --git a/charts/neon-proxy/templates/deployment.yaml b/charts/neon-proxy/templates/deployment.yaml
index 1a43a80..2344707 100644
--- a/charts/neon-proxy/templates/deployment.yaml
+++ b/charts/neon-proxy/templates/deployment.yaml
@@ -140,6 +140,15 @@ spec:
             - --redis-notifications
             - {{ . }}
             {{- end }}
+            {{- with .Values.settings.metricBackupCollectionInterval }}
+            - --metric-backup-collection-interval={{ . }}
+            {{ end }}
+            {{- with .Values.settings.metricBackupCollectionRemoteStorage }}
+            - --metric-backup-collection-remote-storage={{ . }}
+            {{ end }}
+            {{- with .Values.settings.metricBackupCollectionChunkSize }}
+            - --metric-backup-collection-chunk-size={{ . }}
+            {{ end }}
 
           {{- if .Values.settings }}
           env:
diff --git a/charts/neon-proxy/values.yaml b/charts/neon-proxy/values.yaml
index e069e8f..4c1186a 100644
--- a/charts/neon-proxy/values.yaml
+++ b/charts/neon-proxy/values.yaml
@@ -91,6 +91,12 @@ settings:
   awsAccessKeyId: ""
   # settings.awsSecretAccessKey -- (string) AWS Secret Access Key
   awsSecretAccessKey: ""
+  # settings.metricBackupCollectionRemoteStorage -- (string) Storage location to upload the metric backup files to
+  metricBackupCollectionRemoteStorage: ""
+  # settings.metrickBackupCollectionInterval -- (string) How often to upload the metric backup files
+  metricBackupCollectionInterval: "10m"
+  # settings.metricBackupCollectionChunkSize -- (string) How large each chunk of the metric backup files should be in bytes
+  metricBackupCollectionChunkSize: "4194304"
 
 serviceAccount:
   # serviceAccount.create - Specifies whether a service account should be created