diff --git a/deploy/kubernetes/fluentd-sumologic-events.yaml b/deploy/kubernetes/fluentd-sumologic-events.yaml deleted file mode 100644 index 38046676a5..0000000000 --- a/deploy/kubernetes/fluentd-sumologic-events.yaml +++ /dev/null @@ -1,123 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRoleBinding -metadata: - name: fluentd -subjects: -- kind: ServiceAccount - name: fluentd - namespace: sumologic -roleRef: - kind: ClusterRole - name: fluentd - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRole -metadata: - name: fluentd - labels: - k8s-app: fluentd-sumologic-events -rules: -- apiGroups: [""] - resources: - - nodes - - namespaces - - events - - pods - - replicasets - - statefulsets - - deployments - verbs: ["get", "list", "watch"] ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fluentd - namespace: sumologic - labels: - k8s-app: fluentd-sumologic-events ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: fluentd-events - namespace: sumologic - labels: - k8s-app: fluentd-sumologic-events -spec: - selector: - matchLabels: - k8s-app: fluentd-sumologic-events - template: - metadata: - labels: - k8s-app: fluentd-sumologic-events - spec: - volumes: - - name: pos-files - hostPath: - path: /var/run/fluentd-pos - type: "" - - name: config-volume - configMap: - name: fluentd-config-events - containers: - - name: fluentd-events - image: sumologic/kubernetes-fluentd - imagePullPolicy: Always - resources: - limits: - memory: 256Mi - cpu: "100m" - requests: - memory: 256Mi - cpu: "100m" - volumeMounts: - - name: config-volume - mountPath: /fluentd/etc/ - - name: pos-files - mountPath: /mnt/pos/ - env: - - name: SUMO_ENDPOINT_EVENTS - valueFrom: - secretKeyRef: - name: sumologic - key: endpoint-events ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: fluentd-config-events - namespace: sumologic -data: - fluent.conf: |- - @include events.conf - events.conf: |- - - @type events - - - @type sumologic - endpoint "#{ENV['SUMO_ENDPOINT_EVENTS']}" - data_type logs - disable_cookies true - - ---- -apiVersion: v1 -kind: Service -metadata: - name: fluentd - namespace: sumologic - labels: - k8s-app: fluentd-sumologic-events -spec: - selector: - k8s-app: fluentd-sumologic-events - ports: - - name: prom-write - port: 9888 - targetPort: 9888 - protocol: TCP ---- \ No newline at end of file diff --git a/deploy/kubernetes/fluentd-sumologic.yaml b/deploy/kubernetes/fluentd-sumologic.yaml index a91726a449..6cd9de55e9 100644 --- a/deploy/kubernetes/fluentd-sumologic.yaml +++ b/deploy/kubernetes/fluentd-sumologic.yaml @@ -46,7 +46,6 @@ metadata: data: fluent.conf: |- @include metrics.conf - @include events.conf @include logs.conf metrics.conf: |- @@ -125,15 +124,6 @@ data: metric_data_format prometheus disable_cookies true - events.conf: |- - - @type dummy - tag "dummy.events" - dummy {"hello":"world"} - - - @type null - logs.conf: |- @type forward @@ -367,6 +357,73 @@ spec: key: endpoint-logs --- apiVersion: v1 +kind: ConfigMap +metadata: + name: fluentd-events-config + namespace: sumologic +data: + fluent.conf: |- + @include events.conf + events.conf: |- + + @type events + + + @type sumologic + endpoint "#{ENV['SUMO_ENDPOINT_EVENTS']}" + data_type logs + disable_cookies true + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fluentd-events + namespace: sumologic + labels: + k8s-app: fluentd-sumologic +spec: + selector: + matchLabels: + k8s-app: fluentd-sumologic + template: + metadata: + labels: + k8s-app: fluentd-sumologic + spec: + serviceAccountName: fluentd + volumes: + - name: pos-files + hostPath: + path: /var/run/fluentd-pos + type: "" + - name: config-volume + configMap: + name: fluentd-events-config + containers: + - name: fluentd-events + image: sumologic/kubernetes-fluentd + imagePullPolicy: Always + resources: + limits: + memory: 256Mi + cpu: "100m" + requests: + memory: 256Mi + cpu: "100m" + volumeMounts: + - name: config-volume + mountPath: /fluentd/etc/ + - name: pos-files + mountPath: /mnt/pos/ + env: + - name: SUMO_ENDPOINT_EVENTS + valueFrom: + secretKeyRef: + name: sumologic + key: endpoint-events +--- +apiVersion: v1 kind: Service metadata: name: fluentd