From 14746935fdffd5927058754356e58ad9f04cb8d7 Mon Sep 17 00:00:00 2001 From: Aurelia Date: Wed, 4 Dec 2024 12:21:12 +0100 Subject: [PATCH 1/2] feat: make prometheus shared dict configurable ref: https://github.com/apache/apisix/blob/ee6a04cad1bab24ae0305a3cd66bb4e88812edb7/conf/config.yaml.example#L166 --- charts/apisix/templates/configmap.yaml | 5 +++++ charts/apisix/values.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml index 05419451..f3bf084f 100644 --- a/charts/apisix/templates/configmap.yaml +++ b/charts/apisix/templates/configmap.yaml @@ -224,6 +224,11 @@ data: {{- if .Values.apisix.nginx.configurationSnippet.stream }} stream_configuration_snippet: {{- toYaml .Values.apisix.nginx.configurationSnippet.stream | indent 6 }} {{- end }} + {{- with .Values.apisix.nginx.prometheusSharedDictSize }} + meta: + lua_shared_dict: + prometheus-metrics: {{ . }} + {{- end }} {{- if .Values.apisix.discovery.enabled }} discovery: diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index f552c7dc..1ecb6801 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -448,6 +448,9 @@ apisix: # - name: bar # size: 1m + # Set the size of prometheus-metrics shared dict + prometheusSharedDictSize: 15m + discovery: # -- Enable or disable Apache APISIX integration service discovery enabled: false From 76f84e500e4bc026739a1818e53e9e457e7efa6b Mon Sep 17 00:00:00 2001 From: Aurelia Date: Mon, 23 Dec 2024 09:48:36 +0100 Subject: [PATCH 2/2] docs: generate helm-docs --- charts/apisix/README.md | 1 + charts/apisix/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/apisix/README.md b/charts/apisix/README.md index 520af054..6b543ab2 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -102,6 +102,7 @@ The command removes all the Kubernetes components associated with the chart and | apisix.nginx.logs.enableAccessLog | bool | `true` | Enable access log or not, default true | | apisix.nginx.logs.errorLog | string | `"/dev/stderr"` | Error log path | | apisix.nginx.logs.errorLogLevel | string | `"warn"` | Error log level | +| apisix.nginx.prometheusSharedDictSize | string | `"15m"` | Set the size of prometheus-metrics shared dictionary | | apisix.nginx.workerConnections | string | `"10620"` | | | apisix.nginx.workerProcesses | string | `"auto"` | | | apisix.nginx.workerRlimitNofile | string | `"20480"` | | diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index 1ecb6801..977704f4 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -448,7 +448,7 @@ apisix: # - name: bar # size: 1m - # Set the size of prometheus-metrics shared dict + # -- Set the size of prometheus-metrics shared dictionary prometheusSharedDictSize: 15m discovery: