mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-04 04:08:16 +00:00
Merge pull request #48722 from aknuds1/upgrade-fluentd-elasticsearch
Automatic merge from submit-queue (batch tested with PRs 48365, 49902, 49808, 48722, 47045) Upgrade fluentd-elasticsearch addon to Elasticsearch/Kibana 5.5 This is a patch to upgrade the fluentd-elasticsearch addon to Elasticsearch/Kibana 5.5. Please provide feedback! ```release-notes * Upgrade Elasticsearch/Kibana to 5.5.1 in fluentd-elasticsearch addon * Switch to basing our image of Elasticsearch in fluentd-elasticsearch addon off the official one * Switch to the official image of Kibana in fluentd-elasticsearch addon * Use StatefulSet for Elasticsearch instead of ReplicationController, with persistent volume claims * Require authenticating towards Elasticsearch, as Elasticsearch 5.5 by default requires basic authentication ```
This commit is contained in:
Kubernetes Submit Queue
@@ -1,11 +1,45 @@
|
||||
# Logging Agent For Elasticsearch
|
||||
==============
|
||||
# Elasticsearch Add-On
|
||||
This add-on consists of a combination of
|
||||
[Elasticsearch](https://www.elastic.co/products/elasticsearch), [Fluentd](http://www.fluentd.org/)
|
||||
and [Kibana](https://www.elastic.co/products/elasticsearch). Elasticsearch is a search engine
|
||||
that is responsible for storing our logs and allowing for them to be queried. Fluentd sends
|
||||
log messages from Kubernetes to Elasticsearch, whereas Kibana is a graphical interface for
|
||||
viewing and querying the logs stored in Elasticsearch.
|
||||
|
||||
Logging Agent For Elasticsearch is a DaemonSet which spawns a pod on each node
|
||||
that reads logs, generated by kubelet, container runtime and containers
|
||||
and sends them to Elasticsearch, deployed in the cluster. Later logs can be
|
||||
accessed either by querying Elasticsearch directly or by using Kibana.
|
||||
## Elasticsearch
|
||||
Elasticsearch is deployed as a
|
||||
[StatefulSet](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/), which
|
||||
is like a Deployment, but allows for maintaining state on storage volumes.
|
||||
|
||||
### Authentication
|
||||
Elasticsearch has basic authentication enabled by default, in our configuration the credentials
|
||||
are at their default values, i.e. username 'elastic' and password 'changeme'. In order to change
|
||||
them, please read up on [the official documentation](https://www.elastic.co/guide/en/x-pack/current/setting-up-authentication.html#reset-built-in-user-passwords).
|
||||
|
||||
### Initialization
|
||||
The Elasticsearch Statefulset manifest specifies that there shall be an
|
||||
[init container](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) executing
|
||||
before Elasticsearch containers themselves, in order to ensure that the kernel state variable
|
||||
`vm.max_map_count` is at least 262144, since this is a requirement of Elasticsearch.
|
||||
You may remove the init container if you know that your host OS meets this requirement.
|
||||
|
||||
### Storage
|
||||
The Elasticsearch StatefulSet will claim a storage volume 'elasticsearch-logging',
|
||||
of the standard
|
||||
[StorageClass](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#storageclasses),
|
||||
that by default will be 100 Gi per replica. Please adjust this to your needs (including
|
||||
possibly choosing a more suitable StorageClass).
|
||||
|
||||
## Fluentd
|
||||
Fluentd is deployed as a
|
||||
[DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) which spawns a
|
||||
pod on each node that reads logs, generated by kubelet, container runtime and containers and
|
||||
sends them to Elasticsearch.
|
||||
|
||||
*Please note that for Fluentd to work, every Kubernetes node must be labeled*
|
||||
`beta.kubernetes.io/fluentd-ds-ready=true`, as otherwise Fluentd will ignore them.
|
||||
|
||||
Learn more at: https://kubernetes.io/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana
|
||||
|
||||
[]()
|
||||
|
||||
|
||||
7
cluster/addons/fluentd-elasticsearch/env-configmap.yaml
Normal file
7
cluster/addons/fluentd-elasticsearch/env-configmap.yaml
Normal file
@@ -0,0 +1,7 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: environment
|
||||
namespace: kube-system
|
||||
data:
|
||||
elasticsearch-user: elastic
|
||||
8
cluster/addons/fluentd-elasticsearch/env-secret.yaml
Normal file
8
cluster/addons/fluentd-elasticsearch/env-secret.yaml
Normal file
@@ -0,0 +1,8 @@
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: environment
|
||||
namespace: kube-system
|
||||
type: Opaque
|
||||
data:
|
||||
elasticsearch-password: Y2hhbmdlbWU=
|
||||
@@ -12,43 +12,24 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# A Dockerfile for creating an Elasticsearch instance that is designed
|
||||
# to work with Kubernetes logging. Inspired by the Dockerfile
|
||||
# dockerfile/elasticsearch
|
||||
FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.1
|
||||
|
||||
FROM java:openjdk-8-jre-alpine
|
||||
USER root
|
||||
|
||||
RUN mkdir /data
|
||||
RUN chown -R elasticsearch:elasticsearch /data
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV ELASTICSEARCH_VERSION 5.4.0
|
||||
|
||||
RUN apk update && \
|
||||
apk --no-cache add \
|
||||
--repository https://dl-3.alpinelinux.org/alpine/edge/testing \
|
||||
--repository https://dl-3.alpinelinux.org/alpine/edge/community \
|
||||
curl \
|
||||
shadow \
|
||||
tar \
|
||||
gosu
|
||||
|
||||
RUN set -x \
|
||||
&& cd / \
|
||||
&& mkdir /elasticsearch \
|
||||
&& curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.tar.gz \
|
||||
&& tar xf elasticsearch-$ELASTICSEARCH_VERSION.tar.gz -C /elasticsearch --strip-components=1 \
|
||||
&& rm elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
|
||||
|
||||
COPY config /elasticsearch/config
|
||||
|
||||
COPY run.sh /
|
||||
COPY elasticsearch_logging_discovery /
|
||||
|
||||
RUN useradd --no-create-home --user-group elasticsearch \
|
||||
&& mkdir /data \
|
||||
&& chown -R elasticsearch:elasticsearch /elasticsearch
|
||||
|
||||
WORKDIR /usr/share/elasticsearch
|
||||
|
||||
VOLUME ["/data"]
|
||||
EXPOSE 9200 9300
|
||||
|
||||
CMD ["/run.sh"]
|
||||
USER elasticsearch
|
||||
COPY elasticsearch_logging_discovery bin/
|
||||
COPY config/elasticsearch.yml config/
|
||||
COPY config/log4j2.properties config/
|
||||
COPY run.sh bin/
|
||||
|
||||
USER root
|
||||
RUN chown -R elasticsearch:elasticsearch config
|
||||
CMD ["bin/run.sh"]
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
# The current value of the tag to be used for building and
|
||||
# pushing an image to gcr.io
|
||||
TAG = v5.4.0-1
|
||||
TAG = v5.5.1
|
||||
|
||||
build: elasticsearch_logging_discovery
|
||||
docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) .
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
|
||||
status = error
|
||||
|
||||
appender.console.type = Console
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
sysctl -w vm.max_map_count=262144
|
||||
set -ex
|
||||
|
||||
export NODE_NAME=${NODE_NAME:-${HOSTNAME}}
|
||||
export NODE_MASTER=${NODE_MASTER:-true}
|
||||
@@ -23,8 +23,7 @@ export HTTP_PORT=${HTTP_PORT:-9200}
|
||||
export TRANSPORT_PORT=${TRANSPORT_PORT:-9300}
|
||||
export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}
|
||||
|
||||
/elasticsearch_logging_discovery >> /elasticsearch/config/elasticsearch.yml
|
||||
|
||||
chown -R elasticsearch:elasticsearch /data
|
||||
|
||||
exec gosu elasticsearch sh /elasticsearch/bin/elasticsearch
|
||||
./bin/elasticsearch_logging_discovery >> ./config/elasticsearch.yml
|
||||
exec su elasticsearch -c ./bin/es-docker
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
apiVersion: apps/v1beta1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: elasticsearch-logging-v1
|
||||
namespace: kube-system
|
||||
@@ -9,8 +9,10 @@ metadata:
|
||||
kubernetes.io/cluster-service: "true"
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
spec:
|
||||
serviceName: elasticsearch-logging
|
||||
replicas: 2
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: elasticsearch-logging
|
||||
version: v1
|
||||
template:
|
||||
@@ -22,7 +24,7 @@ spec:
|
||||
spec:
|
||||
serviceAccountName: elasticsearch-logging
|
||||
containers:
|
||||
- image: gcr.io/google_containers/elasticsearch:v2.4.1-2
|
||||
- image: gcr.io/google_containers/elasticsearch:v5.5.1
|
||||
name: elasticsearch-logging
|
||||
resources:
|
||||
# need more cpu upon initialization, therefore burstable class
|
||||
@@ -38,13 +40,24 @@ spec:
|
||||
name: transport
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- name: es-persistent-storage
|
||||
- name: elasticsearch-logging
|
||||
mountPath: /data
|
||||
env:
|
||||
- name: "NAMESPACE"
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
volumes:
|
||||
- name: es-persistent-storage
|
||||
emptyDir: {}
|
||||
initContainers:
|
||||
- image: alpine:3.6
|
||||
command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
|
||||
name: elasticsearch-logging-init
|
||||
securityContext:
|
||||
privileged: true
|
||||
volumeClaimTemplates:
|
||||
- metadata:
|
||||
name: elasticsearch-logging
|
||||
spec:
|
||||
accessModes: ["ReadWriteOnce"]
|
||||
resources:
|
||||
requests:
|
||||
storage: 100Gi
|
||||
@@ -32,6 +32,16 @@ spec:
|
||||
env:
|
||||
- name: FLUENTD_ARGS
|
||||
value: -q
|
||||
- name: FLUENT_ELASTICSEARCH_USER
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: environment
|
||||
key: elasticsearch-user
|
||||
- name: FLUENT_ELASTICSEARCH_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: environment
|
||||
key: elasticsearch-password
|
||||
resources:
|
||||
limits:
|
||||
memory: 200Mi
|
||||
|
||||
@@ -323,6 +323,8 @@
|
||||
|
||||
<match **>
|
||||
type elasticsearch
|
||||
user "#{ENV['FLUENT_ELASTICSEARCH_USER']}"
|
||||
password "#{ENV['FLUENT_ELASTICSEARCH_PASSWORD']}"
|
||||
log_level info
|
||||
include_tag_key true
|
||||
host elasticsearch-logging
|
||||
|
||||
@@ -19,7 +19,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: kibana-logging
|
||||
image: gcr.io/google_containers/kibana:v4.6.1-1
|
||||
image: docker.elastic.co/kibana/kibana:5.5.1
|
||||
resources:
|
||||
# keep request = limit to keep this container in guaranteed class
|
||||
limits:
|
||||
@@ -29,7 +29,7 @@ spec:
|
||||
env:
|
||||
- name: "ELASTICSEARCH_URL"
|
||||
value: "http://elasticsearch-logging:9200"
|
||||
- name: "KIBANA_BASE_URL"
|
||||
- name: "SERVER_BASEPATH"
|
||||
value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging"
|
||||
ports:
|
||||
- containerPort: 5601
|
||||
@@ -1,39 +0,0 @@
|
||||
# Copyright 2017 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# A Dockerfile for creating a Kibana container that is designed
|
||||
# to work with Kubernetes logging.
|
||||
|
||||
FROM gcr.io/google_containers/ubuntu-slim:0.6
|
||||
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV KIBANA_VERSION 5.4.0
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y curl \
|
||||
&& apt-get clean
|
||||
|
||||
RUN set -x \
|
||||
&& cd / \
|
||||
&& mkdir /kibana \
|
||||
&& curl -O https://artifacts.elastic.co/downloads/kibana/kibana-$KIBANA_VERSION-linux-x86_64.tar.gz \
|
||||
&& tar xf kibana-$KIBANA_VERSION-linux-x86_64.tar.gz -C /kibana --strip-components=1 \
|
||||
&& rm kibana-$KIBANA_VERSION-linux-x86_64.tar.gz
|
||||
|
||||
COPY run.sh /run.sh
|
||||
|
||||
EXPOSE 5601
|
||||
|
||||
CMD ["/run.sh"]
|
||||
@@ -1,24 +0,0 @@
|
||||
# Copyright 2017 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
.PHONY: build push
|
||||
|
||||
TAG = v5.4.0
|
||||
PREFIX = gcr.io/google_containers
|
||||
|
||||
build:
|
||||
docker build --pull -t $(PREFIX)/kibana:$(TAG) .
|
||||
|
||||
push:
|
||||
gcloud docker -- push $(PREFIX)/kibana:$(TAG)
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright 2017 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"}
|
||||
echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
|
||||
|
||||
export KIBANA_BASE_URL=${KIBANA_BASE_URL:-"''"}
|
||||
echo "server.basePath: ${KIBANA_BASE_URL}"
|
||||
echo "server.basePath: ${KIBANA_BASE_URL}" >> /kibana/config/kibana.yml
|
||||
echo "server.host: ${KIBANA_HOST}"
|
||||
echo "server.host: ${KIBANA_HOST}" >> /kibana/config/kibana.yml
|
||||
|
||||
/kibana/bin/kibana -e ${ELASTICSEARCH_URL}
|
||||
Reference in New Issue
Block a user