Skip to content

Commit

Permalink
adding datadog
Browse files Browse the repository at this point in the history
  • Loading branch information
segfault committed Jun 29, 2018
1 parent 07e2b8e commit 435b9a3
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ IMAGE_NAME := fluent/fluentd-kubernetes
ALL_IMAGES := \
v0.12/alpine-elasticsearch:v0.12.33-elasticsearch,v0.12-elasticsearch,stable-elasticsearch,elasticsearch \
v0.12/alpine-loggly:v0.12.33-loggly,v0.12-loggly,stable-loggly,loggly \
v0.12/alpine-datadog:v0.12.33-datadog,v0.12-datadog,stable-datadog,datadog \
v0.12/alpine-logentries:v0.12.33-logentries,v0.12-logentries,stable-logentries,logentries \
v0.12/alpine-cloudwatch:v0.12.33-cloudwatch,v0.12-cloudwatch,stable-cloudwatch,cloudwatch \
v0.12/alpine-stackdriver:v0.12.33-stackdriver,v0.12-alpine-stackdriver,stable-stackdriver,stackdriver \
Expand All @@ -38,6 +39,7 @@ ALL_IMAGES := \
v0.12/debian-kafka:v0.12.33-debian-kafka,v0.12-debian-kafka,debian-kafka \
v1.2/debian-elasticsearch:v1.2.2-debian-elasticsearch,v1.2-debian-elasticsearch \
v1.2/debian-loggly:v1.2.2-debian-loggly,v1.2-debian-loggly \
v1.2/debian-datadog:v1.2.2-debian-datadog,v1.2-debian-datadog \
v1.2/debian-logentries:v1.2.2-debian-logentries,v1.2-debian-logentries \
v1.2/debian-cloudwatch:v1.2.2-debian-cloudwatch,v1.2-debian-cloudwatch \
v1.2/debian-stackdriver:v1.2.2-debian-stackdriver,v1.2-debian-stackdriver \
Expand Down
56 changes: 56 additions & 0 deletions fluentd-daemonset-datadog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
## Datadog example Daemonset

apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: fluentd
namespace: kube-system
labels:
k8s-app: fluentd-logging
version: v1
kubernetes.io/cluster-service: "true"
spec:
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
k8s-app: fluentd-logging
version: v1
kubernetes.io/cluster-service: "true"
spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
containers:
- name: fluentd
image: fluent/fluentd-kubernetes-daemonset:datadog
env:
- name: DATADOG_API_KEY
value: "XXXX"
- name: DATADOG_TAGS
value: "cluster:example,env:example"
- name: DATADOG_SOURCE
value: "fluentd"
- name: DATADOG_SOURCE_CATEGORY
value: "k8s"
resources:
limits:
memory: 200Mi
requests:
cpu: 100m
memory: 200Mi
volumeMounts:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
terminationGracePeriodSeconds: 30
volumes:
- name: varlog
hostPath:
path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
2 changes: 2 additions & 0 deletions templates/Gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ gem "fluent-plugin-elasticsearch"
#gem "fluent-plugin-logentries"
<% when "loggly"%>
gem "fluent-plugin-loggly"
<% when "datadog"%>
gem "fluent-plugin-datadog"
<% when "cloudwatch" %>
gem "aws-sdk-cloudwatchlogs", "~> 1.0"
<% if is_v1 %>
Expand Down
12 changes: 12 additions & 0 deletions templates/conf/fluent.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@
log_level info
loggly_url "https://logs-01.loggly.com/bulk/#{ENV['LOGGLY_TOKEN']}/tag/#{ENV['LOGGLY_TAGS'] || 'fluentd'}/bulk"
</match>
<% when "datadog"%>
<match **>
@type datadog
@id out_datadog
log_level info
api_key "#{ENV['DATADOG_API_KEY']}"
include_tag_key true
tag_key 'tag'
dd_source "#{ENV['DATADOG_SOURCE'] || 'fluentd'}"
dd_tags "#{ENV['DATADOG_TAGS'] || 'fluentd:fluentd'}"
dd_sourcecategory "#{ENV['DATADOG_SOURCE_CATEGORY'] || 'fluentd'}"
</match>
<% when "cloudwatch"%>
<match **>
@type cloudwatch_logs
Expand Down

0 comments on commit 435b9a3

Please sign in to comment.