Repository: incubator-senssoft Updated Branches: refs/heads/kubernetes d2ca76f4d -> 8e0d4bfc6
Updated branch w/ elk 5.6.3 and 6.2.2 Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/8e0d4bfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/8e0d4bfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/8e0d4bfc Branch: refs/heads/kubernetes Commit: 8e0d4bfc693d2cf7b96ab38ce3c654e1ba903ffb Parents: d2ca76f Author: msbeard <msbe...@apache.org> Authored: Wed Apr 18 10:59:12 2018 -0400 Committer: msbeard <msbe...@apache.org> Committed: Wed Apr 18 10:59:12 2018 -0400 ---------------------------------------------------------------------- README.md | 2 +- docker/README.md | 15 +- docker/docs/images/configure_index.png | Bin 0 -> 116678 bytes docker/docs/images/confirmation.png | Bin 0 -> 158876 bytes docker/docs/images/dashboard.png | Bin 0 -> 172635 bytes docker/docs/images/management.png | Bin 0 -> 60954 bytes .../5.6.3/config/elasticsearch.yml | 1 - docker/images/configure_index.png | Bin 116678 -> 0 bytes docker/images/confirmation.png | Bin 158876 -> 0 bytes docker/images/dashboard.png | Bin 172635 -> 0 bytes docker/images/management.png | Bin 60954 -> 0 bytes docker/kibana/5.6.3/Dockerfile | 25 ++++ docker/kibana/5.6.3/config/kibana.yml | 18 +++ docker/kibana/5.6.3/dashboard.json | 19 +++ docker/kibana/5.6.3/visualizations.json | 58 +++++++ docker/kibana/dashboard.json | 19 --- docker/kibana/visualizations.json | 58 ------- docker/logstash/5.6.3/Dockerfile | 30 ++++ .../logstash/5.6.3/config/logstash-userale.conf | 53 +++++++ docker/logstash/5.6.3/templates/userale.json | 150 +++++++++++++++++++ 20 files changed, 359 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 37cec1d..29d471e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ SensSoft Docker Containers and Website -------------------------------------- -Specific build instructions located in docker, kubernetes and site folders. +Specific build instructions located in docker, kubernetes, release and site folders. http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/README.md ---------------------------------------------------------------------- diff --git a/docker/README.md b/docker/README.md index 4281566..78edcee 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,7 @@ How to Build SensSoft Docker Containers --------------------------------------- -1. Install [``Docker``](http://docker.com) on your machine. Require Docker 1.7 and above. +1. Install [``Docker``](http://docker.com) on your machine. Requires Docker 1.7 and above. 1. Install ``docker-compose`` in an virtual environment. Full instructions can be found [``here``](https://docs.docker.com/compose/install/). @@ -121,14 +121,9 @@ Having Issues? $ docker-compose logs > err.dump ``` -TODO ----- -1. Update Kibana instructions and images. -1. Test Kibana visualizations. - -[configure_index]: ./images/configure_index.png "Configure Kibana index" -[confirmation]: ./images/confirmation.png "Confirm index pattern conflicts" -[dashboard]: ./images/dashboard.png "Apache Senssoft Dashboard" -[management]: ./images/management.png "Kibana management console" +[configure_index]: ./docs/images/configure_index.png "Configure Kibana index" +[confirmation]: ./docs/images/confirmation.png "Confirm index pattern conflicts" +[dashboard]: ./docs/images/dashboard.png "Apache Senssoft Dashboard" +[management]: ./docs/images/management.png "Kibana management console" © Copyright 2016 The Charles Stark Draper Laboratory, Inc. All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/docs/images/configure_index.png ---------------------------------------------------------------------- diff --git a/docker/docs/images/configure_index.png b/docker/docs/images/configure_index.png new file mode 100644 index 0000000..31ebe02 Binary files /dev/null and b/docker/docs/images/configure_index.png differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/docs/images/confirmation.png ---------------------------------------------------------------------- diff --git a/docker/docs/images/confirmation.png b/docker/docs/images/confirmation.png new file mode 100644 index 0000000..467b4d4 Binary files /dev/null and b/docker/docs/images/confirmation.png differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/docs/images/dashboard.png ---------------------------------------------------------------------- diff --git a/docker/docs/images/dashboard.png b/docker/docs/images/dashboard.png new file mode 100644 index 0000000..7123c9e Binary files /dev/null and b/docker/docs/images/dashboard.png differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/docs/images/management.png ---------------------------------------------------------------------- diff --git a/docker/docs/images/management.png b/docker/docs/images/management.png new file mode 100644 index 0000000..90a26ae Binary files /dev/null and b/docker/docs/images/management.png differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/elasticsearch/5.6.3/config/elasticsearch.yml ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/5.6.3/config/elasticsearch.yml b/docker/elasticsearch/5.6.3/config/elasticsearch.yml index a245d97..93421af 100644 --- a/docker/elasticsearch/5.6.3/config/elasticsearch.yml +++ b/docker/elasticsearch/5.6.3/config/elasticsearch.yml @@ -19,7 +19,6 @@ cluster: node: master: ${NODE_MASTER} data: ${NODE_DATA} - #name: ${NODE_NAME} ingest: ${NODE_INGEST} max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES} http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/images/configure_index.png ---------------------------------------------------------------------- diff --git a/docker/images/configure_index.png b/docker/images/configure_index.png deleted file mode 100644 index 31ebe02..0000000 Binary files a/docker/images/configure_index.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/images/confirmation.png ---------------------------------------------------------------------- diff --git a/docker/images/confirmation.png b/docker/images/confirmation.png deleted file mode 100644 index 467b4d4..0000000 Binary files a/docker/images/confirmation.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/images/dashboard.png ---------------------------------------------------------------------- diff --git a/docker/images/dashboard.png b/docker/images/dashboard.png deleted file mode 100644 index 7123c9e..0000000 Binary files a/docker/images/dashboard.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/images/management.png ---------------------------------------------------------------------- diff --git a/docker/images/management.png b/docker/images/management.png deleted file mode 100644 index 90a26ae..0000000 Binary files a/docker/images/management.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/kibana/5.6.3/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/kibana/5.6.3/Dockerfile b/docker/kibana/5.6.3/Dockerfile new file mode 100644 index 0000000..91027a5 --- /dev/null +++ b/docker/kibana/5.6.3/Dockerfile @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +FROM docker.elastic.co/kibana/kibana:5.6.3 + +MAINTAINER Michelle Beard <msbe...@apache.org> + +# Override config +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/8e0d4bfc/docker/kibana/5.6.3/config/kibana.yml ---------------------------------------------------------------------- diff --git a/docker/kibana/5.6.3/config/kibana.yml b/docker/kibana/5.6.3/config/kibana.yml new file mode 100644 index 0000000..cc93fed --- /dev/null +++ b/docker/kibana/5.6.3/config/kibana.yml @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +server.name: kibana +server.host: "0" +elasticsearch.url: http://localhost:9200 http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/kibana/5.6.3/dashboard.json ---------------------------------------------------------------------- diff --git a/docker/kibana/5.6.3/dashboard.json b/docker/kibana/5.6.3/dashboard.json new file mode 100644 index 0000000..8a179a6 --- /dev/null +++ b/docker/kibana/5.6.3/dashboard.json @@ -0,0 +1,19 @@ +[ + { + "_id": "513c8680-be7d-11e7-8adf-fd0a12531eca", + "_type": "dashboard", + "_source": { + "title": "Apache SensSoft Dashboard", + "hits": 0, + "description": "", + "panelsJSON": "[{\"size_x\":6,\"size_y\":5,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"2bf40010-be7d-11e7-8adf-fd0a12531eca\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"f7ca4560-be7c-11e7-8adf-fd0a12531eca\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"bcd7c950-be7c-11e7-8adf-fd0a12531eca\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"e36b1f40-be7c-11e7-8adf-fd0a12531eca\",\"col\":1,\"row\":1}]", + "optionsJSON": "{\"darkTheme\":true}", + "uiStateJSON": "{}", + "version": 1, + "timeRestore": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}" + } + } + } +] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/kibana/5.6.3/visualizations.json ---------------------------------------------------------------------- diff --git a/docker/kibana/5.6.3/visualizations.json b/docker/kibana/5.6.3/visualizations.json new file mode 100644 index 0000000..7052384 --- /dev/null +++ b/docker/kibana/5.6.3/visualizations.json @@ -0,0 +1,58 @@ +[ + { + "_id": "bcd7c950-be7c-11e7-8adf-fd0a12531eca", + "_type": "visualization", + "_source": { + "title": "Top Event Types", + "visState": "{\"title\":\"Top Event Types\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Top Event Types\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"type\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event types\"}}],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" + } + } + }, + { + "_id": "e36b1f40-be7c-11e7-8adf-fd0a12531eca", + "_type": "visualization", + "_source": { + "title": "Total Number of Logs", + "visState": "{\"title\":\"Total Number of Logs\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total number of logs\"}}],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" + } + } + }, + { + "_id": "f7ca4560-be7c-11e7-8adf-fd0a12531eca", + "_type": "visualization", + "_source": { + "title": "Time Series", + "visState": "{\"title\":\"Time Series\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(*)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}" + } + } + }, + { + "_id": "2bf40010-be7d-11e7-8adf-fd0a12531eca", + "_type": "visualization", + "_source": { + "title": "Events by Targets", + "visState": "{\"title\":\"Events by Targets\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"HTML Tags\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxi s-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"target\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"HTML Tags\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"type\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"JS Events\"}}],\"listeners\":{}}", + "uiStateJSON": "{}", + "description": "", + "version": 1, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" + } + } + } +] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/kibana/dashboard.json ---------------------------------------------------------------------- diff --git a/docker/kibana/dashboard.json b/docker/kibana/dashboard.json deleted file mode 100644 index 8a179a6..0000000 --- a/docker/kibana/dashboard.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "_id": "513c8680-be7d-11e7-8adf-fd0a12531eca", - "_type": "dashboard", - "_source": { - "title": "Apache SensSoft Dashboard", - "hits": 0, - "description": "", - "panelsJSON": "[{\"size_x\":6,\"size_y\":5,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"2bf40010-be7d-11e7-8adf-fd0a12531eca\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"f7ca4560-be7c-11e7-8adf-fd0a12531eca\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"bcd7c950-be7c-11e7-8adf-fd0a12531eca\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"e36b1f40-be7c-11e7-8adf-fd0a12531eca\",\"col\":1,\"row\":1}]", - "optionsJSON": "{\"darkTheme\":true}", - "uiStateJSON": "{}", - "version": 1, - "timeRestore": false, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}" - } - } - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/kibana/visualizations.json ---------------------------------------------------------------------- diff --git a/docker/kibana/visualizations.json b/docker/kibana/visualizations.json deleted file mode 100644 index 7052384..0000000 --- a/docker/kibana/visualizations.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "_id": "bcd7c950-be7c-11e7-8adf-fd0a12531eca", - "_type": "visualization", - "_source": { - "title": "Top Event Types", - "visState": "{\"title\":\"Top Event Types\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Top Event Types\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"type\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event types\"}}],\"listeners\":{}}", - "uiStateJSON": "{}", - "description": "", - "version": 1, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" - } - } - }, - { - "_id": "e36b1f40-be7c-11e7-8adf-fd0a12531eca", - "_type": "visualization", - "_source": { - "title": "Total Number of Logs", - "visState": "{\"title\":\"Total Number of Logs\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total number of logs\"}}],\"listeners\":{}}", - "uiStateJSON": "{}", - "description": "", - "version": 1, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" - } - } - }, - { - "_id": "f7ca4560-be7c-11e7-8adf-fd0a12531eca", - "_type": "visualization", - "_source": { - "title": "Time Series", - "visState": "{\"title\":\"Time Series\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(*)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", - "uiStateJSON": "{}", - "description": "", - "version": 1, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}" - } - } - }, - { - "_id": "2bf40010-be7d-11e7-8adf-fd0a12531eca", - "_type": "visualization", - "_source": { - "title": "Events by Targets", - "visState": "{\"title\":\"Events by Targets\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"HTML Tags\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxi s-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"target\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"HTML Tags\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"type\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"JS Events\"}}],\"listeners\":{}}", - "uiStateJSON": "{}", - "description": "", - "version": 1, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"index\":\"userale\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" - } - } - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/logstash/5.6.3/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/logstash/5.6.3/Dockerfile b/docker/logstash/5.6.3/Dockerfile new file mode 100644 index 0000000..fb46e5c --- /dev/null +++ b/docker/logstash/5.6.3/Dockerfile @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +FROM docker.elastic.co/logstash/logstash:5.6.3 +MAINTAINER Michelle Beard <msbe...@apache.org> + +RUN mkdir /usr/share/logstash/templates + +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/8e0d4bfc/docker/logstash/5.6.3/config/logstash-userale.conf ---------------------------------------------------------------------- diff --git a/docker/logstash/5.6.3/config/logstash-userale.conf b/docker/logstash/5.6.3/config/logstash-userale.conf new file mode 100644 index 0000000..4af6ee7 --- /dev/null +++ b/docker/logstash/5.6.3/config/logstash-userale.conf @@ -0,0 +1,53 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +input { + http { + codec => "json" + port => 8100 + response_headers => { + "Access-Control-Allow-Origin" => "*" + "Access-Control-Allow-Headers" => "Origin, X-Requested-With, Content-Type, Accept" + } + } +} + +## Add your filters / logstash plugins configuration here +filter { + mutate { + remove_field => [ "message", "@version", "headers"] + } + + grok { + match => [ "useraleVersion", "(?<major_ver>\d+).(?<minor_ver>\d+)(.(?<patch_ver>\d+))?" ] + match => [ "toolVersion", "(?<tool_major_ver>\d+).(?<tool_minor_ver>\d+)(.(?<tool_patch_ver>\d+))?" ] + } +} + +output { + # Output data to Elasticsearch instance + elasticsearch { + hosts => "${ELASTICSEARCH_URL}" + index => "userale" + document_type => "logs" + manage_template => true + template_overwrite => true + template => "/usr/share/logstash/templates/userale.json" + template_name => "userale" + } + + # Debug + # stdout { codec => rubydebug } +} http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/8e0d4bfc/docker/logstash/5.6.3/templates/userale.json ---------------------------------------------------------------------- diff --git a/docker/logstash/5.6.3/templates/userale.json b/docker/logstash/5.6.3/templates/userale.json new file mode 100644 index 0000000..c1bdbb1 --- /dev/null +++ b/docker/logstash/5.6.3/templates/userale.json @@ -0,0 +1,150 @@ +{ + "template": "userale", + "order": 1, + "settings": + { + "number_of_shards": 1, + "number_of_replicas": 0, + "index.refresh_interval": "5s", + "analysis": { + "analyzer": { + "my_analyzer": { + "tokenizer": "my_tokenizer" + } + }, + "tokenizer": { + "my_tokenizer": { + "type": "path_hierarchy" + } + } + } + }, + "mappings": + { + "_default_": + { + "_all": + { + "enabled": false + } + }, + "logs": + { + "dynamic_templates": [ + { + "strings_as_keywords": { + "match_mapping_type": "string", + "mapping": { + "type": "keyword" + } + } + } + ], + "dynamic": "true", + "properties": + { + "userAction": + { + "type": "boolean" + }, + "clientTime": + { + "type": "date", + "format": "strict_date_optional_time||epoch_millis" + }, + "count": + { + "type": "integer" + }, + "targetChange": + { + "type": "boolean" + }, + "typeChange": + { + "type": "boolean" + }, + "details": + { + "properties": + { + "alt": + { + "type": "boolean" + }, + "clicks": + { + "type": "integer" + }, + "ctrl": + { + "type": "boolean" + }, + "meta": + { + "type": "boolean" + }, + "shift": + { + "type": "boolean" + }, + "window": + { + "type": "boolean" + }, + "x": + { + "type": "integer" + }, + "y": + { + "type": "integer" + }, + "z": + { + "type": "integer" + } + } + }, + "location": + { + "properties": + { + "x": + { + "type": "integer" + }, + "y": + { + "type": "integer" + } + } + }, + "major_ver": + { + "type": "integer" + }, + "minor_ver": + { + "type": "integer" + }, + "patch_ver": + { + "type": "integer" + }, + "tool_major_ver": + { + "type": "integer" + }, + "tool_minor_ver": + { + "type": "integer" + }, + "tool_patch_ver": + { + "type": "integer" + } + } + } + } +} \ No newline at end of file
