Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Otel branch #94

Merged
merged 3 commits into from
Jan 18, 2023
Merged

Otel branch #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7dfe10
Extend rescue partition
stlachev Jan 18, 2023
ed0d3f5
Tunning of containers ant otelcol first commit
stlachev Jan 18, 2023
3312f48
Removed env ALLOWED_CLOUD_MESSAGE_TYPES_LIST
stlachev Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/core/cloudconnector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@
"LOG_LEVEL=INFO",
"CA_CERT_PATH=/app/iothub.crt",
"MESSAGE_MAPPER_CONFIG=/app/message-mapper-config.json",
"ALLOWED_CLOUD_MESSAGE_TYPES_LIST='vss.setPosition,updateme,subscribeOnceCommand,vss.set'",
"ALLOWED_LOCAL_TOPICS_LIST='cloudConnector/#'"
"ALLOWED_LOCAL_TOPICS_LIST=cloudConnector/#"
],
"cmd": []
},
Expand Down
2 changes: 1 addition & 1 deletion meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/core/sua.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "",
"name": "sua",
"image": {
"name": "ghcr.io/eclipse-leda/leda-contrib-self-update-agent/self-update-agent:build-12",
"name": "ghcr.io/eclipse-leda/leda-contrib-self-update-agent/self-update-agent:build-20",
"decrypt_config": null
},
"host_name": "",
Expand Down
107 changes: 107 additions & 0 deletions ...-leda-components/recipes-sdv/eclipse-leda/kanto-containers/example/otelcol-sdv-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"id": "",
"name": "otelcol-sdv-agent",
"image": {
"name": "ghcr.io/softwaredefinedvehicle/sdv-edge-otel/otelcol-sdv-ext:v0.0.1",
"decrypt_config": null
},
"host_name": "",
"domain_name": "",
"resolv_conf_path": "",
"hosts_path": "",
"hostname_path": "",
"mounts": [
{
"source": "/",
"destination": "/hostfs",
"propagation_mode": "rprivate"
},
{
"source": "/var/lib/container-management/containers",
"destination": "/var/lib/docker/containers",
"propagation_mode": "rprivate"
},
{
"source": "/run/log/journal",
"destination": "/run/log/journal",
"propagation_mode": "rprivate"
}
],
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
"retry_timeout": 0,
"type": "unless-stopped"
},
"runtime": "io.containerd.runc.v2",
"extra_hosts": [
"mosquitto:host_ip"
],
"port_mappings": [
{
"protocol": "tcp",
"container_port": 9411,
"host_ip": "localhost",
"host_port": 4317,
"host_port_end": 4317
}
],
"log_config": {
"driver_config": {
"type": "json-file",
"max_files": 2,
"max_size": "1M",
"root_dir": ""
},
"mode_config": {
"mode": "blocking",
"max_buffer_size": ""
}
},
"resources": null
},
"io_config": {
"attach_stderr": false,
"attach_stdin": false,
"attach_stdout": false,
"open_stdin": false,
"stdin_once": false,
"tty": false
},
"config": {
"env": [
"OTELCOL_NAME=otelcol-sdv",
"HOST_PROC=/hostfs/proc",
"HOST_SYS=/hostfs/sys",
"HOST_ETC=/hostfs/etc",
"HOST_VAR=/hostfs/var",
"HOST_RUN=/hostfs/run",
"HOST_DEV=/hostfs/dev"
],
"cmd": [
"/otelcol-sdv --config=/conf/relay.yaml"
]
},
"network_settings": null,
"state": {
"pid": -1,
"started_at": "",
"error": "",
"exit_code": 0,
"finished_at": "",
"exited": false,
"dead": false,
"restarting": false,
"paused": false,
"running": false,
"status": "",
"oom_killed": false
},
"created": "",
"manually_stopped": false,
"restart_count": 0
}
73 changes: 73 additions & 0 deletions ...da-components/recipes-sdv/eclipse-leda/kanto-containers/example/otelcol-sdv-exporter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"id": "",
"name": "otelcol-sdv-exporter",
"image": {
"name": "ghcr.io/softwaredefinedvehicle/sdv-edge-otel/otelcol-sdv-exporter:v0.0.1",
"decrypt_config": null
},
"host_name": "",
"domain_name": "",
"resolv_conf_path": "",
"hosts_path": "",
"hostname_path": "",
"mounts": [],
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
"retry_timeout": 0,
"type": "unless-stopped"
},
"runtime": "io.containerd.runc.v2",
"extra_hosts": [
"mosquitto:host_ip"
],
"port_mappings": [],
"log_config": {
"driver_config": {
"type": "json-file",
"max_files": 2,
"max_size": "1M",
"root_dir": ""
},
"mode_config": {
"mode": "blocking",
"max_buffer_size": ""
}
},
"resources": null
},
"io_config": {
"attach_stderr": false,
"attach_stdin": false,
"attach_stdout": false,
"open_stdin": false,
"stdin_once": false,
"tty": false
},
"config": {
"env": [],
"cmd": []
},
"network_settings": null,
"state": {
"pid": -1,
"started_at": "",
"error": "",
"exit_code": 0,
"finished_at": "",
"exited": false,
"dead": false,
"restarting": false,
"paused": false,
"running": false,
"status": "",
"oom_killed": false
},
"created": "",
"manually_stopped": false,
"restart_count": 0
}
6 changes: 6 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/sdv-example-containers.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ do_install:append() {
install ${THISDIR}/kanto-containers/example/seatservice.json ${D}${KANTO_MANIFESTS_LOCAL_DIR}
install ${THISDIR}/kanto-containers/example/hvac.json ${D}${KANTO_MANIFESTS_LOCAL_DIR}
install ${THISDIR}/kanto-containers/example/feedercan.json ${D}${KANTO_MANIFESTS_LOCAL_DIR}
# Under construction
# install ${THISDIR}/kanto-containers/example/otelcol-sdv-agent.json ${D}${KANTO_MANIFESTS_LOCAL_DIR}
# install ${THISDIR}/kanto-containers/example/otelcol-sdv-exporter.json ${D}${KANTO_MANIFESTS_LOCAL_DIR}
}

PACKAGES = "${PN}"
FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}"
FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/seatservice.json"
FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/hvac.json"
FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/feedercan.json"
# Under construction
#FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/otelcol-sdv-agent.json"
#FILES:${PN} += "${KANTO_MANIFESTS_LOCAL_DIR}/otelcol-sdv-exporter.json"
2 changes: 1 addition & 1 deletion meta-leda-distro/wic/qemux86-grub-efi.wks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ part --fixed-size 50M --ondisk vda --no-table
part --fixed-size 10M --source rawcopy --sourceparams="file=grubenv.vfat" --fstype=vfat --ondisk vda --label grubenv

# A rescue partition as fallback ("Factory Reset"), mounted for showcase
part --fixed-size 150M --source rootfs --rootfs-dir=sdv-image-rescue --ondisk vda --fstype=ext4 --label rescue --fsoptions "ro"
part --fixed-size 200M --source rootfs --rootfs-dir=sdv-image-rescue --ondisk vda --fstype=ext4 --label rescue --fsoptions "ro"

# First Root Partition (active, pre-installed), mounted readonly to show that root fs can be readonly
# and all container-apps in cluster are contained on /data
Expand Down