pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28238 ) Change subject: open5gs: Enable libmetrics prometheus implementation ...................................................................... open5gs: Enable libmetrics prometheus implementation metrics support using Prometheus has been recently added to open5gs (28e40a0f1b9048768958344e213c69994be671f5). However, it is still not enabled by default. Let's enable it and update open5gs config files to make use of it. Change-Id: I6ec827d66241e20d631f3a851457921718c168a0 --- M open5gs-master/Dockerfile M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-smf.yaml 3 files changed, 30 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 1aea492..54c7fd1 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -7,6 +7,7 @@ apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ + cmake \ vim \ sudo \ iproute2 \ @@ -53,4 +54,5 @@ --localstatedir=/var \ --libdir=lib/x86_64-linux-gnu \ --libexecdir=lib/x86_64-linux-gnu && \ + meson configure -Dmetrics_impl=prometheus build && \ ninja -C build install diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 3ee3b04..9d47250 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -533,3 +533,17 @@ # handover: # duration: 500 time: + +# +# metrics: +# +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# metrics: +# addr: 0.0.0.0 +# port: 9090 +# +metrics: + addr: 172.18.3.201 + port: 9090 diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index 5e8cf1b..b637aee 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -521,3 +521,17 @@ # handover: # duration: 500 time: + +# +# metrics: +# +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# metrics: +# addr: 0.0.0.0 +# port: 9090 +# +metrics: + addr: 172.18.18.4 + port: 9090 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ec827d66241e20d631f3a851457921718c168a0 Gerrit-Change-Number: 28238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged