Skip to content

Commit

Permalink
Add modules.d layout to getting started and fix Windows command examp…
Browse files Browse the repository at this point in the history
…les (#6941)

Fixes #5512 and #6196

I've also changed the metricbeat getting started to use asciidoc attributes to resolve "metricbeat" and "Metricbeat". My goal is to convert all the topics over to using attributes, but I don't want to open a big PR for those changes because it's easier for me to check for mistakes if I make the changes in smaller batches.
  • Loading branch information
dedemorton authored and ruflin committed May 8, 2018
1 parent 0be0260 commit a57a0cb
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 125 deletions.
6 changes: 3 additions & 3 deletions libbeat/docs/dashboards.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ command (as described here) or
+{beatname_lc}.yml+ config file.

This requires a Kibana endpoint configuration. If you didn't already configure
a Kibana endpoint, see <<{beatname_lc}-configuration,configured {beatname_uc}>>
a Kibana endpoint, see <<{beatname_lc}-configuration,configure {beatname_uc}>>.

Make sure Kibana is running before you perform this step. If you are accessing a
secured Kibana instance, make sure you've configured credentials as described in
Expand Down Expand Up @@ -72,7 +72,7 @@ and select *Run As Administrator*).
From the PowerShell prompt, change to the directory where you installed {beatname_uc},
and run:

["source","sh",subs="attributes,callouts"]
["source","sh",subs="attributes"]
----------------------------------------------------------------------
PS > {beatname_lc} setup --dashboards
PS > .{backslash}{beatname_lc}.exe setup --dashboards
----------------------------------------------------------------------
2 changes: 1 addition & 1 deletion libbeat/docs/shared-configuring.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ all non-deprecated options.

endif::[]

See the
TIP: See the
{libbeat}/config-file-format.html[Config File Format] section of the
_Beats Platform Reference_ for more about the structure of the config file.
10 changes: 5 additions & 5 deletions libbeat/docs/shared-template-load.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ and select *Run As Administrator*).
From the PowerShell prompt, change to the directory where you installed {beatname_uc},
and run:

["source","sh",subs="attributes,callouts"]
["source","sh",subs="attributes"]
----------------------------------------------------------------------
PS > .{backslash}{beatname_lc} setup --template{disable_logstash} -E 'output.elasticsearch.hosts=["localhost:9200"]'
PS > .{backslash}{beatname_lc}.exe setup --template{disable_logstash} -E 'output.elasticsearch.hosts=["localhost:9200"]'
----------------------------------------------------------------------


Expand Down Expand Up @@ -238,12 +238,12 @@ ifdef::allplatforms[]
./{beatname_lc} export template > {beatname_lc}.template.json
----
+
*win*:
*win:*
+
endif::allplatforms[]
["source","sh",subs="attributes"]
----
PS> .{backslash}{beatname_lc}.exe export template --es.version {stack-version} | Out-File -Encoding UTF8 {beatname_lc}.template.json
PS > .{backslash}{beatname_lc}.exe export template --es.version {stack-version} | Out-File -Encoding UTF8 {beatname_lc}.template.json
----

. Install the template:
Expand All @@ -255,7 +255,7 @@ PS> .{backslash}{beatname_lc}.exe export template --es.version {stack-version} |
curl -XPUT -H 'Content-Type: application/json' http://localhost:9200/_template/{beatname_lc}-{stack-version} -d@{beatname_lc}.template.json
----
+
*win*:
*win:*
+
["source","sh",subs="attributes"]
----
Expand Down
Loading

0 comments on commit a57a0cb

Please sign in to comment.