Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
b5c45134
Commit
b5c45134
authored
Apr 25, 2024
by
Paul Graydon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/fluentd: Finalize instance parameter form
See merge request
nexedi/slapos!1572
parent
eb1b1a41
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
7 deletions
+21
-7
software/fluentd/buildout.hash.cfg
software/fluentd/buildout.hash.cfg
+1
-1
software/fluentd/instance-input-schema.json
software/fluentd/instance-input-schema.json
+5
-4
software/fluentd/instance.cfg
software/fluentd/instance.cfg
+1
-1
software/fluentd/software.cfg.json
software/fluentd/software.cfg.json
+13
-0
software/fluentd/test/test.py
software/fluentd/test/test.py
+1
-1
No files found.
software/fluentd/buildout.hash.cfg
View file @
b5c45134
...
...
@@ -14,7 +14,7 @@
# not need these here).
[instance-profile]
filename = instance.cfg
md5sum =
82c476f22e6b55b674640abef959c3c2
md5sum =
1fe38a024766347454ad7a3d9fb52d01
[template-fluentd]
filename = instance-fluentd.cfg
...
...
software/fluentd/instance-input-schema.json
View file @
b5c45134
...
...
@@ -4,10 +4,11 @@
"description"
:
"Parameters to instantiate Fluentd"
,
"additionalProperties"
:
false
,
"properties"
:
{
"conf_text"
:
{
"description"
:
"Fluentd configuration. You can write it entirely by yourself. See fluentd-agent.conf.jinja2.in"
,
"default"
:
""
,
"type"
:
"string"
"conf-text"
:
{
"title"
:
"Configuration"
,
"description"
:
"Fluentd configuration. See: https://docs.fluentd.org/configuration"
,
"type"
:
"string"
,
"textarea"
:
true
}
}
}
software/fluentd/instance.cfg
View file @
b5c45134
...
...
@@ -42,7 +42,7 @@ recipe = slapos.recipe.build
slapparameter-dict = $${slap-configuration:configuration}
init =
import re
options['text'] = options['slapparameter-dict'].get('conf
_
text') or ' '
options['text'] = options['slapparameter-dict'].get('conf
-
text') or ' '
options['port-list'] = re.findall(r'<source>.*port (\d+).*<\/source>', options['text'], re.DOTALL)
[fluentd-agent-conf]
...
...
software/fluentd/software.cfg.json
0 → 100644
View file @
b5c45134
{
"name"
:
"Fluentd"
,
"description"
:
"Fluentd"
,
"serialisation"
:
"xml"
,
"software-type"
:
{
"default"
:
{
"title"
:
"Default"
,
"description"
:
"Fluentd"
,
"request"
:
"instance-input-schema.json"
,
"index"
:
0
}
}
}
software/fluentd/test/test.py
View file @
b5c45134
...
...
@@ -88,7 +88,7 @@ class WendelinTutorialTestCase(FluentdTestCase):
@
classmethod
def
getInstanceParameterDict
(
cls
):
return
{
'conf
_
text'
:
cls
.
_conf
,}
return
{
'conf
-
text'
:
cls
.
_conf
,}
@
classmethod
def
measureDict
(
cls
):
...
...
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