diff --git a/incubator/fluentd-elasticsearch/Chart.yaml b/incubator/fluentd-elasticsearch/Chart.yaml deleted file mode 100644 index 18c2760039..0000000000 --- a/incubator/fluentd-elasticsearch/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: fluentd-elasticsearch -version: 0.7.2 -appVersion: 2.2.0 -home: https://www.fluentd.org/ -description: DEPRECATED! - A Fluentd Helm chart for Kubernetes with Elasticsearch output -icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png -keywords: -- fluentd -- elasticsearch -- multiline -- detect-exceptions -- logging -sources: -- https://github.com/kubernetes/charts/incubator/fluentd-elasticsearch -- https://github.com/fluent/fluentd-kubernetes-daemonset -- https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions -- https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/fluentd-elasticsearch/fluentd-es-image -maintainers: -- name: monotek - email: monotek23@gmail.com -engine: gotpl diff --git a/incubator/fluentd-elasticsearch/OWNERS b/incubator/fluentd-elasticsearch/OWNERS deleted file mode 100644 index 9375c95fd5..0000000000 --- a/incubator/fluentd-elasticsearch/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: -- monotek -reviewers: -- monotek diff --git a/incubator/fluentd-elasticsearch/README.md b/incubator/fluentd-elasticsearch/README.md deleted file mode 100644 index 7942a45660..0000000000 --- a/incubator/fluentd-elasticsearch/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Fluentd Elasticsearch - -**NOTE: this chart has been DEPRECATED. Please see stable/fluentd-elasticsearch diff --git a/incubator/fluentd-elasticsearch/templates/NOTES.txt b/incubator/fluentd-elasticsearch/templates/NOTES.txt deleted file mode 100644 index d0cf765694..0000000000 --- a/incubator/fluentd-elasticsearch/templates/NOTES.txt +++ /dev/null @@ -1,6 +0,0 @@ -To verify that Fluentd has started, run: - - kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "fluentd-elasticsearch.name" . }},release={{ .Release.Name }}" - -THIS APPLICATION CAPTURES ALL CONSOLE OUTPUT AND FORWARDS IT TO elasticsearch . Anything that might be identifying, -including things like IP addresses, container images, and object names will NOT be anonymized. diff --git a/incubator/fluentd-elasticsearch/templates/_helpers.tpl b/incubator/fluentd-elasticsearch/templates/_helpers.tpl deleted file mode 100644 index 46b56b9834..0000000000 --- a/incubator/fluentd-elasticsearch/templates/_helpers.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "fluentd-elasticsearch.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "fluentd-elasticsearch.fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "fluentd-elasticsearch.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "fluentd-elasticsearch.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/incubator/fluentd-elasticsearch/templates/clusterrole.yaml b/incubator/fluentd-elasticsearch/templates/clusterrole.yaml deleted file mode 100644 index 10eaa8de65..0000000000 --- a/incubator/fluentd-elasticsearch/templates/clusterrole.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.rbac.create -}} -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.name" . }} - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} -rules: -- apiGroups: - - "" - resources: - - "namespaces" - - "pods" - verbs: - - "get" - - "watch" - - "list" -{{- end -}} diff --git a/incubator/fluentd-elasticsearch/templates/clusterrolebinding.yaml b/incubator/fluentd-elasticsearch/templates/clusterrolebinding.yaml deleted file mode 100644 index decd495e32..0000000000 --- a/incubator/fluentd-elasticsearch/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if .Values.rbac.create -}} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.name" . }} - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} -subjects: -- kind: ServiceAccount - name: {{ template "fluentd-elasticsearch.fullname" . }} - apiGroup: "" - namespace: {{ .Release.Namespace }} -roleRef: - kind: ClusterRole - name: {{ template "fluentd-elasticsearch.fullname" . }} - apiGroup: "" -{{- end -}} diff --git a/incubator/fluentd-elasticsearch/templates/configmap.yaml b/incubator/fluentd-elasticsearch/templates/configmap.yaml deleted file mode 100644 index 6fc1a19be9..0000000000 --- a/incubator/fluentd-elasticsearch/templates/configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: {{ .Release.Service | quote }} - release: {{ .Release.Name | quote }} - addonmanager.kubernetes.io/mode: Reconcile -data: -{{- range $key, $value := .Values.configMaps }} - {{ $key }}: |- -{{ $value | indent 4 }} -{{- end }} diff --git a/incubator/fluentd-elasticsearch/templates/daemonset.yaml b/incubator/fluentd-elasticsearch/templates/daemonset.yaml deleted file mode 100644 index 93c85e18d4..0000000000 --- a/incubator/fluentd-elasticsearch/templates/daemonset.yaml +++ /dev/null @@ -1,134 +0,0 @@ -apiVersion: apps/v1beta2 -kind: DaemonSet -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.fullname" . }} - version: {{ .Values.image.tag }} - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" -spec: - selector: - matchLabels: - app: {{ template "fluentd-elasticsearch.fullname" . }} - heritage: "{{ .Release.Service }}" - template: - metadata: - labels: - app: {{ template "fluentd-elasticsearch.fullname" . }} - version: {{ .Values.image.tag }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" - kubernetes.io/cluster-service: "true" - version: {{ .Values.image.tag }} - release: "{{ .Release.Name }}" - # This annotation ensures that fluentd does not get evicted if the node - # supports critical pod annotation based priority scheme. - # Note that this does not guarantee admission on the nodes (#40573). - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} -{{- if .Values.annotations }} -{{ toYaml .Values.annotations | indent 8 }} -{{- end }} - spec: - serviceAccountName: {{ template "fluentd-elasticsearch.fullname" . }} - containers: - - name: {{ template "fluentd-elasticsearch.fullname" . }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.imagePullPolicy | quote }} - env: - - name: FLUENTD_ARGS - value: --no-supervisor -q - - name: OUTPUT_HOST - value: {{ .Values.elasticsearch.host | quote }} - - name: OUTPUT_PORT - value: {{ .Values.elasticsearch.port | quote }} - - name: OUTPUT_BUFFER_CHUNK_LIMIT - value: {{ .Values.elasticsearch.buffer_chunk_limit | quote }} - - name: OUTPUT_BUFFER_QUEUE_LIMIT - value: {{ .Values.elasticsearch.buffer_queue_limit | quote }} - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - resources: -{{ toYaml .Values.resources | indent 10 }} - volumeMounts: - - name: varlog - mountPath: /var/log - - name: varlibdockercontainers - mountPath: /var/lib/docker/containers - readOnly: true - - name: libsystemddir - mountPath: /host/lib - readOnly: true - - name: config-volume-{{ template "fluentd-elasticsearch.fullname" . }} - mountPath: /etc/fluent/config.d -{{- if .Values.extraVolumeMounts }} -{{ toYaml .Values.extraVolumeMounts | indent 8 }} -{{- end }} - ports: -{{- range $port := .Values.service.ports }} - - name: {{ $port.name }} - containerPort: {{ $port.port }} -{{- end }} -{{- if .Values.livenessProbe.enabled }} - # Liveness probe is aimed to help in situarions where fluentd - # silently hangs for no apparent reasons until manual restart. - # The idea of this probe is that if fluentd is not queueing or - # flushing chunks for 5 minutes, something is not right. If - # you want to change the fluentd configuration, reducing amount of - # logs fluentd collects, consider changing the threshold or turning - # liveness probe off completely. - livenessProbe: - initialDelaySeconds: 600 - periodSeconds: 60 - exec: - command: - - '/bin/sh' - - '-c' - - > - LIVENESS_THRESHOLD_SECONDS=${LIVENESS_THRESHOLD_SECONDS:-300}; - STUCK_THRESHOLD_SECONDS=${LIVENESS_THRESHOLD_SECONDS:-900}; - if [ ! -e /var/log/fluentd-buffers ]; - then - exit 1; - fi; - touch -d "${STUCK_THRESHOLD_SECONDS} seconds ago" /tmp/marker-stuck; - if [[ -z "$(find /var/log/fluentd-buffers -type f -newer /tmp/marker-stuck -print -quit)" ]]; - then - rm -rf /var/log/fluentd-buffers; - exit 1; - fi; - touch -d "${LIVENESS_THRESHOLD_SECONDS} seconds ago" /tmp/marker-liveness; - if [[ -z "$(find /var/log/fluentd-buffers -type f -newer /tmp/marker-liveness -print -quit)" ]]; - then - exit 1; - fi; -{{- end }} - terminationGracePeriodSeconds: 30 - volumes: - - name: varlog - hostPath: - path: /var/log - - name: varlibdockercontainers - hostPath: - path: /var/lib/docker/containers - # It is needed to copy systemd library to decompress journals - - name: libsystemddir - hostPath: - path: /usr/lib64 - - name: config-volume-{{ template "fluentd-elasticsearch.fullname" . }} - configMap: - name: {{ template "fluentd-elasticsearch.fullname" . }} -{{- if .Values.extraVolumes }} -{{ toYaml .Values.extraVolumes | indent 6 }} -{{- end }} -{{- if .Values.tolerations }} - tolerations: -{{ toYaml .Values.tolerations | indent 6 }} -{{- end }} diff --git a/incubator/fluentd-elasticsearch/templates/service-account.yaml b/incubator/fluentd-elasticsearch/templates/service-account.yaml deleted file mode 100644 index 9bbc28f951..0000000000 --- a/incubator/fluentd-elasticsearch/templates/service-account.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.name" . }} - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} -{{- end -}} diff --git a/incubator/fluentd-elasticsearch/templates/service.yaml b/incubator/fluentd-elasticsearch/templates/service.yaml deleted file mode 100644 index 9425497271..0000000000 --- a/incubator/fluentd-elasticsearch/templates/service.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if .Values.service }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} - labels: - app: {{ template "fluentd-elasticsearch.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" -spec: - type: {{ .Values.service.type }} - ports: - {{- range $port := .Values.service.ports }} - - name: {{ $port.name }} - port: {{ $port.port }} - targetPort: {{ $port.port }} - {{- end }} - selector: - app: {{ template "fluentd-elasticsearch.fullname" . }} - release: {{ .Release.Name }} -{{- end }} \ No newline at end of file diff --git a/incubator/fluentd-elasticsearch/values.yaml b/incubator/fluentd-elasticsearch/values.yaml deleted file mode 100644 index 3b0d5355ee..0000000000 --- a/incubator/fluentd-elasticsearch/values.yaml +++ /dev/null @@ -1,445 +0,0 @@ -image: - repository: gcr.io/google-containers/fluentd-elasticsearch -## Specify an imagePullPolicy (Required) -## It's recommended to change this to 'Always' if the image tag is 'latest' -## ref: http://kubernetes.io/docs/user-guide/images/#updating-images - tag: v2.2.0 - pullPolicy: IfNotPresent - -## Configure resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## -resources: {} - # limits: - # cpu: 100m - # memory: 500Mi - # requests: - # cpu: 100m - # memory: 200Mi - -elasticsearch: - host: 'elasticsearch-client' - port: 9200 - buffer_chunk_limit: 2M - buffer_queue_limit: 8 - -rbac: - create: true - -serviceAccount: - # Specifies whether a ServiceAccount should be created - create: true - # The name of the ServiceAccount to use. - # If not set and create is true, a name is generated using the fullname template - name: - -livenessProbe: - enabled: true - -annotations: {} - # prometheus.io/scrape: "true" - # prometheus.io/port: "24231" - -tolerations: {} - # - key: node-role.kubernetes.io/master - # operator: Exists - # effect: NoSchedule - -service: {} - # type: ClusterIP - # ports: - # - name: "monitor-agent" - # port: 24231 - -configMaps: - system.conf: |- - - root_dir /tmp/fluentd-buffers/ - - containers.input.conf: |- - # This configuration file for Fluentd / td-agent is used - # to watch changes to Docker log files. The kubelet creates symlinks that - # capture the pod name, namespace, container name & Docker container ID - # to the docker logs for pods in the /var/log/containers directory on the host. - # If running this fluentd configuration in a Docker container, the /var/log - # directory should be mounted in the container. - # - # These logs are then submitted to Elasticsearch which assumes the - # installation of the fluent-plugin-elasticsearch & the - # fluent-plugin-kubernetes_metadata_filter plugins. - # See https://github.com/uken/fluent-plugin-elasticsearch & - # https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter for - # more information about the plugins. - # - # Example - # ======= - # A line in the Docker log file might look like this JSON: - # - # {"log":"2014/09/25 21:15:03 Got request with path wombat\n", - # "stream":"stderr", - # "time":"2014-09-25T21:15:03.499185026Z"} - # - # The time_format specification below makes sure we properly - # parse the time format produced by Docker. This will be - # submitted to Elasticsearch and should appear like: - # $ curl 'http://elasticsearch-logging:9200/_search?pretty' - # ... - # { - # "_index" : "logstash-2014.09.25", - # "_type" : "fluentd", - # "_id" : "VBrbor2QTuGpsQyTCdfzqA", - # "_score" : 1.0, - # "_source":{"log":"2014/09/25 22:45:50 Got request with path wombat\n", - # "stream":"stderr","tag":"docker.container.all", - # "@timestamp":"2014-09-25T22:45:50+00:00"} - # }, - # ... - # - # The Kubernetes fluentd plugin is used to write the Kubernetes metadata to the log - # record & add labels to the log record if properly configured. This enables users - # to filter & search logs on any metadata. - # For example a Docker container's logs might be in the directory: - # - # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b - # - # and in the file: - # - # 997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log - # - # where 997599971ee6... is the Docker ID of the running container. - # The Kubernetes kubelet makes a symbolic link to this file on the host machine - # in the /var/log/containers directory which includes the pod name and the Kubernetes - # container name: - # - # synthetic-logger-0.25lps-pod_default_synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log - # -> - # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log - # - # The /var/log directory on the host is mapped to the /var/log directory in the container - # running this instance of Fluentd and we end up collecting the file: - # - # /var/log/containers/synthetic-logger-0.25lps-pod_default_synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log - # - # This results in the tag: - # - # var.log.containers.synthetic-logger-0.25lps-pod_default_synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log - # - # The Kubernetes fluentd plugin is used to extract the namespace, pod name & container name - # which are added to the log message as a kubernetes field object & the Docker container ID - # is also added under the docker field object. - # The final tag is: - # - # kubernetes.var.log.containers.synthetic-logger-0.25lps-pod_default_synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log - # - # And the final log record look like: - # - # { - # "log":"2014/09/25 21:15:03 Got request with path wombat\n", - # "stream":"stderr", - # "time":"2014-09-25T21:15:03.499185026Z", - # "kubernetes": { - # "namespace": "default", - # "pod_name": "synthetic-logger-0.25lps-pod", - # "container_name": "synth-lgr" - # }, - # "docker": { - # "container_id": "997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b" - # } - # } - # - # This makes it easier for users to search for logs by pod name or by - # the name of the Kubernetes container regardless of how many times the - # Kubernetes pod has been restarted (resulting in a several Docker container IDs). - # Json Log Example: - # {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"} - # CRI Log Example: - # 2016-02-17T00:04:05.931087621Z stdout F [info:2016-02-16T16:04:05.930-08:00] Some log text here - - @id fluentd-containers.log - @type tail - path /var/log/containers/*.log - pos_file /var/log/fluentd-containers.log.pos - time_format %Y-%m-%dT%H:%M:%S.%NZ - tag raw.kubernetes.* - format json - read_from_head true - - # Detect exceptions in the log output and forward them as one log entry. - - @id raw.kubernetes - @type detect_exceptions - remove_tag_prefix raw - message log - stream stream - multiline_flush_interval 5 - max_bytes 500000 - max_lines 1000 - - system.input.conf: |- - # Example: - # 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081 - - @id minion - @type tail - format /^(?