Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support ASN mmdb #121

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/graylog/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: graylog
home: https://www.graylog.org
version: 2.1.3
version: 2.1.4
appVersion: 4.2.7
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:
Expand Down
3 changes: 2 additions & 1 deletion charts/graylog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ The following table lists the configurable parameters of the Graylog chart and t
| `graylog.input.tcp.service.name` | Graylog TCP Input service name | `graylog-tcp` |
| `graylog.input.udp.service.name` | Graylog UDP Input service name | `graylog-udp` |
| `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.enabled` | If true, Maxmind Geoip Lite will be installed to ${GRAYLOG_HOME}/etc/GeoLite2-City.mmdb and ${GRAYLOG_HOME}/etc/GeoLite2-ASN.mmdb | `false` |
| `graylog.geoip.mmdbUri` | 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.geoip.asndbUri` | If set and geoip enabled, Maxmind Geoip Lite will be installed from the URL you have defined to ${GRAYLOG_HOME}/etc/GeoLite2-ASN.mmdb | |
| `graylog.plugins.locations` | A list of Graylog installation plugins | `[]` |
| `graylog.plugins.proxy.enabled` | If true, configure a proxy server to download the plugins | `false` |
| `graylog.plugins.proxy.host` | The proxy server that should be used to download the plugins | `http://your.proxy.host:8080` |
Expand Down
2 changes: 2 additions & 0 deletions charts/graylog/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,11 @@ data:
{{- if .Values.graylog.geoip.enabled }}
echo "Downloading Maxmind GeoLite2 ..."
curl -s --location --retry 3 -o /tmp/GeoLite2-City.tar.gz "{{ .Values.graylog.geoip.mmdbUri }}"
curl -s --location --retry 3 -o /tmp/GeoLite2-ASN.tar.gz "{{ .Values.graylog.geoip.asndbUri }}"
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
mkdir -p ${GRAYLOG_HOME}/geoip && cd ${GRAYLOG_HOME}/geoip && tar xvzf /tmp/GeoLite2-ASN.tar.gz --wildcards "*.mmdb" --strip-components=1 -C ${GRAYLOG_HOME}/geoip && chown -R graylog:graylog ${GRAYLOG_HOME}/geoip
fi
{{- end }}
{{- if .Values.graylog.plugins.proxy.enabled }}
Expand Down
4 changes: 3 additions & 1 deletion charts/graylog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,11 @@ 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
## If true, mmdbUri points to the URI where to find the City DB
## If true, asndbUri points to the URI where to find the ASN DB
# https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
mmdbUri: ""
asndbUri: ""

## Graylog root user name
##
Expand Down