Skip to content

Commit 4a9efcb

Browse files
committed
salt: add hostname to audit log outputs
1 parent 8967a88 commit 4a9efcb

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

charts/fluent-bit.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,9 @@ serviceMonitor:
6464
dashboards:
6565
enabled: true
6666
deterministicUid: true
67+
68+
env:
69+
- name: NODE_NAME
70+
valueFrom:
71+
fieldRef:
72+
fieldPath: spec.nodeName

salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,6 +1708,11 @@ spec:
17081708
- --config=/fluent-bit/etc/conf/fluent-bit.conf
17091709
command:
17101710
- /fluent-bit/bin/fluent-bit
1711+
env:
1712+
- name: NODE_NAME
1713+
valueFrom:
1714+
fieldRef:
1715+
fieldPath: spec.nodeName
17111716
image: {% endraw -%}{{ build_image_name("fluent-bit", False) }}{%- raw %}:4.2.3
17121717
imagePullPolicy: IfNotPresent
17131718
livenessProbe:

salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,10 @@ Create fluent-bit ConfigMap:
125125
Add namespace unknown
126126
Add pod unknown
127127
Add stream unknown
128-
{%- if fluent_bit.spec.config.filter is defined %}
129-
{%- for filter in fluent_bit.spec.config.filter %}
130128
[Filter]
131-
{%- for key, value in filter.items() %}
132-
{{ "{:<14} {}".format(key, value) }}
133-
{%- endfor %}
134-
{%- endfor %}
135-
{%- endif %}
129+
Name record_modifier
130+
Match audit.*
131+
Record hostname ${NODE_NAME}
136132
{%- for output in fluent_bit.spec.config.output %}
137133
[Output]
138134
{%- for key, value in output.items() %}

0 commit comments

Comments
 (0)