Merge branch '42-include-metrico-in-the-deployment-bundles' into 'develop' (3f6d99f1) · Commits · OSL / code / org.etsi.osl.main

compose/docker-compose.yaml.configure

+32 −1

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@ services:
		"spring.activemq.password": "artemis",
		"logging.level.org.springframework" : "INFO",
		"logging.level.org.etsi.osl.tmf.api" : "INFO",
		"logging.level.org.etsi.osl.tmf.*" : "INFO",
		"kroki.serverurl" : "http://localhost/kroki",
		"server.forward-headers-strategy":"FRAMEWORK"
		}'
		@@ -323,6 +324,36 @@ services:
		depends_on:
		- osscapi

		metrico:
		container_name: openslice-metrico
		restart: always
		profiles: [ "prod"]
		build:
		context: ../../org.etsi.osl.metrico/
		dockerfile: Dockerfile
		image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop
		environment:
		SPRING_APPLICATION_JSON: '{
		"spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
		"spring.datasource.username":"root",
		"spring.datasource.password":"letmein",
		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
		"spring.activemq.user": "artemis",
		"spring.activemq.password": "artemis",
		"logging.level.org.springframework" : "DEBUG",
		"logging.level.org.etsi.osl.metrico" : "DEBUG"
		}'
		logging:
		driver: "json-file"
		options:
		max-size: "800m"
		max-file: "3"
		networks:
		- front
		- back
		depends_on:
		- osscapi
		- mysql-portal


		portainer:

kubernetes/helm/openslice/templates/metrico.yaml

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		{{ if .Values.metrico.enabled }}
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		namespace: {{ .Release.Namespace }}
		labels:
		app: {{ include "openslice.fullname" . }}
		org.etsi.osl.service: metrico
		chart: "{{ .Chart.Name }}-{{ .Chart.Version \| replace "+" "_" }}"
		{{- include "openslice.labels" . \| nindent 4 }}
		name: {{ include "openslice.fullname" . }}-metrico
		spec:
		{{- if not .Values.autoscaling.enabled }}
		replicas: {{ .Values.replicaCount }}
		{{- end }}
		selector:
		matchLabels:
		app: {{ include "openslice.fullname" . }}
		org.etsi.osl.service: metrico
		{{- include "openslice.selectorLabels" . \| nindent 6 }}
		template:
		metadata:
		labels:
		app: {{ include "openslice.fullname" . }}
		org.etsi.osl.service: metrico
		{{- include "openslice.selectorLabels" . \| nindent 8 }}
		spec:
		containers:
		- image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag \| default .Chart.AppVersion }}"
		imagePullPolicy: {{ .Values.image.metrico.pullPolicy \| default "Always" }}
		name: {{ include "openslice.fullname" . }}-metrico
		env:
		- name: SPRING_APPLICATION_JSON
		value: >-
		{
		"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/metricodb?createDatabaseIfNotExist=true",
		"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
		"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
		"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
		"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
		"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
		"logging.level.org.springframework" : "{{ .Values.metrico.spring.logLevel \| default "INFO" }}",
		"logging.level.org.etsi.osl.cridge" : "{{ .Values.metrico.logLevel \| default "INFO" }}"
		}
		restartPolicy: Always
		{{- end }}

kubernetes/helm/openslice/values.yaml

+11 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,11 @@ image:
		pullPolicy: Always
		# Overrides the image tag whose default is the chart appVersion.
		tag: "develop"
		metrico:
		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
		pullPolicy: Always
		# Overrides the image tag whose default is the chart appVersion.
		tag: "develop"

		bugzillaurl: example.com:443/bugzilla
		bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
		@@ -111,6 +116,12 @@ spring:
		mysql:
		storage: 10Gi

		metrico:
		enabled: true
		logLevel: DEBUG
		spring:
		loglevel: DEBUG

		cridge:
		enabled: true
		logLevel: INFO