diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 50cf25a739512e07c01bfa3ad57cbc04a36cdfb6..0638cbc4cf3d6de54b8b22bdae3c4b87d3ef2aa3 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -206,7 +206,8 @@ services: "spring.activemq.user": "artemis", "spring.activemq.password": "artemis", "logging.level.org.springframework" : "INFO", - "logging.level.org.etsi.osl.tmf.api" : "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: diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml new file mode 100644 index 0000000000000000000000000000000000000000..620ca0aa2146d38585535fbad658d42536ec7a53 --- /dev/null +++ b/kubernetes/helm/openslice/templates/metrico.yaml @@ -0,0 +1,46 @@ +{{ 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 }} diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 4f6d0d828a10b7eadc17106a036b09dd5bd749f9..ee1f4f732b9ab57a796ff0d3e2725e0dbb21c5a5 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -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 @@ -110,6 +115,12 @@ spring: mysql: storage: 10Gi + +metrico: + enabled: true + logLevel: DEBUG + spring: + loglevel: DEBUG cridge: enabled: true