Allow users to specify --pipeline.id from the CLI

This will allow users to override the pipeline id from the default, "main", to something else while running pipelines via either the -e or -f options.

Fixes elastic#8868

Author: ycombinator

config/logstash.yml

@@ -29,6 +29,10 @@
 #
 # ------------ Pipeline Settings --------------
 #
+# The ID of the pipeline.
+#
+# pipeline.id: main
+#
 # Set the number of workers that will, in parallel, execute the filters+outputs
 # stage of the pipeline.
 #

docs/static/running-logstash-command-line.asciidoc

@@ -84,6 +84,9 @@ With this command, Logstash concatenates three config files, `/tmp/one`, `/tmp/t
   that setting will be used.  The `-M` flag is only used in conjunction with the `--modules`
   flag.  It will be ignored if the `--modules` flag is absent.
 
+*`--pipeline.id ID`*::
+  Sets the ID of pipeline. The default is `main`.
+
 *`-w, --pipeline.workers COUNT`*::
   Sets the number of pipeline workers to run. This option sets the number of workers that will,
   in parallel, execute the filter and output stages of the pipeline. If you find that events are

docs/static/settings-file.asciidoc

@@ -77,6 +77,10 @@ The `logstash.yml` file includes the following settings:
 | The directory that Logstash and its plugins use for any persistent needs.
 |`LOGSTASH_HOME/data`
 
+| `pipeline.id`
+| The ID of the pipeline.
+| `main`
+
 | `pipeline.workers`
 | The number of workers that will, in parallel, execute the filter and output stages of the pipeline.
   If you find that events are backing up, or that the

logstash-core/lib/logstash/runner.rb

@@ -85,6 +85,11 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "cloud.auth"
 
   # Pipeline settings
+  option ["--pipeline.id"], "ID",
+    I18n.t("logstash.runner.flag.pipeline-id"),
+    :attribute_name => "pipeline.id",
+    :default => LogStash::SETTINGS.get_default("pipeline.id")
+
   option ["-w", "--pipeline.workers"], "COUNT",
     I18n.t("logstash.runner.flag.pipeline-workers"),
     :attribute_name => "pipeline.workers",

logstash-core/locales/en.yml

@@ -262,6 +262,8 @@ en:
           Check configuration for valid syntax and then exit.
         http_host: Web API binding host
         http_port: Web API http port
+        pipeline-id: |+
+          Sets the ID of the pipeline.
         pipeline-workers: |+
           Sets the number of pipeline workers to run.
         experimental-java-execution: |+