Skip to content

Commit dc1ba19

Browse files
committed
Fix fluentd traefik pattern
1 parent 4592891 commit dc1ba19

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

fluentd-configmap.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,11 @@ data:
426426
time_key datetime
427427
time_format %Y-%m-%dT%H:%M:%S%z
428428
</pattern>
429+
<pattern>
430+
format none
431+
</pattern>
429432
</parse>
430433
</filter>
431-
432434
# Avoid duplicate events on busy ES deployments
433435
# https://github.com/uken/fluent-plugin-elasticsearch/issues/312
434436
# https://github.com/uken/fluent-plugin-elasticsearch#generate-hash-id

images/build_images.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
# - prometheus_exporter/elasticsearch-exporter-deployment.yaml - "image" line
1919

2020
# Versions
21-
ES_VERSION=6.6.0
22-
CURATOR_VERSION=5.6.0
23-
FLUENTD_VERSION=1.3.3
24-
CEREBRO_VERSION=0.8.1
25-
EXPORTER_VERSION=1.0.4rc1
21+
22+
ES_VERSION=6.6.0 # https://github.com/elastic/elasticsearch/releases
23+
CURATOR_VERSION=5.6.0 # https://github.com/elastic/curator/releases
24+
FLUENTD_VERSION=1.3.3 # https://github.com/fluent/fluentd/releases
25+
CEREBRO_VERSION=0.8.1 # https://github.com/lmenezes/cerebro/releases
26+
EXPORTER_VERSION=1.0.4rc1 # https://github.com/justwatchcom/elasticsearch_exporter/releases
2627

2728
REGISTRY=carlosedp
2829

images/docker-kibana/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION
44
ENV KIBANA_VERSION=$VERSION
55

66
ENV NODEJS_VERSION 10.14.1
7-
ENV LOGTRAIL_VERSION 0.1.30
7+
ENV LOGTRAIL_VERSION 0.1.31
88

99
RUN apt-get update -q && \
1010
apt-get install -q -y --no-install-recommends ca-certificates curl jq && \

kibana-configmap.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ data:
111111
# The default locale. This locale can be used in certain circumstances to substitute any missing
112112
# translations.
113113
#i18n.defaultLocale: "en"
114+
xpack.infra.sources.default.logAlias: 'logstash*'
115+
xpack.infra.sources.default.fields.message: ['log','message','@message']
116+
xpack.infra.sources.default.fields.host: 'kubernetes.host'
117+
xpack.infra.sources.default.fields.pod: 'kubernetes.pod_name'
118+
xpack.infra.sources.default.fields.container: 'kubernetes.container_name'
119+
114120
logtrail.json: |
115121
{
116122
"version": 1,

0 commit comments

Comments
 (0)