Commit Graph

165 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
5f82f129df Merge pull request #46203 from simt2/fluentd-elasticsearch-rbac
Automatic merge from submit-queue (batch tested with PRs 46151, 47602, 47507, 46203, 47471)

Add RBAC support to fluentd-elasticsearch cluster addon

**What this PR does / why we need it**:
Adds rbac support to the fluentd-elasticsearch addon

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #46023 

**Special notes for your reviewer**:

**Release note**:

```release-note
Add RBAC support to fluentd-elasticsearch cluster addon
```
2017-06-23 05:08:28 -07:00
Kubernetes Submit Queue
509c4351df Merge pull request #47507 from yiqinguo/yiqinguo_es_addargs
Automatic merge from submit-queue (batch tested with PRs 46151, 47602, 47507, 46203, 47471)

es discovery support args apiserver-host and kubeconfig

Now discovery elasticsearch through kubernetes client,but now does not support specifying the apiserver-host or kubeconfig create client.
2017-06-23 05:08:26 -07:00
gmarek
8427d5a274 Decrease fluentd cpu request 2017-06-22 18:30:21 +02:00
yiqinguo
b0c57c081e es discovery support args apiserver-host and kubeconfig 2017-06-20 09:15:23 +08:00
simt2
4bc0da349d Add rbac support to fluentd-elasticsearch 2017-06-16 08:44:24 +02:00
Stanisław Szydło
9a02da7754 Update fluentd-es-ds.yaml
'fluentd-es-ds' container image ver. bump.
2017-05-29 19:09:57 +02:00
Stanislaw Szydlo
f9d46cf23c Update 'fluentd-elasticsearch' image.
Plugins updated:
 - fluent-plugin-elasticsearch 1.5.0 -> 1.9.5
 - fluent-plugin-kubernetes_metadata 0.24.0 -> 0.27.0
2017-05-29 16:14:52 +02:00
kb@itsvit.org
b23b919b05 Bump elasticsearch and kibana to 5.4.0 2017-05-24 14:07:15 +03:00
haoyuan
d3fd956dac remove the elasticsearch template 2017-05-17 19:20:14 +08:00
Kubernetes Submit Queue
1e6061b9ec Merge pull request #45763 from piosz/es-owners
Automatic merge from submit-queue

Added coffeepac to ElasticSearch owners

@coffeepac

@fgrzadkowski, could you please add @coffeepac to Kubernetes org?
2017-05-16 12:22:59 -07:00
Christian Koep
df80b76d1b
Refactor gcr.io/google_containers/elasticsearch to alpine
Signed-off-by: Christian Koep <christiankoep@gmail.com>
2017-05-15 17:52:39 +02:00
Piotr Szczesniak
da8f82cbd0 Added coffeepac to ElasticSearch owners 2017-05-13 07:48:09 +02:00
Mik Vyatskov
30f22ad683 Remove toleration from fluentd-elasticsearch 2017-04-05 11:27:14 +02:00
Kubernetes Submit Queue
13e2f5d9d7 Merge pull request #43379 from crassirostris/fluentd-gcp-docs
Automatic merge from submit-queue

Add readme for fluentd addons

/cc @steveperry-53
2017-03-23 02:08:56 -07:00
Mik Vyatskov
7ae8eee1cd Add readme for fluentd-elasticsearch addon 2017-03-22 11:27:48 +01:00
Piotr Szczesniak
8968ac5c36 Renamed fluentd-ds-ready annotation 2017-03-21 20:48:13 +01:00
Kubernetes Submit Queue
17793bccb9 Merge pull request #42630 from anguslees/elasticsearch
Automatic merge from submit-queue (batch tested with PRs 41830, 42630)

Arrange for elasticsearch to shutdown cleanly

Kubernetes initiates "graceful shutdown" by sending SIGTERM to pid 1, which
is exactly what elasticsearch is expecting (good!)

The way the existing startup scripts worked however, this signal arrived at
the shell wrapper, not elasticsearch, and the shell wrapper exited,
killing the container immediately (bad!)

Before this change:
```
    1 ?        Ss     0:00 /bin/sh -c /run.sh
    6 ?        S      0:00 /bin/bash /run.sh
   13 ?        S      0:00  \_ /bin/su -c /elasticsearch/bin/elasticsearch elasticsearch
   14 ?        Ss     0:00      \_ sh -c /elasticsearch/bin/elasticsearch
   15 ?        Sl    19:18          \_ /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start
```
After this change:
```
    1 ?        Ssl    0:29 /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start
```
2017-03-10 16:21:20 -08:00
Angus Lees
3390deac31 Fix metav1 typo in previous commit
Fix typo in 469df12038 by using `metav1`
consistently rather than an error-producing mix of `metav1` and
`meta_v1`.
2017-03-10 11:24:22 +11:00
Mikhail Vyatskov
0d363f2892 Fix username case in OWNERS files 2017-03-07 16:45:40 -08:00
Angus Lees
85378ad34f Arrange for elasticsearch to shutdown cleanly
Kubernetes initiates "graceful shutdown" by sending SIGTERM to pid 1.
The way the existing startup scripts worked, this signal arrived at
the shell wrapper, not elasticsearch, and the shell wrapper exited,
killing the container immediately.

Before this change:
    1 ?        Ss     0:00 /bin/sh -c /run.sh
    6 ?        S      0:00 /bin/bash /run.sh
   13 ?        S      0:00  \_ /bin/su -c /elasticsearch/bin/elasticsearch elasticsearch
   14 ?        Ss     0:00      \_ sh -c /elasticsearch/bin/elasticsearch
   15 ?        Sl    19:18          \_ /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start

After this change:
    1 ?        Ssl    0:29 /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start
2017-03-08 10:16:28 +11:00
Avesh Agarwal
99bba40682 Update addons yaml files. 2017-02-27 09:21:59 -05:00
Zihong Zheng
d4fa046d56 Adds the new addon-manager labels on cluster addon templates 2017-02-24 16:53:12 -08:00
Mik Vyatskov
cbba60cc7d Add toleration to fluentd daemonset to make it run on master 2017-02-15 18:11:45 +01:00
Vishnu kannan
10e7902a12 make fluentd a critical pod
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2017-02-06 12:16:32 -08:00
Clayton Coleman
469df12038
refactor: move ListOptions references to metav1 2017-01-23 17:52:46 -05:00
Antoine Pelisse
62af7dd33d OWNERS: Update latest OWNERS files
These files have been created lately, so we don't have much information
about them anyway, so let's just:
- Remove assignees and make them approvers
- Copy approves as reviewers
2017-01-23 10:05:48 -08:00
Mik Vyatskov
cd4ee14019 Fix Elasticsearch image for logging and bump version 2017-01-21 17:48:32 +01:00
deads2k
ee6752ef20 find and replace 2017-01-20 08:04:53 -05:00
Kubernetes Submit Queue
002cdfa1ae Merge pull request #39861 from Traum-Ferienwohnungen/hostname_as_nodename
Automatic merge from submit-queue

Use $HOSTNAME as node.name by default

**What this PR does / why we need it**:
Allows to identify elasticsearch instances more easily.
As $HOSTNAME of a pod is unique, this should be no problem.
2017-01-17 04:57:09 -08:00
Janis Meybohm
6b3284acd2 Use $HOSTNAME as node.name by default
Allows to identify elasticsearch instances more easily.
As $HOSTNAME of a pod is unique, this should be no problem.
2017-01-17 08:38:53 +01:00
Jeff Grafton
1c2ea28080 Update images that use ubuntu-slim base image to :0.6 2017-01-11 15:07:04 -08:00
kayrus
8435d19982 Enable kubernetes_metadata by default for ELK stack 2017-01-11 14:08:01 +01:00
Jeff Grafton
19aafd291c Always --pull in docker build to ensure recent base images 2017-01-10 16:21:05 -08:00
Piotr Szczesniak
da7b81c4d8 Added owners to monitoring and logging related directories 2017-01-10 12:14:10 +01:00
Mik Vyatskov
57ec7b77fd Fix fluentd-gcp image config by avoiding processing its own logs 2017-01-09 10:05:33 +01:00
Kubernetes Submit Queue
274a9f0f70 Merge pull request #38927 from luxas/remove_maintainer
Automatic merge from submit-queue

Remove all MAINTAINER statements in the codebase as they are deprecated

**What this PR does / why we need it**:
ref: https://github.com/docker/docker/pull/25466

**Release note**:

```release-note
Remove all MAINTAINER statements in Dockerfiles in the codebase as they are deprecated by docker
```
@ixdy @thockin (who else should be notified?)
2016-12-29 16:41:24 -08:00
Dawn Chen
9d3f4d7152 Revert "Make fluentd pods critical" 2016-12-22 15:58:36 -08:00
Mik Vyatskov
4a7b3d7528 Make fluentd pods critical 2016-12-21 19:56:46 +01:00
Kubernetes Submit Queue
def8022729 Merge pull request #37100 from apatil/master
Automatic merge from submit-queue

Adding NAMESPACE to elasticsearch pod environment from downward API

**What this PR does / why we need it**:

The elasticsearch cluster addon references the `NAMESPACE` environmental variable here: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go#L56 but, on k8s 1.3.7 at least, it is not automatically set. This PR gets it from the downward API.

**Release note**:

```NONE
```
2016-12-19 09:38:42 -08:00
Lucas Käldström
3c5b5f5963 Remove all MAINTAINER statements in the codebase as they aren't very useful and now deprecated 2016-12-17 20:34:10 +02:00
Piotr Szczesniak
c00e57789d Added upgrade story from manifest pod to ds 2016-12-15 13:48:32 +01:00
Piotr Szczesniak
a52637f09f Migrated fluentd to daemon set 2016-12-15 13:48:32 +01:00
keglevich3
b68e4c0a6d enable the kubernetes-metadata-plugin
instruction to users that would like to enable the fluentd kubernetes-metadata plugin.
Relevant only if you are using daemon-set
2016-12-06 23:48:19 +02:00
Kubernetes Submit Queue
d77610fc4d Merge pull request #36857 from Shrugs/fix/elasticsearch-template-mapping
Automatic merge from submit-queue

fix: elasticsearch template mapping to parse kubernetes.labels

**What this PR does / why we need it**:

This PR updates the field mappings for the elasticsearch template that ships with the EFK stack implementation.

Specifically, elasticsearch cannot parse the `kubernetes.labels` object because it attempts to treat it as a string and produces an error. This update treats `kubernetes.labels` as an object and all of the properties within as a string, allowing accurate indexing and allowing users in kibana to search on `kubernetes.labels.*`.

**Release note**:
```release-note
Fluentd/Elastisearch add-on: correctly parse and index kubernetes labels
```
2016-11-29 07:33:07 -08:00
Kubernetes Submit Queue
b3a89cc988 Merge pull request #37283 from Crassirostris/fluentd-es-image-version-bump
Automatic merge from submit-queue

Bump fluentd-es image version

New image version, containing changes from https://github.com/kubernetes/kubernetes/pull/37123 and https://github.com/kubernetes/kubernetes/pull/37219

Should be merged only after those two

@piosz
2016-11-22 12:47:14 -08:00
Kubernetes Submit Queue
fd6a805a98 Merge pull request #37219 from Crassirostris/es-logging-image-fix
Automatic merge from submit-queue

Elasticsearch data mount is chowned after container start

Fix https://github.com/kubernetes/kubernetes/issues/37030

@piosz
2016-11-22 12:41:29 -08:00
Mik Vyatskov
81eeeec894 Bump fluentd-es image version 2016-11-22 12:03:46 +01:00
Mik Vyatskov
b5b47620f5 Add kube-proxy logs to fluentd configs 2016-11-21 15:43:28 +01:00
Mik Vyatskov
1c63e0648a Elasticsearch data mount is chowned after container start 2016-11-21 13:33:49 +01:00
Anand Patil
28c36afc1d Adding NAMESPACE to elasticsearch pod environment from downward API 2016-11-18 11:56:55 -05:00