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

Merge pull request #25309 from keontang/es-patch

Browse Source 
Automatic merge from submit-queue

add index template for es aggregations

This index template helps us to do es aggregations of namespace_name, pod_name and container_name. Then after doing eggs, we will get the whole name not all the spilt pieces.  
fix #25127
This commit is contained in:
k8s-merge-robot 2016-05-16 01:01:24 -07:00
commit 7fdfe1b387
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,10 @@ RUN cd / && \
tar xf elasticsearch-1.5.2.tar.gz && \ tar xf elasticsearch-1.5.2.tar.gz && \
rm elasticsearch-1.5.2.tar.gz rm elasticsearch-1.5.2.tar.gz
RUN mkdir -p /elasticsearch-1.5.2/config/templates
COPY elasticsearch.yml /elasticsearch-1.5.2/config/elasticsearch.yml COPY elasticsearch.yml /elasticsearch-1.5.2/config/elasticsearch.yml
COPY template-k8s-logstash.json /elasticsearch-1.5.2/config/templates/template-k8s-logstash.json
COPY run.sh / COPY run.sh /
COPY elasticsearch_logging_discovery / COPY elasticsearch_logging_discovery /

22
cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json Normal file
View File

@ -0,0 +1,22 @@
{
"template_k8s_logstash" : {
"template" : "logstash-*",
"settings" : {
"index.refresh_interval" : "5s"
},
"mappings" : {
"_default_" : {
"dynamic_templates" : [ {
"kubernetes_field" : {
"path_match" : "kubernetes.*",
"mapping" : {
"type" : "string",
"index" : "not_analyzed"
}
}
} ]
}
}
}
}