Commit abe20820 authored by Joanne Hugé's avatar Joanne Hugé

Update Release Candidate

parents ab94846e c6616710
...@@ -5,5 +5,5 @@ parts = ...@@ -5,5 +5,5 @@ parts =
[zlib] [zlib]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://www.zlib.net/zlib-1.2.12.tar.gz url = https://zlib.net/fossils/zlib-1.2.12.tar.gz
md5sum = 5fc414a9726be31427b440b434d05f78 md5sum = 5fc414a9726be31427b440b434d05f78
# Fluent-bit
## When instantiating Fluent-bit you can use the following example config:
```
release="https://lab.nexedi.com/nexedi/slapos/raw/master/software/fluent-bit/software.cfg"
supply(release, "COMP-****")
partition_parameter_kw = {
"service": {
"flush": 5,
"daemon": "off",
"log_level": "debug"
},
"input": {
"name": "mqtt",
"tag": "data",
"port": 1883
},
"output": {
"name": "forward",
"match": "*",
"host": "127.0.0.1",
"port": 24224
}
}
filter_kw = {"computer_guid": "COMP-****"}
request(software_release = release, partition_reference='****', partition_parameter_kw=partition_parameter_kw, filter_kw = filter_kw)
```
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 6a32b81db4ea9f2f63b5a92e8a134d58 md5sum = b2845159dd53f942f32c4d4348934ce2
[buildout] [buildout]
parts = parts =
directory
fluent-bit-config-file
fluent-bit-service fluent-bit-service
eggs-directory = {{ buildout['eggs-directory'] }} eggs-directory = {{ buildout["eggs-directory"] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }} develop-eggs-directory = {{ buildout["develop-eggs-directory"] }}
offline = true offline = true
[instance-parameter]
recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
home = ${buildout:directory} home = ${buildout:directory}
...@@ -17,8 +27,29 @@ promise = ${:etc}/promise/ ...@@ -17,8 +27,29 @@ promise = ${:etc}/promise/
log = ${:var}/log log = ${:var}/log
bin = ${:home}/bin bin = ${:home}/bin
[fluent-bit-config-file]
recipe = slapos.recipe.build
location = ${directory:etc}/${:_buildout_section_name_}.cfg
ip = ${instance-parameter:ipv4-random}
install =
config = open(self.options["location"], "w")
ip = self.options["ip"]
input = ${instance-parameter:configuration.input}
output = ${instance-parameter:configuration.output}
config.write(f"[INPUT]\n")
for key in input:
config.write(f" {str(key).capitalize()} {input[key]}\n")
config.write(f" Listen {ip}\n")
config.write("\n")
config.write(f"[OUTPUT]\n")
for key in output:
config.write(f" {str(key).capitalize()} {output[key]}\n")
[fluent-bit-service] [fluent-bit-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ fluent_bit_location }}/bin/fluent-bit -i cpu -o stdout command-line = {{ fluent_bit_location }}/bin/fluent-bit -c ${fluent-bit-config-file:location}
wrapper-path = ${directory:service}/fluentbit-service wrapper-path = ${directory:service}/fluentbit-service
output = $${:wrapper-path} output = $${:wrapper-path}
...@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50 ...@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50
[template-lte-enb-epc] [template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg _update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum = 7f8f92ff218c40c843a102953c7695f8 md5sum = 80a239305950ed76b5279647f422478f
[template-lte-enb] [template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
...@@ -28,11 +28,11 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82 ...@@ -28,11 +28,11 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum = d83b5569e258770774cb6028d93a4a70 md5sum = dadb76e747faeea18c387109c3319dfd
[template-lte-epc] [template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg _update_hash_filename_ = instance-epc.jinja2.cfg
md5sum = d310dee0de054e10d77f036199297b3f md5sum = 9ffc54bf10757403c4b1809d1102ea52
[template-lte-gnb] [template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
......
...@@ -48,7 +48,7 @@ promise = ${:etc}/promise ...@@ -48,7 +48,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -67,7 +67,7 @@ software-type = mme ...@@ -67,7 +67,7 @@ software-type = mme
config-name = mme config-name = mme
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
config-slave-list = {{ dumps(slave_instance_list) }} config-slave-list = {{ dumps(slave_instance_list) }}
return = monitor-base-url epc-ipv6 return = monitor-base-url epc-ipv6
......
...@@ -47,7 +47,7 @@ promise = ${:etc}/promise ...@@ -47,7 +47,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -67,7 +67,7 @@ software-type = mme ...@@ -67,7 +67,7 @@ software-type = mme
config-name = mme config-name = mme
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
config-slave-list = {{ dumps(slave_instance_list) }} config-slave-list = {{ dumps(slave_instance_list) }}
[monitor-base-url-dict] [monitor-base-url-dict]
......
...@@ -48,7 +48,7 @@ promise = ${:etc}/promise ...@@ -48,7 +48,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -78,7 +78,7 @@ software-type = gnb ...@@ -78,7 +78,7 @@ software-type = gnb
config-name = gnb config-name = gnb
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
return = monitor-base-url return = monitor-base-url
[monitor-base-url-dict] [monitor-base-url-dict]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment