From ba665d8a436f1c2b9ce6e764ad1e591da94260a9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 12:00:38 +0000 Subject: [PATCH 1/3] Initial plan From dead026d345d69a92ae428b46742485f0c7f0f5a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 12:06:34 +0000 Subject: [PATCH 2/3] Add missing configuration and fix Prometheus port default - Added slowQuerySegregation.updateGlobalAvgInterval (default: 300 seconds) - Fixed prometheusPort default from 9090 to 9159 to match OJP server default - Updated Chart version from 0.1.2 to 0.1.3 - Updated ConfigMap template to include new environment variable - Updated README.md documentation with new parameter and corrected port Co-authored-by: rrobetti <7221783+rrobetti@users.noreply.github.com> --- charts/ojp-server/Chart.yaml | 2 +- charts/ojp-server/README.md | 3 ++- charts/ojp-server/templates/configmap.yaml | 1 + charts/ojp-server/values.yaml | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/ojp-server/Chart.yaml b/charts/ojp-server/Chart.yaml index 1521bf0..8530a53 100644 --- a/charts/ojp-server/Chart.yaml +++ b/charts/ojp-server/Chart.yaml @@ -10,5 +10,5 @@ maintainers: url: https://github.com/petruki type: application -version: 0.1.2 +version: 0.1.3 appVersion: "0.1.0-beta" diff --git a/charts/ojp-server/README.md b/charts/ojp-server/README.md index 93135cc..42605fb 100644 --- a/charts/ojp-server/README.md +++ b/charts/ojp-server/README.md @@ -25,7 +25,7 @@ helm uninstall ojp-server --namespace ojp | Name | Description | Value | | -------------------------- | ---------------------------------------------- | ---------------------- | | `server.port` | OJP Server Port | `1059` | -| `server.prometheusPort` | OJP Server Prometheus Port | `9090` | +| `server.prometheusPort` | OJP Server Prometheus Port | `9159` | | `server.threadPoolSize` | OJP Server Thread Pool Size | `200` | | `server.maxRequestSize` | OJP Server Max Request Size | `4194304` | | `server.connectionIdleTimeout` | OJP Server Connection Idle Timeout | `30000` | @@ -40,6 +40,7 @@ helm uninstall ojp-server --namespace ojp | `server.slowQuerySegregation.idleTimeout` | OJP Server Slow Query Segregation Idle Timeout | `10000` | | `server.slowQuerySegregation.slowSlotTimeout` | OJP Server Slow Query Segregation Slow Slot Timeout | `120000` | | `server.slowQuerySegregation.fastSlotTimeout` | OJP Server Slow Query Segregation Fast Slot Timeout | `60000` | +| `server.slowQuerySegregation.updateGlobalAvgInterval` | OJP Server Slow Query Segregation Update Global Average Interval | `300` | | `server.logLevel` | OJP Server Log Level | `INFO` | diff --git a/charts/ojp-server/templates/configmap.yaml b/charts/ojp-server/templates/configmap.yaml index f9dfb90..e998de3 100644 --- a/charts/ojp-server/templates/configmap.yaml +++ b/charts/ojp-server/templates/configmap.yaml @@ -22,4 +22,5 @@ data: OJP_SERVER_SLOWQUERYSEGREGATION_IDLETIMEOUT: {{ .Values.server.slowQuerySegregation.idleTimeout | quote }} OJP_SERVER_SLOWQUERYSEGREGATION_SLOWSLOTTIMEOUT: {{ .Values.server.slowQuerySegregation.slowSlotTimeout | quote }} OJP_SERVER_SLOWQUERYSEGREGATION_FASTSLOTTIMEOUT: {{ .Values.server.slowQuerySegregation.fastSlotTimeout | quote }} + OJP_SERVER_SLOWQUERYSEGREGATION_UPDATEGLOBALAVGINTERVAL: {{ .Values.server.slowQuerySegregation.updateGlobalAvgInterval | quote }} OJP_SERVER_LOGLEVEL: {{ .Values.server.logLevel | quote }} \ No newline at end of file diff --git a/charts/ojp-server/values.yaml b/charts/ojp-server/values.yaml index 53bc3ba..ef2fbd6 100644 --- a/charts/ojp-server/values.yaml +++ b/charts/ojp-server/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 server: port: 1059 - prometheusPort: 9090 + prometheusPort: 9159 threadPoolSize: 200 maxRequestSize: 4194304 connectionIdleTimeout: "30000" @@ -19,6 +19,7 @@ server: idleTimeout: 10000 slowSlotTimeout: 120000 fastSlotTimeout: 60000 + updateGlobalAvgInterval: 300 logLevel: INFO image: From 2b673b01bff20d6f47ae56f9a0f938de25ebd9da Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 16:14:19 +0000 Subject: [PATCH 3/3] Add missing driversPath configuration - Added server.driversPath (default: "./ojp-libs") configuration - Maps to OJP_LIBS_PATH environment variable - Updated Chart version from 0.1.3 to 0.1.4 - Updated ConfigMap template and README.md - All 19 OJP server configurations now properly mapped Co-authored-by: rrobetti <7221783+rrobetti@users.noreply.github.com> --- charts/ojp-server/Chart.yaml | 2 +- charts/ojp-server/README.md | 1 + charts/ojp-server/templates/configmap.yaml | 3 ++- charts/ojp-server/values.yaml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/ojp-server/Chart.yaml b/charts/ojp-server/Chart.yaml index 8530a53..e747bed 100644 --- a/charts/ojp-server/Chart.yaml +++ b/charts/ojp-server/Chart.yaml @@ -10,5 +10,5 @@ maintainers: url: https://github.com/petruki type: application -version: 0.1.3 +version: 0.1.4 appVersion: "0.1.0-beta" diff --git a/charts/ojp-server/README.md b/charts/ojp-server/README.md index 42605fb..c2071e1 100644 --- a/charts/ojp-server/README.md +++ b/charts/ojp-server/README.md @@ -42,6 +42,7 @@ helm uninstall ojp-server --namespace ojp | `server.slowQuerySegregation.fastSlotTimeout` | OJP Server Slow Query Segregation Fast Slot Timeout | `60000` | | `server.slowQuerySegregation.updateGlobalAvgInterval` | OJP Server Slow Query Segregation Update Global Average Interval | `300` | | `server.logLevel` | OJP Server Log Level | `INFO` | +| `server.driversPath` | OJP Server External Libraries Directory Path | `./ojp-libs` | ## Local diff --git a/charts/ojp-server/templates/configmap.yaml b/charts/ojp-server/templates/configmap.yaml index e998de3..df1738c 100644 --- a/charts/ojp-server/templates/configmap.yaml +++ b/charts/ojp-server/templates/configmap.yaml @@ -23,4 +23,5 @@ data: OJP_SERVER_SLOWQUERYSEGREGATION_SLOWSLOTTIMEOUT: {{ .Values.server.slowQuerySegregation.slowSlotTimeout | quote }} OJP_SERVER_SLOWQUERYSEGREGATION_FASTSLOTTIMEOUT: {{ .Values.server.slowQuerySegregation.fastSlotTimeout | quote }} OJP_SERVER_SLOWQUERYSEGREGATION_UPDATEGLOBALAVGINTERVAL: {{ .Values.server.slowQuerySegregation.updateGlobalAvgInterval | quote }} - OJP_SERVER_LOGLEVEL: {{ .Values.server.logLevel | quote }} \ No newline at end of file + OJP_SERVER_LOGLEVEL: {{ .Values.server.logLevel | quote }} + OJP_LIBS_PATH: {{ .Values.server.driversPath | quote }} \ No newline at end of file diff --git a/charts/ojp-server/values.yaml b/charts/ojp-server/values.yaml index ef2fbd6..b4d274b 100644 --- a/charts/ojp-server/values.yaml +++ b/charts/ojp-server/values.yaml @@ -21,6 +21,7 @@ server: fastSlotTimeout: 60000 updateGlobalAvgInterval: 300 logLevel: INFO + driversPath: "./ojp-libs" image: repository: rrobetti/ojp