Skip to content

Commit 9d3d8e7

Browse files
[8.19] (backport #18216) [Docs] Add hyphen to the pipeline ID restriction description. (#18221)
* [Docs] Add hyphen to the pipeline ID restriction description. (#18216) * [Docs] Add hyphen to the pipeline ID restriction description. * Apply suggestions from code review Apply Oxford comma. Co-authored-by: Rob Bavey <[email protected]> --------- Co-authored-by: Rob Bavey <[email protected]> (cherry picked from commit 46bf75e) # Conflicts: # docs/reference/configuring-centralized-pipelines.md * Adjust to 8.19 branch. --------- Co-authored-by: Mashhur <[email protected]> Co-authored-by: Mashhur <[email protected]>
1 parent 58f3f76 commit 9d3d8e7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/static/settings/configuration-wildcard-pipeline-id.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
++++
55
<titleabbrev>Wildcard support in pipeline ID</titleabbrev>
66
++++
7-
Pipeline IDs must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers.
7+
Pipeline IDs must begin with a letter or underscore and contain only letters, underscores, dashes, hyphens and numbers.
88
You can use `*` in `xpack.management.pipeline.id` to match any number of letters, underscores, dashes, and numbers.
99

1010
[source,shell]

x-pack/lib/config_management/bootstrap_check.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module ConfigManagement
1414
class BootstrapCheck
1515
include LogStash::Util::Loggable
1616

17-
# pipeline ID must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers
17+
# pipeline ID must begin with a letter or underscore and contain only letters, underscores, dashes, hyphens, and numbers
1818
# wildcard character `*` is also acceptable and follows globbing rules
1919
PIPELINE_ID_PATTERN = %r{\A[a-z_*][a-z_\-0-9*]*\Z}i
2020

@@ -47,7 +47,7 @@ def self.check(settings)
4747

4848
invalid_patterns = pipeline_ids.reject { |entry| PIPELINE_ID_PATTERN =~ entry }
4949
if invalid_patterns.any?
50-
raise LogStash::BootstrapCheckError, "Pipeline id in `xpack.management.pipeline.id` must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers. The asterisk wildcard `*` can also be used. Invalid ids: #{invalid_patterns.join(', ')}"
50+
raise LogStash::BootstrapCheckError, "Pipeline id in `xpack.management.pipeline.id` must begin with a letter or underscore and contain only letters, underscores, dashes, hyphens, and numbers. The asterisk wildcard `*` can also be used. Invalid ids: #{invalid_patterns.join(', ')}"
5151
end
5252

5353
duplicate_ids = find_duplicate_ids(pipeline_ids)

0 commit comments

Comments
 (0)