summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/openshift_logging/README.md24
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j2.orig209
2 files changed, 18 insertions, 215 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md
index ea48948c3..45477f60d 100644
--- a/roles/openshift_logging/README.md
+++ b/roles/openshift_logging/README.md
@@ -201,12 +201,24 @@ Elasticsearch OPS too, if using an OPS cluster:
Defaults to '65534'.
### remote syslog forwarding
-`openshift_logging_fluentd_remote_syslog`: Set true to enable remote syslog forwarding, defaults to false
+`openshift_logging_fluentd_remote_syslog`: Set `true` to enable remote syslog forwarding, defaults to `false`
`openshift_logging_fluentd_remote_syslog_host`: Required, hostname or IP of remote syslog server
-`openshift_logging_fluentd_remote_syslog_port`: Port of remote syslog server, defaults to 514
-`openshift_logging_fluentd_remote_syslog_severity`: Syslog severity level, defaults to debug
-`openshift_logging_fluentd_remote_syslog_facility`: Syslog facility, defaults to local0
-`openshift_logging_fluentd_remote_syslog_remove_tag_prefix`: Remove the prefix from the tag, defaults to ''
+`openshift_logging_fluentd_remote_syslog_port`: Port of remote syslog server, defaults to `514`
+`openshift_logging_fluentd_remote_syslog_severity`: Syslog severity level, defaults to `debug`
+`openshift_logging_fluentd_remote_syslog_facility`: Syslog facility, defaults to `local0`
+`openshift_logging_fluentd_remote_syslog_remove_tag_prefix`: Remove the prefix from the tag, defaults to `''` (empty)
`openshift_logging_fluentd_remote_syslog_tag_key`: If string specified, use this field from the record to set the key field on the syslog message
-`openshift_logging_fluentd_remote_syslog_use_record`: Set true to use the severity and facility from the record, defaults to false
+`openshift_logging_fluentd_remote_syslog_use_record`: Set `true` to use the severity and facility from the record, defaults to `false`
`openshift_logging_fluentd_remote_syslog_payload_key`: If string is specified, use this field from the record as the payload on the syslog message
+
+The corresponding openshift_logging_mux_ parameters are below.
+
+`openshift_logging_mux_remote_syslog`: Set `true` to enable remote syslog forwarding, defaults to `false`
+`openshift_logging_mux_remote_syslog_host`: Required, hostname or IP of remote syslog server
+`openshift_logging_mux_remote_syslog_port`: Port of remote syslog server, defaults to `514`
+`openshift_logging_mux_remote_syslog_severity`: Syslog severity level, defaults to `debug`
+`openshift_logging_mux_remote_syslog_facility`: Syslog facility, defaults to `local0`
+`openshift_logging_mux_remote_syslog_remove_tag_prefix`: Remove the prefix from the tag, defaults to `''` (empty)
+`openshift_logging_mux_remote_syslog_tag_key`: If string specified, use this field from the record to set the key field on the syslog message
+`openshift_logging_mux_remote_syslog_use_record`: Set `true` to use the severity and facility from the record, defaults to `false`
+`openshift_logging_mux_remote_syslog_payload_key`: If string is specified, use this field from the record as the payload on the syslog message
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2.orig b/roles/openshift_logging_fluentd/templates/fluentd.j2.orig
deleted file mode 100644
index 5ca55c75e..000000000
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2.orig
+++ /dev/null
@@ -1,209 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: "DaemonSet"
-metadata:
- name: "{{ daemonset_name }}"
- labels:
- provider: openshift
- component: "{{ daemonset_component }}"
- logging-infra: "{{ daemonset_component }}"
-spec:
- selector:
- matchLabels:
- provider: openshift
- component: "{{ daemonset_component }}"
- updateStrategy:
- type: RollingUpdate
- rollingUpdate:
- minReadySeconds: 600
- template:
- metadata:
- name: "{{ daemonset_container_name }}"
- labels:
- logging-infra: "{{ daemonset_component }}"
- provider: openshift
- component: "{{ daemonset_component }}"
- spec:
- serviceAccountName: "{{ daemonset_serviceAccount }}"
- nodeSelector:
- {{ fluentd_nodeselector_key }}: "{{ fluentd_nodeselector_value }}"
- containers:
- - name: "{{ daemonset_container_name }}"
- image: "{{ openshift_logging_fluentd_image_prefix }}{{ daemonset_name }}:{{ openshift_logging_fluentd_image_version }}"
- imagePullPolicy: Always
- securityContext:
- privileged: true
- resources:
- limits:
- cpu: {{ openshift_logging_fluentd_cpu_limit }}
- memory: {{ openshift_logging_fluentd_memory_limit }}
- requests:
- memory: {{ openshift_logging_fluentd_memory_limit }}
- volumeMounts:
- - name: runlogjournal
- mountPath: /run/log/journal
- - name: varlog
- mountPath: /var/log
- - name: varlibdockercontainers
- mountPath: /var/lib/docker/containers
- readOnly: true
- - name: config
- mountPath: /etc/fluent/configs.d/user
- readOnly: true
- - name: certs
- mountPath: /etc/fluent/keys
- readOnly: true
- - name: dockerhostname
- mountPath: /etc/docker-hostname
- readOnly: true
- - name: localtime
- mountPath: /etc/localtime
- readOnly: true
- - name: dockercfg
- mountPath: /etc/sysconfig/docker
- readOnly: true
- - name: dockerdaemoncfg
- mountPath: /etc/docker
- readOnly: true
- - name: filebufferstorage
- mountPath: /var/lib/fluentd
-{% if openshift_logging_mux_client_mode is defined %}
- - name: muxcerts
- mountPath: /etc/fluent/muxkeys
- readOnly: true
-{% endif %}
- env:
- - name: "K8S_HOST_URL"
- value: "{{ openshift_logging_fluentd_master_url }}"
- - name: "ES_HOST"
- value: "{{ app_host }}"
- - name: "ES_PORT"
- value: "{{ app_port }}"
- - name: "ES_CLIENT_CERT"
- value: "{{ openshift_logging_fluentd_app_client_cert }}"
- - name: "ES_CLIENT_KEY"
- value: "{{ openshift_logging_fluentd_app_client_key }}"
- - name: "ES_CA"
- value: "{{ openshift_logging_fluentd_app_ca }}"
- - name: "OPS_HOST"
- value: "{{ ops_host }}"
- - name: "OPS_PORT"
- value: "{{ ops_port }}"
- - name: "OPS_CLIENT_CERT"
- value: "{{ openshift_logging_fluentd_ops_client_cert }}"
- - name: "OPS_CLIENT_KEY"
- value: "{{ openshift_logging_fluentd_ops_client_key }}"
- - name: "OPS_CA"
- value: "{{ openshift_logging_fluentd_ops_ca }}"
- - name: "JOURNAL_SOURCE"
- value: "{{ openshift_logging_fluentd_journal_source | default('') }}"
- - name: "JOURNAL_READ_FROM_HEAD"
- value: "{{ openshift_logging_fluentd_journal_read_from_head | lower }}"
- - name: "BUFFER_QUEUE_LIMIT"
- value: "{{ openshift_logging_fluentd_buffer_queue_limit }}"
- - name: "BUFFER_SIZE_LIMIT"
- value: "{{ openshift_logging_fluentd_buffer_size_limit }}"
- - name: "FLUENTD_CPU_LIMIT"
- valueFrom:
- resourceFieldRef:
- containerName: "{{ daemonset_container_name }}"
- resource: limits.cpu
- - name: "FLUENTD_MEMORY_LIMIT"
- valueFrom:
- resourceFieldRef:
- containerName: "{{ daemonset_container_name }}"
- resource: limits.memory
- - name: "FILE_BUFFER_LIMIT"
- value: "{{ openshift_logging_fluentd_file_buffer_limit | default('1Gi') }}"
-{% if openshift_logging_mux_client_mode is defined %}
- - name: "MUX_CLIENT_MODE"
- value: "{{ openshift_logging_mux_client_mode }}"
-{% endif %}
-<<<<<<< HEAD
-{% if openshift_logging_install_eventrouter is defined and openshift_logging_install_eventrouter %}
- - name: "TRANSFORM_EVENTS"
- value: "true"
-{% endif %}
-=======
-
-{% if openshift_logging_fluentd_remote_syslog is defined %}
- - name: USE_REMOTE_SYSLOG
- value: "true"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_host is defined %}
- - name: REMOTE_SYSLOG_HOST
- value: "{{ openshift_logging_fluentd_remote_syslog_host }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_port is defined %}
- - name: REMOTE_SYSLOG_PORT
- value: "{{ openshift_logging_fluentd_remote_syslog_port }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_severity %}
- - name: REMOTE_SYSLOG_SEVERITY
- value: "{{ openshift_logging_fluentd_remote_syslog_severity }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_facility is defined %}
- - name: REMOTE_SYSLOG_FACILITY
- value: "{{ openshift_logging_fluentd_remote_syslog_facility }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_remove_tag_prefix is defined %}
- - name: REMOTE_SYSLOG_REMOVE_TAG_PREFIX
- value: "{{ openshift_logging_fluentd_remote_syslog_remove_tag_prefix }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_tag_key is defined %}
- - name: REMOTE_SYSLOG_TAG_KEY
- value: "{{ openshift_logging_fluentd_remote_syslog_tag_key }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_use_record is defined %}
- - name: REMOTE_SYSLOG_USE_RECORD
- value: "{{ openshift_logging_fluentd_remote_syslog_use_record }}"
-{% endif %}
-
-{% if openshift_logging_fluentd_remote_syslog_payload_key is defined %}
- - name: REMOTE_SYSLOG_PAYLOAD_KEY
- value: "{{ openshift_logging_fluentd_remote_syslog_payload_key }}"
-{% endif %}
-
->>>>>>> b06a45744... Added new variables for logging role for remote-syslog plugin
- volumes:
- - name: runlogjournal
- hostPath:
- path: /run/log/journal
- - name: varlog
- hostPath:
- path: /var/log
- - name: varlibdockercontainers
- hostPath:
- path: /var/lib/docker/containers
- - name: config
- configMap:
- name: logging-fluentd
- - name: certs
- secret:
- secretName: logging-fluentd
- - name: dockerhostname
- hostPath:
- path: /etc/hostname
- - name: localtime
- hostPath:
- path: /etc/localtime
- - name: dockercfg
- hostPath:
- path: /etc/sysconfig/docker
- - name: dockerdaemoncfg
- hostPath:
- path: /etc/docker
-{% if openshift_logging_mux_client_mode is defined %}
- - name: muxcerts
- secret:
- secretName: logging-mux
-{% endif %}
- - name: filebufferstorage
- hostPath:
- path: "/var/lib/fluentd"