Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine events yaml file with logs and metrics one #39

Merged
merged 1 commit into from
Jun 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 0 additions & 123 deletions deploy/kubernetes/fluentd-sumologic-events.yaml

This file was deleted.

77 changes: 67 additions & 10 deletions deploy/kubernetes/fluentd-sumologic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ metadata:
data:
fluent.conf: |-
@include metrics.conf
@include events.conf
@include logs.conf
metrics.conf: |-
<source>
Expand Down Expand Up @@ -125,15 +124,6 @@ data:
metric_data_format prometheus
disable_cookies true
</match>
events.conf: |-
<source>
@type dummy
tag "dummy.events"
dummy {"hello":"world"}
</source>
<match "dummy.events">
@type null
</match>
logs.conf: |-
<source>
@type forward
Expand Down Expand Up @@ -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: |-
<source>
@type events
</source>
<match kubernetes.**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_EVENTS']}"
data_type logs
disable_cookies true
</match>
---
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
Expand Down