Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
docs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
docs
Commits
fdaa8e0d
Commit
fdaa8e0d
authored
8 years ago
by
Brian Brazil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
We allow millisecond durations.
parent
6eda3ca0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
configuration.md
content/docs/alerting/configuration.md
+1
-1
configuration.md
content/docs/operating/configuration.md
+1
-1
No files found.
content/docs/alerting/configuration.md
View file @
fdaa8e0d
...
@@ -36,7 +36,7 @@ value is set to the specified default.
...
@@ -36,7 +36,7 @@ value is set to the specified default.
Generic placeholders are defined as follows:
Generic placeholders are defined as follows:
*
`<duration>`
: a duration matching the regular expression
`[0-9]+
[smhdwy]
`
*
`<duration>`
: a duration matching the regular expression
`[0-9]+
(ms|[smhdwy])
`
*
`<labelname>`
: a string matching the regular expression
`[a-zA-Z_][a-zA-Z0-9_]*`
*
`<labelname>`
: a string matching the regular expression
`[a-zA-Z_][a-zA-Z0-9_]*`
*
`<labelvalue>`
: a string of unicode characters
*
`<labelvalue>`
: a string of unicode characters
*
`<filepath>`
: a valid path in the current working directory
*
`<filepath>`
: a valid path in the current working directory
...
...
This diff is collapsed.
Click to expand it.
content/docs/operating/configuration.md
View file @
fdaa8e0d
...
@@ -32,7 +32,7 @@ value is set to the specified default.
...
@@ -32,7 +32,7 @@ value is set to the specified default.
Generic placeholders are defined as follows:
Generic placeholders are defined as follows:
*
`<duration>`
: a duration matching the regular expression
`[0-9]+
[smhdwy]
`
*
`<duration>`
: a duration matching the regular expression
`[0-9]+
(ms|[smhdwy])
`
*
`<labelname>`
: a string matching the regular expression
`[a-zA-Z_][a-zA-Z0-9_]*`
*
`<labelname>`
: a string matching the regular expression
`[a-zA-Z_][a-zA-Z0-9_]*`
*
`<labelvalue>`
: a string of unicode characters
*
`<labelvalue>`
: a string of unicode characters
*
`<filename>`
: a valid path in the current working directory
*
`<filename>`
: a valid path in the current working directory
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment