summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-20 18:38:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-20 18:38:24 +0000
commit983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch)
treeb153cd387c14ba23bd5a07514c7c01fddf6a78a0 /vendor
parenta2bddee2cdb38673df0e004d5b32d9f77797de64 (diff)
downloadgitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'vendor')
-rw-r--r--vendor/fluentd/values.yaml18
-rw-r--r--vendor/project_templates/sse_middleman.tar.gzbin0 -> 7099 bytes
2 files changed, 18 insertions, 0 deletions
diff --git a/vendor/fluentd/values.yaml b/vendor/fluentd/values.yaml
new file mode 100644
index 00000000000..a5072ef14ae
--- /dev/null
+++ b/vendor/fluentd/values.yaml
@@ -0,0 +1,18 @@
+plugins:
+ enabled: true
+ pluginsList: ["fluent-plugin-remote_syslog"]
+
+extraVolumes:
+ - name: varlog
+ hostPath:
+ path: /var/log
+ - name: varlibdockercontainers
+ hostPath:
+ path: /var/lib/docker/containers
+
+extraVolumeMounts:
+ - name: varlog
+ mountPath: /var/log
+ - name: varlibdockercontainers
+ mountPath: /var/lib/docker/containers
+ readOnly: true
diff --git a/vendor/project_templates/sse_middleman.tar.gz b/vendor/project_templates/sse_middleman.tar.gz
new file mode 100644
index 00000000000..62126e8f80d
--- /dev/null
+++ b/vendor/project_templates/sse_middleman.tar.gz
Binary files differ