From 86947ea28649bbadbebf788a73933b6d2c02792b Mon Sep 17 00:00:00 2001 From: jandres - moscardo Date: Fri, 6 Mar 2020 09:13:23 +0100 Subject: [PATCH] stable/graylog Adding the possibility of specifying your own URI for the GeoLite DDBB location (#21267) * Author: Josep Manel Andres Moscardo Date: Thu Mar 5 09:41:15 2020 +0100 Changes to be committed: modified: templates/configmap.yaml modified: values.yaml Signed-off-by: Josep Manel Andres Moscardo * Author: Josep Manel Andres Moscardo Date: Thu Mar 5 09:46:15 2020 +0100 Changes to be committed: modified: templates/configmap.yaml modified: values.yaml Signed-off-by: Josep Manel Andres Moscardo * Author: Josep Manel Andres Moscardo Date: Thu Mar 5 09:46:15 2020 +0100 Changes to be committed: modified: templates/configmap.yaml modified: values.yaml Signed-off-by: Josep Manel Andres Moscardo modified: Chart.yaml bumped Chart.yaml version * Author: Josep Manel Andres Moscardo Date: Thu Mar 5 09:46:15 2020 +0100 Signed-off-by: Josep Manel Andres Moscardo modified: README.md * Author: Josep Manel Andres Moscardo Signed-off-by: Josep Manel Andres Moscardo Signed-off-by: Adrien Loiseau --- stable/graylog/Chart.yaml | 2 +- stable/graylog/README.md | 1 + stable/graylog/templates/configmap.yaml | 2 +- stable/graylog/values.yaml | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/graylog/Chart.yaml b/stable/graylog/Chart.yaml index 399e75f08a58..4dc672aefb17 100755 --- a/stable/graylog/Chart.yaml +++ b/stable/graylog/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: graylog home: https://www.graylog.org -version: 1.6.0 +version: 1.6.1 appVersion: 3.1 description: Graylog is the centralized log management solution built to open standards for capturing, storing, and enabling real-time analysis of terabytes of machine data. keywords: diff --git a/stable/graylog/README.md b/stable/graylog/README.md index 2399effe9a36..426bcbdf97c0 100644 --- a/stable/graylog/README.md +++ b/stable/graylog/README.md @@ -135,6 +135,7 @@ The following table lists the configurable parameters of the Graylog chart and t | `graylog.input` | Graylog Input configuration (YAML) Sees #Input section for detail | `{}` | | `graylog.metrics.enabled` | If true, add Prometheus annotations to pods | `false` | | `graylog.geoip.enabled` | If true, Maxmind Geoip Lite will be installed to ${GRAYLOG_HOME}/etc/GeoLite2-City.mmdb | `false` | +| `graylog.geoip.ddbbUri` | If set and geoip enabled, Maxmind Geoip Lite will be installed from the URL you have defined to ${GRAYLOG_HOME}/etc/GeoLite2-City.mmdb | `` | | `graylog.plugins` | A list of Graylog installation plugins | `[]` | | `graylog.rootUsername` | Graylog root user name | `admin` | | `graylog.rootPassword` | Graylog root password. If not set, random 16-character alphanumeric string | `` | diff --git a/stable/graylog/templates/configmap.yaml b/stable/graylog/templates/configmap.yaml index 838777d5b1ae..2504f8168b51 100644 --- a/stable/graylog/templates/configmap.yaml +++ b/stable/graylog/templates/configmap.yaml @@ -176,7 +176,7 @@ data: {{- end }} {{- if .Values.graylog.geoip.enabled }} echo "Downloading Maxmind GeoLite2 ..." - curl -s --location --retry 3 -o /tmp/GeoLite2-City.tar.gz "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz" + curl -s --location --retry 3 -o /tmp/GeoLite2-City.tar.gz "{{ .Values.graylog.geoip.mmdbUri }}" curlreturn=$? if [[ $curlreturn -eq 0 ]]; then mkdir -p ${GRAYLOG_HOME}/geoip && cd ${GRAYLOG_HOME}/geoip && tar xvzf /tmp/GeoLite2-City.tar.gz --wildcards "*.mmdb" --strip-components=1 -C ${GRAYLOG_HOME}/geoip && chown -R graylog:graylog ${GRAYLOG_HOME}/geoip diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml index c1b243cb7471..531e2ce8799d 100644 --- a/stable/graylog/values.yaml +++ b/stable/graylog/values.yaml @@ -240,6 +240,9 @@ graylog: ## If true, Maxmind GeoLite2 will be installed to ${GRAYLOG_HOME}/geoip location ## enabled: false + ## If true, mmdbUri points to the URI where to find the DB + # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ + mmdbUri: "" ## Graylog root user name ##