Updated docker repos to point to official elastic stack repos. Added demo kibana dashboard. Removed xpack.
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/df5e92b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/df5e92b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/df5e92b1 Branch: refs/heads/asf-site Commit: df5e92b1428c9397e927f4b9d996159aaa061f73 Parents: 9068fc1 Author: msb3399 <mbe...@draper.com> Authored: Thu May 11 16:47:18 2017 -0400 Committer: msb3399 <mbe...@draper.com> Committed: Thu May 11 16:47:18 2017 -0400 ---------------------------------------------------------------------- docker/docker-compose.yml | 9 ++++++--- docker/es/elasticsearch.yml | 5 +++-- docker/kibana/dashboard.json | 26 ++++++++++++++++++++++++++ docker/logstash/Dockerfile | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/df5e92b1/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6570771..d0d0357 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -37,7 +37,7 @@ services: # ELK Stack elasticsearch: - image: elasticsearch:latest + image: docker.elastic.co/elasticsearch/elasticsearch:5.4.0 container_name: senssoft-elastic ports: - 9200:9200 @@ -51,13 +51,15 @@ services: # Kibana kibana: - image: kibana:latest + image: docker.elastic.co/kibana/kibana:5.4.0 container_name: senssoft-kibana ports: - 5601:5601 depends_on: - "elasticsearch" - "startup" + environment: + XPACK_SECURITY_ENABLED: "false" # Logstash userale-forwarder: @@ -73,6 +75,7 @@ services: - "elasticsearch" environment: LS_HEAP_SIZE: "2048m" + XPACK_MONITORING_ENABLED: "false" distill: build: ./distill @@ -85,7 +88,7 @@ services: - elasticsearch db: - container_name: tap-db + container_name: tap-db build: ./db ports: - "5432:5432" http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/df5e92b1/docker/es/elasticsearch.yml ---------------------------------------------------------------------- diff --git a/docker/es/elasticsearch.yml b/docker/es/elasticsearch.yml index af0e14e..5e0c014 100644 --- a/docker/es/elasticsearch.yml +++ b/docker/es/elasticsearch.yml @@ -109,5 +109,6 @@ discovery.zen.minimum_master_nodes: 1 # # action.destructive_requires_name: true -http.cors.enabled : true -http.cors.allow-origin : "*" +http.cors.enabled: true +http.cors.allow-origin: "*" +xpack.security.enabled: false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/df5e92b1/docker/kibana/dashboard.json ---------------------------------------------------------------------- diff --git a/docker/kibana/dashboard.json b/docker/kibana/dashboard.json new file mode 100644 index 0000000..d1922d9 --- /dev/null +++ b/docker/kibana/dashboard.json @@ -0,0 +1,26 @@ +[ + { + "_id": "6e6b6380-3673-11e7-b2f7-0b10e220d9ac", + "_type": "dashboard", + "_source": { + "title": "Apache UserALE Monitor", + "hits": 0, + "description": "Example Kibana Dashboard", + "panelsJSON": "[\n {\n \"size_x\": 9,\n \"size_y\": 4,\n \"panelIndex\": 1,\n \"type\": \"visualization\",\n \"id\": \"49fa7860-3673-11e7-b2f7-0b10e220d9ac\",\n \"col\": 4,\n \"row\": 4\n },\n {\n \"size_x\": 3,\n \"size_y\": 3,\n \"panelIndex\": 2,\n \"type\": \"visualization\",\n \"id\": \"6e55ca90-3671-11e7-b2f7-0b10e220d9ac\",\n \"col\": 1,\n \"row\": 4\n },\n {\n \"size_x\": 5,\n \"size_y\": 3,\n \"panelIndex\": 3,\n \"type\": \"visualization\",\n \"id\": \"ef62c4e0-3684-11e7-9c77-0135be018b90\",\n \"col\": 1,\n \"row\": 1\n },\n {\n \"size_x\": 7,\n \"size_y\": 3,\n \"panelIndex\": 4,\n \"type\": \"visualization\",\n \"id\": \"7ee8abd0-3684-11e7-9c77-0135be018b90\",\n \"col\": 6,\n \"row\": 1\n }\n]", + "optionsJSON": "{\n \"darkTheme\": false\n}", + "uiStateJSON": "{}", + "version": 1, + "timeRestore": true, + "timeTo": "now", + "timeFrom": "now-15m", + "refreshInterval": { + "display": "Off", + "pause": false, + "value": 0 + }, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\n \"filter\": [\n {\n \"query\": {\n \"query_string\": {\n \"query\": \"*\",\n \"analyze_wildcard\": true\n }\n }\n }\n ],\n \"highlightAll\": true,\n \"version\": true\n}" + } + } + } +] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/df5e92b1/docker/logstash/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/logstash/Dockerfile b/docker/logstash/Dockerfile index d676e62..d5b8109 100644 --- a/docker/logstash/Dockerfile +++ b/docker/logstash/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM logstash:5 +FROM docker.elastic.co/logstash/logstash:5.4.0 MAINTAINER Michelle Beard <msbe...@apache.org> # Get GeoIP DB
