diff --git a/ansible/roles/monitoring/docker-stack.yml.j2 b/ansible/roles/monitoring/docker-stack.yml.j2 index 9a61c12..b6adf49 100644 --- a/ansible/roles/monitoring/docker-stack.yml.j2 +++ b/ansible/roles/monitoring/docker-stack.yml.j2 @@ -122,7 +122,7 @@ services: - BAUTH_PASS=test fluentd: - image: git.kun.is/pim/fluentd:1.0.2 + image: git.kun.is/pim/fluentd:1.0.3 depends_on: - elasticsearch ports: diff --git a/ansible/roles/monitoring/elasticsearch.yml.j2 b/ansible/roles/monitoring/elasticsearch.yml.j2 index aeb30af..81a0d2e 100644 --- a/ansible/roles/monitoring/elasticsearch.yml.j2 +++ b/ansible/roles/monitoring/elasticsearch.yml.j2 @@ -25,3 +25,11 @@ datasources: jsonData: index: 'fluentd.diskfree-*' timeField: '@timestamp' + + - name: forgejo_access + type: elasticsearch + access: proxy + url: http://maestro.dmz:{{ elasticsearch_port }} + jsonData: + index: 'fluentd.docker.forgejo_forgejo.**' + timeField: '@timestamp' diff --git a/ansible/roles/monitoring/fluent.conf.j2 b/ansible/roles/monitoring/fluent.conf.j2 index b8e8cd4..1dd5f70 100644 --- a/ansible/roles/monitoring/fluent.conf.j2 +++ b/ansible/roles/monitoring/fluent.conf.j2 @@ -6,6 +6,17 @@ port {{ fluent_forward_port }} + + @type geoip + geoip_lookup_keys host + backend_library geoip2_c + + latitude ${location.latitude["host"]} + longitude ${location.longitude["host"]} + + skip_adding_null_record true + + @type elasticsearch host maestro.dmz