Updated docker configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/0d3dee49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/0d3dee49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/0d3dee49 Branch: refs/heads/asf-site Commit: 0d3dee49ed3c1a1dc18f1d7380765ae339d6c47f Parents: 18d45be Author: msbeard <msbe...@apache.org> Authored: Tue Jan 30 12:50:49 2018 -0500 Committer: msbeard <msbe...@apache.org> Committed: Tue Jan 30 12:50:49 2018 -0500 ---------------------------------------------------------------------- docker/docker-compose.yml | 6 +-- docker/elasticsearch/Dockerfile | 2 + docker/elasticsearch/config/elasticsearch.yml | 1 + docker/kibana/Dockerfile | 2 + docker/kibana/config/kibana.yml | 2 +- docker/logstash/Dockerfile | 6 +++ docker/logstash/templates/userale.json | 47 +++++----------------- 7 files changed, 26 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 17b1106..7d4b199 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -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 http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/elasticsearch/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile index 7cdbae7..4f1e5c9 100644 --- a/docker/elasticsearch/Dockerfile +++ b/docker/elasticsearch/Dockerfile @@ -25,3 +25,5 @@ ENV CLUSTER_NAME SensSoft # Kubernetes requires swap is turned off ENV MEMORY_LOCK false + +EXPOSE 9200 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/elasticsearch/config/elasticsearch.yml ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/config/elasticsearch.yml b/docker/elasticsearch/config/elasticsearch.yml index ca31f63..a245d97 100644 --- a/docker/elasticsearch/config/elasticsearch.yml +++ b/docker/elasticsearch/config/elasticsearch.yml @@ -46,3 +46,4 @@ discovery: zen: ping.unicast.hosts: ${DISCOVERY_SERVICE} minimum_master_nodes: ${NUMBER_OF_MASTERS} + http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/kibana/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/kibana/Dockerfile b/docker/kibana/Dockerfile index 894fd53..91027a5 100644 --- a/docker/kibana/Dockerfile +++ b/docker/kibana/Dockerfile @@ -21,3 +21,5 @@ MAINTAINER Michelle Beard <msbe...@apache.org> COPY config /usr/share/kibana/config RUN kibana-plugin remove x-pack + +EXPOSE 5601 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/kibana/config/kibana.yml ---------------------------------------------------------------------- diff --git a/docker/kibana/config/kibana.yml b/docker/kibana/config/kibana.yml index 20f2999..cc93fed 100644 --- a/docker/kibana/config/kibana.yml +++ b/docker/kibana/config/kibana.yml @@ -15,4 +15,4 @@ server.name: kibana server.host: "0" -elasticsearch.url: http://loadbalancer:9200 +elasticsearch.url: http://localhost:9200 http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/logstash/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/logstash/Dockerfile b/docker/logstash/Dockerfile index 6aebb9e..fb46e5c 100644 --- a/docker/logstash/Dockerfile +++ b/docker/logstash/Dockerfile @@ -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 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/0d3dee49/docker/logstash/templates/userale.json ---------------------------------------------------------------------- diff --git a/docker/logstash/templates/userale.json b/docker/logstash/templates/userale.json index aed094f..c1bdbb1 100644 --- a/docker/logstash/templates/userale.json +++ b/docker/logstash/templates/userale.json @@ -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"
