github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-23 10:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Remove kubernetes metadata plugin

Browse Source
This commit is contained in:
Manuel de Brito Fontes 2016-08-01 17:47:04 -04:00
parent 5753a3196c
commit e2c50152dd
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -22,7 +22,7 @@
# Please see http://docs.fluentd.org/articles/install-by-deb for more # Please see http://docs.fluentd.org/articles/install-by-deb for more
# information about installing fluentd using deb package. # information about installing fluentd using deb package.
FROM gcr.io/google_containers/ubuntu-slim:0.3 FROM gcr.io/google_containers/ubuntu-slim:0.4
MAINTAINER Alex Robinson "arob@google.com" MAINTAINER Alex Robinson "arob@google.com"
MAINTAINER Jimmi Dyson "jimmidyson@gmail.com" MAINTAINER Jimmi Dyson "jimmidyson@gmail.com"

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2016 The Kubernetes Authors All rights reserved. # Copyright 2015 The Kubernetes Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -29,7 +29,9 @@ apt-get install -y -q --no-install-recommends \
sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent
# Install the Elasticsearch Fluentd plug-in. # Install the Elasticsearch Fluentd plug-in.
td-agent-gem install fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch # http://docs.fluentd.org/articles/plugin-management
td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.24.0
td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.5.0
# Remove docs and postgres references # Remove docs and postgres references
rm -rf /opt/td-agent/embedded/share/doc \ rm -rf /opt/td-agent/embedded/share/doc \

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View File

@ -218,9 +218,9 @@
tag kube-scheduler tag kube-scheduler
</source> </source>
<filter kubernetes.**> #<filter kubernetes.**>
type kubernetes_metadata # type kubernetes_metadata
</filter> #</filter>
# Example: # Example:
# I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View File

@ -20,7 +20,7 @@
# scope and that the Logging API has been enabled for the project # scope and that the Logging API has been enabled for the project
# in the Google Developer Console. # in the Google Developer Console.
FROM gcr.io/google_containers/ubuntu-slim:0.3 FROM gcr.io/google_containers/ubuntu-slim:0.4
MAINTAINER Alex Robinson "arob@google.com" MAINTAINER Alex Robinson "arob@google.com"
# Disable prompts from apt. # Disable prompts from apt.

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -28,7 +28,7 @@
.PHONY: kbuild kpush .PHONY: kbuild kpush
TAG = 1.22 TAG = 1.25
# Rules for building the test image for deployment to Dockerhub with user kubernetes. # Rules for building the test image for deployment to Dockerhub with user kubernetes.

2
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-elasticsearch - name: fluentd-elasticsearch
image: aledbf/fluentd-elasticsearch:1.19 image: gcr.io/google_containers/fluentd-elasticsearch:1.17
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi

2
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -11,7 +11,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: aledbf/fluentd-gcp:1.22 image: gcr.io/google_containers/fluentd-gcp:1.21
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi