Skip to content

Commit 758b4a8

Browse files
fix: port 5000 already being used (#111)
Fixes #110
1 parent 486ca64 commit 758b4a8

File tree

21 files changed

+548
-116
lines changed

21 files changed

+548
-116
lines changed

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ If this is the first time the stack is started, you'll have to create a Logstash
4141
```posh
4242
PS> $Headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
4343
PS> $Headers.Add("Content-Type", "application/json")
44-
PS> $Headers.Add("kbn-version", "7.10.2")
44+
PS> $Headers.Add("kbn-version", "7.17.0")
45+
PS> $Auth = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("elastic:changeme"))
46+
PS> $Headers.Add("Authorization", "Basic {0}" -f $Auth)
4547
PS> Invoke-RestMethod "http://localhost:5601/api/saved_objects/index-pattern" `
4648
-Method Post `
4749
-Headers $Headers `
@@ -79,7 +81,8 @@ If this is the first time the stack is started, you'll have to create a Logstash
7981
```bash
8082
$ curl -XPOST -D- 'http://localhost:5601/api/saved_objects/index-pattern' \
8183
-H 'Content-Type: application/json' \
82-
-H 'kbn-version: 7.10.2' \
84+
-H 'kbn-version: 7.17.0' \
85+
-u elastic:changeme \
8386
-d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}'
8487
```
8588

@@ -96,7 +99,7 @@ If you decide to run the application outside of Docker in your terminal, don't f
9699

97100
### Using Kibana to render the log events
98101

99-
Access the Kibana web UI by hitting [http://localhost:5601](http://localhost:5601) with a web browser.
102+
Access the Kibana web UI by hitting [http://localhost:5601](http://localhost:5601) with a web browser, and when prompted enter username `elastic` and password `changeme`.
100103

101104
## Credit
102105

build/update-readme.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -euo pipefail
55
# provided in pull requests
66
if [ "$APPVEYOR_PULL_REQUEST_TITLE" != "" ]
77
then
8+
echo "Skip updating README in pull requests"
89
exit
910
fi
1011

@@ -21,7 +22,7 @@ git config user.email mattias@kindb.org
2122
git checkout $APPVEYOR_REPO_BRANCH
2223

2324
# Update Elastic Stack version in README
24-
DOCKERFILE_ELASTIC_VERSION=`grep -oP '\d+\.\d+\.\d+' ./elastic-stack/elasticsearch/Dockerfile`
25+
DOCKERFILE_ELASTIC_VERSION=`grep -oP '\d+\.\d+\.\d+' ./elastic-stack/.env`
2526
sed -i -E "s/\"kbn-version\", \"[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\"/\"kbn-version\", \"${DOCKERFILE_ELASTIC_VERSION}\"/g" ./README.md
2627
sed -i -E "s/'kbn-version: [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/\'kbn-version: ${DOCKERFILE_ELASTIC_VERSION}\'/g" ./README.md
2728
git add ./README.md

elastic-stack/.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignore OS artifacts
2+
**/.DS_Store

elastic-stack/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ELK_VERSION=7.17.0

elastic-stack/.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Declare files that will always have LF line endings on checkout.
2+
*.sh text eol=lf

elastic-stack/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Anthony Lapenna
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)