stable/graylog Adding the possibility of specifying your own URI for …

…the GeoLite DDBB location (helm#21267) * Author: Josep Manel Andres Moscardo <titansmc@gmail.com> 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 <titansmc@gmail.com> * Author: Josep Manel Andres Moscardo <titansmc@gmail.com> 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 <titansmc@gmail.com> * Author: Josep Manel Andres Moscardo <titansmc@gmail.com> 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 <titansmc@gmail.com> modified: Chart.yaml bumped Chart.yaml version * Author: Josep Manel Andres Moscardo <titansmc@gmail.com> Date: Thu Mar 5 09:46:15 2020 +0100 Signed-off-by: Josep Manel Andres Moscardo <titansmc@gmail.com> modified: README.md * Author: Josep Manel Andres Moscardo <titansmc@gmail.com> Signed-off-by: Josep Manel Andres Moscardo <titansmc@gmail.com> Signed-off-by: Adrien Loiseau <adrien.loiseau@logic-immo.com>
li-adrienloiseau · Jul 29, 2020 · 86947ea · 86947ea
1 parent b6cf0c9
commit 86947ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
   ##