Skip to content

Commit

Permalink
Merge pull request #2601 from tsg/fix_import_dashbaords_win
Browse files Browse the repository at this point in the history
Fix import_dashboards script name on Windows
  • Loading branch information
monicasarbu authored Sep 20, 2016
2 parents ca14aeb + a8e2d79 commit e8921fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dev-tools/packer/platforms/windows/run.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi

mkdir /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}
cp -a homedir/. /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
install -D -m 755 import_dashboards-windows-{{.arch}} /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/scripts/import_dashboards
install -D -m 755 import_dashboards-windows-{{.arch}} /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/scripts/import_dashboards.exe
cp {{.beat_name}}-windows-{{.arch}}.exe /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/{{.beat_name}}.exe
unix2dos {{.beat_name}}-win.yml
cp {{.beat_name}}-win.yml /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/{{.beat_name}}.yml
Expand Down
13 changes: 6 additions & 7 deletions libbeat/docs/dashboards.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,29 @@ Open a PowerShell prompt as an Administrator (right-click the PowerShell icon
and select *Run As Administrator*). If you are running Windows XP, you may need
to download and install PowerShell.

From the directory where you installed {beatname_uc}, run the `import_dashboards` script:
From the directory where you installed {beatname_uc}, run the `import_dashboards.exe` script:

["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
PS > scripts\import_dashboards
PS > scripts\import_dashboards.exe
----------------------------------------------------------------------

By default, the script assumes that you are running Elasticsearch on `127.0.0.1:9200`. Use the `-es` option to specify a different location. For example:

By default, the script assumes that you are running Elasticsearch on `127.0.0.1:9200`. Use the `-es` option to specify a different location. For example:

["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
PS > scripts\import_dashboards -es http://192.168.33.60:9200
PS > scripts\import_dashboards.exe -es http://192.168.33.60:9200
----------------------------------------------------------------------

NOTE: If script execution is disabled on your system, you need to set the execution policy for the current session to
allow the script to run. For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File scripts\import_dashboards -es http://192.168.33.60:9200`.
allow the script to run. For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File scripts\import_dashboards.exe -es http://192.168.33.60:9200`.


Use the `-user` option to specify the username and password to use for Elasticsearch authentication:

["source","sh",subs="attributes,callouts"]
-----------------------------------------------------------------------
PS > scripts\import_dashboards -es https://xyz.found.io -user user -pass password
PS > scripts\import_dashboards.exe -es https://xyz.found.io -user user -pass password
-----------------------------------------------------------------------

[[view-kibana-dashboards]]
Expand Down

0 comments on commit e8921fa

Please sign in to comment.