Skip to content

Commit e8921fa

Browse files
authored
Merge pull request #2601 from tsg/fix_import_dashbaords_win
Fix import_dashboards script name on Windows
2 parents ca14aeb + a8e2d79 commit e8921fa

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

dev-tools/packer/platforms/windows/run.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212

1313
mkdir /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}
1414
cp -a homedir/. /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
15-
install -D -m 755 import_dashboards-windows-{{.arch}} /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/scripts/import_dashboards
15+
install -D -m 755 import_dashboards-windows-{{.arch}} /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/scripts/import_dashboards.exe
1616
cp {{.beat_name}}-windows-{{.arch}}.exe /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/{{.beat_name}}.exe
1717
unix2dos {{.beat_name}}-win.yml
1818
cp {{.beat_name}}-win.yml /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/{{.beat_name}}.yml

libbeat/docs/dashboards.asciidoc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,29 @@ Open a PowerShell prompt as an Administrator (right-click the PowerShell icon
7676
and select *Run As Administrator*). If you are running Windows XP, you may need
7777
to download and install PowerShell.
7878

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

8181
["source","sh",subs="attributes,callouts"]
8282
----------------------------------------------------------------------
83-
PS > scripts\import_dashboards
83+
PS > scripts\import_dashboards.exe
8484
----------------------------------------------------------------------
8585

86-
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:
87-
86+
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:
8887

8988
["source","sh",subs="attributes,callouts"]
9089
----------------------------------------------------------------------
91-
PS > scripts\import_dashboards -es http://192.168.33.60:9200
90+
PS > scripts\import_dashboards.exe -es http://192.168.33.60:9200
9291
----------------------------------------------------------------------
9392

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

9796

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

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

105104
[[view-kibana-dashboards]]

0 commit comments

Comments
 (0)