From ab0c90d9bcad537657c6d21a71f4917c7c8078c4 Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Thu, 21 Jan 2021 14:50:41 +0100 Subject: [PATCH 1/2] Revert gitlab-exporter default server to Puma We discovered that Puma was not the primary cause for high memory use after all, and it provides better scalability. --- changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml | 5 +++++ .../gitlab/charts/gitlab-exporter/templates/configmap.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml diff --git a/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml b/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml new file mode 100644 index 0000000000..56f13e45d3 --- /dev/null +++ b/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml @@ -0,0 +1,5 @@ +--- +title: Revert gitlab-exporter default server to Puma +merge_request: +author: +type: other diff --git a/charts/gitlab/charts/gitlab-exporter/templates/configmap.yaml b/charts/gitlab/charts/gitlab-exporter/templates/configmap.yaml index 7d7ae89514..bec481b267 100644 --- a/charts/gitlab/charts/gitlab-exporter/templates/configmap.yaml +++ b/charts/gitlab/charts/gitlab-exporter/templates/configmap.yaml @@ -10,7 +10,7 @@ metadata: data: gitlab-exporter.yml.erb: | server: - name: webrick + name: puma listen_address: 0.0.0.0 listen_port: {{ .Values.service.internalPort }} -- GitLab From 66f1f3a99fc0bee1fd6fa798da0fd2d36082285a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=A4ppler?= Date: Fri, 22 Jan 2021 13:18:31 +0000 Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s) --- changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml b/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml index 56f13e45d3..db410c63cf 100644 --- a/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml +++ b/changelogs/unreleased/mk-revert-gitlab-exporter-to-puma.yml @@ -1,5 +1,5 @@ --- title: Revert gitlab-exporter default server to Puma -merge_request: +merge_request: 1783 author: type: other -- GitLab