Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
c3244027
Commit
c3244027
authored
Sep 04, 2024
by
Paul Graydon
Browse files
Options
Browse Files
Download
Plain Diff
software/ors-amarisoft: Improve eNB xlog forwarding
See merge request
nexedi/slapos!1632
parents
86d54d98
18057126
Pipeline
#36561
failed with stage
in 0 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
7 deletions
+33
-7
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+1
-1
software/ors-amarisoft/instance-enb-input-schema.json
software/ors-amarisoft/instance-enb-input-schema.json
+6
-6
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+26
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
c3244027
...
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
...
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
8b9301f26fc4ffbc7eda9c1ac8da1a46
md5sum =
140cce72eb04768abbe87ea4982f36bd
[template-ors-enb]
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb-input-schema.json
View file @
c3244027
...
@@ -198,18 +198,18 @@
...
@@ -198,18 +198,18 @@
"default"
:
0
"default"
:
0
},
},
"xlog_fluentbit_forward_host"
:
{
"xlog_fluentbit_forward_host"
:
{
"title"
:
"
Address to Forward Xlog by Fluenbit
"
,
"title"
:
"
Fluentbit Xlog forwarding address
"
,
"description"
:
"Address of
Remote Fluentd or Fluentbit Server to Forward Xlog
"
,
"description"
:
"Address of
remote Fluentd or Fluentbit server to which Fluentbit should forward Xlog data
"
,
"type"
:
"string"
"type"
:
"string"
},
},
"xlog_fluentbit_forward_port"
:
{
"xlog_fluentbit_forward_port"
:
{
"title"
:
"
Port to Forward Xlog by Fluentbi
t"
,
"title"
:
"
Fluentbit Xlog forwarding por
t"
,
"description"
:
"
Optional Port of Remote Fluentd or Fluentbit Server to Forward Xlog
"
,
"description"
:
"
(Optional) Port of remote Fluentd or Fluentbit server to which Fluentbit should forward Xlog data
"
,
"type"
:
"string"
"type"
:
"string"
},
},
"xlog_fluentbit_forward_shared_key"
:
{
"xlog_fluentbit_forward_shared_key"
:
{
"title"
:
"
Shared Key to Forward Xlog by Fluentbit
"
,
"title"
:
"
Fluentbit Xlog forwarding shared key
"
,
"description"
:
"Secret Key
Shared with Remote Fluentd or Fluentbit Server for Authentication when Forwarding Xlog
"
,
"description"
:
"Secret Key
shared with remote Fluentd or Fluentbit server for authentication when forwarding Xlog data
"
,
"type"
:
"string"
"type"
:
"string"
}
}
}
}
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
c3244027
...
@@ -80,6 +80,7 @@ script = ${:etc}/run
...
@@ -80,6 +80,7 @@ script = ${:etc}/run
service = ${:etc}/service
service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
xlog-fluentbit = ${:var}/xlog-fluentbit
{% if slapparameter_dict.get("enb_config_link", None) %}
{% if slapparameter_dict.get("enb_config_link", None) %}
[enb-config-dl]
[enb-config-dl]
...
@@ -149,6 +150,26 @@ command-line = ${xamari-xlog-script:output}
...
@@ -149,6 +150,26 @@ command-line = ${xamari-xlog-script:output}
hash-files = ${:command-line}
hash-files = ${:command-line}
{% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
{% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
[xlog-fluentbit-tag]
recipe = slapos.recipe.build
computer = ${slap-connection:computer-id}
enb-id = {{ slapparameter_dict.get("enb_id", "") }}
gnb-id = {{ slapparameter_dict.get("gnb_id", "") }}
init =
import socket
options['hostname'] = socket.gethostname()
radio_id = ''
if options['enb-id']:
radio_id = 'e%s' % options['enb-id']
elif options['gnb-id']:
radio_id = 'g%s' % options['gnb-id']
options['radio-id'] = radio_id
xlog_fluentbit_tag = '_'.join(options[x] for x in ('hostname', 'computer', 'radio-id') if options[x])
options['xlog-fluentbit-tag'] = xlog_fluentbit_tag
[xlog-fluentbit-config]
[xlog-fluentbit-config]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
output = ${directory:etc}/${:_buildout_section_name_}.cfg
output = ${directory:etc}/${:_buildout_section_name_}.cfg
...
@@ -163,7 +184,9 @@ inline =
...
@@ -163,7 +184,9 @@ inline =
[INPUT]
[INPUT]
name tail
name tail
path ${:logfile}
path ${:logfile}
tag ${xlog-fluentbit-tag:xlog-fluentbit-tag}
Read_from_Head True
Read_from_Head True
db ${directory:xlog-fluentbit}/tail-state
[OUTPUT]
[OUTPUT]
name forward
name forward
match *
match *
...
@@ -240,6 +263,9 @@ ru-list = {{ dumps(rulib.iru_dict.keys() | sort) }}
...
@@ -240,6 +263,9 @@ ru-list = {{ dumps(rulib.iru_dict.keys() | sort) }}
cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
peer-list = {{ dumps(ipeer_dict.keys() | sort) }}
peer-list = {{ dumps(ipeer_dict.keys() | sort) }}
peer-cell-list = {{ dumps(ipeercell_dict.keys() | sort) }}
peer-cell-list = {{ dumps(ipeercell_dict.keys() | sort) }}
{%- if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
fluentbit-tag = ${xlog-fluentbit-tag:xlog-fluentbit-tag}
{%- endif %}
[monitor-instance-parameter]
[monitor-instance-parameter]
...
...
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