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
bffdf855
Commit
bffdf855
authored
Jul 18, 2016
by
Fabian Reinartz
Committed by
GitHub
Jul 18, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #486 from brian-brazil/subsecond
We allow millisecond durations.
parents
e446debd
fdaa8e0d
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 @
bffdf855
...
...
@@ -36,7 +36,7 @@ value is set to the specified default.
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_]*`
*
`<labelvalue>`
: a string of unicode characters
*
`<filepath>`
: a valid path in the current working directory
...
...
content/docs/operating/configuration.md
View file @
bffdf855
...
...
@@ -32,7 +32,7 @@ value is set to the specified default.
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_]*`
*
`<labelvalue>`
: a string of unicode characters
*
`<filename>`
: a valid path in the current working directory
...
...
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