Skip to content
Permalink
Browse files
Updated docker configuration.
  • Loading branch information
michellebeard committed Jan 30, 2018
1 parent 18d45be commit 0d3dee49ed3c1a1dc18f1d7380765ae339d6c47f
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 40 deletions.
@@ -76,12 +76,12 @@ services:
elasticsearch-plugin remove --silent x-pack
elasticsearch
environment:
- NODE_MASTER=false
- NODE_MASTER=true
- NUMBER_OF_MASTERS=1
- NODE_COORDINATE=true
- "DISCOVERY_SERVICE=elasticsearch"
- NODE_DATA=false
- NODE_INGEST=false
- NODE_DATA=true
- NODE_INGEST=true
- MAX_LOCAL_STORAGE_NODES=1
- NETWORK_HOST=0.0.0.0
- HTTP_ENABLE=true
@@ -25,3 +25,5 @@ ENV CLUSTER_NAME SensSoft

# Kubernetes requires swap is turned off
ENV MEMORY_LOCK false

EXPOSE 9200
@@ -46,3 +46,4 @@ discovery:
zen:
ping.unicast.hosts: ${DISCOVERY_SERVICE}
minimum_master_nodes: ${NUMBER_OF_MASTERS}

@@ -21,3 +21,5 @@ MAINTAINER Michelle Beard <msbeard@apache.org>
COPY config /usr/share/kibana/config

RUN kibana-plugin remove x-pack

EXPOSE 5601
@@ -15,4 +15,4 @@

server.name: kibana
server.host: "0"
elasticsearch.url: http://loadbalancer:9200
elasticsearch.url: http://localhost:9200
@@ -22,3 +22,9 @@ RUN logstash-plugin remove x-pack

# Known issue: https://github.com/elastic/logstash-docker/issues/45
RUN sed -i '/xpack/d' /usr/share/logstash/config/logstash.yml

# Copy Configuration files over
COPY config/logstash-userale.conf /etc/logstash/conf.d/logstash-userale.conf
COPY templates/userale.json /usr/share/logstash/templates/userale.json

EXPOSE 8100
@@ -30,33 +30,32 @@
},
"logs":
{
"dynamic_templates": [
{
"strings_as_keywords": {
"match_mapping_type": "string",
"mapping": {
"type": "keyword"
}
}
}
],
"dynamic": "true",
"properties":
{
"userAction":
{
"type": "boolean"
},
"type":
{
"type": "keyword"
},
"clientTime":
{
"type": "date",
"format": "strict_date_optional_time||epoch_millis"
},
"target":
{
"type": "keyword"
},
"count":
{
"type": "integer"
},
"logType":
{
"type": "keyword"
},
"targetChange":
{
"type": "boolean"
@@ -65,10 +64,6 @@
{
"type": "boolean"
},
"path":
{
"type": "keyword"
},
"details":
{
"properties":
@@ -125,26 +120,6 @@
}
}
},
"userId":
{
"type": "keyword"
},
"sessionID":
{
"type": "keyword"
},
"toolName":
{
"type": "keyword"
},
"toolVersion":
{
"type": "keyword"
},
"useraleVersion":
{
"type": "keyword"
},
"major_ver":
{
"type": "integer"

0 comments on commit 0d3dee4

Please sign in to comment.