Skip to content

Commit 71f86a9

Browse files
mergify[bot]mashhursrobbavey
authored
[Docs] Add hyphen to the pipeline ID restriction description. (#18216) (#18222)
* [Docs] Add hyphen to the pipeline ID restriction description. * Apply suggestions from code review Apply Oxford comma. --------- (cherry picked from commit 46bf75e) Co-authored-by: Mashhur <[email protected]> Co-authored-by: Rob Bavey <[email protected]>
1 parent eaf2f34 commit 71f86a9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/reference/configuring-centralized-pipelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ This setting can be used only if `xpack.management.elasticsearch.ssl.certificate
144144
## Wildcard support in pipeline ID [wildcard-in-pipeline-id]
145145

146146

147-
Pipeline IDs must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers. You can use `*` in `xpack.management.pipeline.id` to match any number of letters, underscores, dashes, and numbers.
147+
Pipeline IDs must begin with a letter or underscore and contain only letters, underscores, dashes, hyphens and numbers. You can use `*` in `xpack.management.pipeline.id` to match any number of letters, underscores, dashes, hyphens, and numbers.
148148

149149
```shell
150150
xpack.management.pipeline.id: ["*logs", "*apache*", "tomcat_log"]

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

@@ -43,7 +43,7 @@ def self.check(settings)
4343

4444
invalid_patterns = pipeline_ids.reject { |entry| PIPELINE_ID_PATTERN =~ entry }
4545
if invalid_patterns.any?
46-
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(', ')}"
46+
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(', ')}"
4747
end
4848

4949
duplicate_ids = find_duplicate_ids(pipeline_ids)

0 commit comments

Comments
 (0)