diff --git a/etc/k8s/opentelemetry-sidecar.yaml b/etc/k8s/opentelemetry-sidecar.yaml index 95723aeb..cbdaa504 100644 --- a/etc/k8s/opentelemetry-sidecar.yaml +++ b/etc/k8s/opentelemetry-sidecar.yaml @@ -1,8 +1,8 @@ apiVersion: opentelemetry.io/v1alpha1 kind: OpenTelemetryCollector metadata: - name: opentelemtry-sidecar - namespace: hikingtracks + name: opentelemetry-sidecar + namespace: stomp-test spec: mode: sidecar config: | @@ -13,9 +13,11 @@ spec: http: exporters: otlp: - endpoint: http://jaeger-all-in-one-collector.observability:4317 + endpoint: jaeger-all-in-one-collector.observability:4317 tls: insecure: true + prometheus: + endpoint: "0.0.0.0:8889" logging: processors: batch: @@ -26,7 +28,7 @@ spec: service: telemetry: logs: - level: "debug" + level: "warn" extensions: [zpages, health_check] pipelines: traces: @@ -36,4 +38,4 @@ spec: metrics: receivers: [otlp] processors: [batch] - exporters: [otlp] + exporters: [prometheus] diff --git a/etc/k8s/wildfly-deployment.yaml b/etc/k8s/wildfly-deployment.yaml index 01bf94df..38c69a29 100644 --- a/etc/k8s/wildfly-deployment.yaml +++ b/etc/k8s/wildfly-deployment.yaml @@ -10,7 +10,7 @@ metadata: configmap.reloader.stakater.com/reload: stomp-test-config spec: replicas: 0 - minReadySeconds: 90 + minReadySeconds: 30 strategy: rollingUpdate: maxSurge: 1 @@ -73,9 +73,9 @@ spec: fieldPath: metadata.namespace resources: limits: - memory: "1024Mi" + memory: 1024Mi requests: - memory: "768Mi" + memory: 768Mi ports: - containerPort: 8080 protocol: TCP @@ -123,6 +123,9 @@ spec: env: - name: SERVICE_ELASTICSEARCH value: elasticsearch.x1 + resources: + limits: + memory: 64Mi dnsPolicy: ClusterFirst restartPolicy: Always terminationGracePeriodSeconds: 30 diff --git a/etc/k8s/wildfly-service-monitor.yaml b/etc/k8s/wildfly-service-monitor.yaml index b4004a53..1861b2b1 100644 --- a/etc/k8s/wildfly-service-monitor.yaml +++ b/etc/k8s/wildfly-service-monitor.yaml @@ -10,6 +10,6 @@ spec: matchLabels: app: wildfly endpoints: - - port: management-http + - port: metrics path: /metrics interval: 60s diff --git a/etc/k8s/wildfly-service.yaml b/etc/k8s/wildfly-service.yaml index 6c3a117f..835c4189 100644 --- a/etc/k8s/wildfly-service.yaml +++ b/etc/k8s/wildfly-service.yaml @@ -20,6 +20,10 @@ spec: port: 9990 protocol: TCP targetPort: 9990 + - name: metrics + port: 8889 + protocol: TCP + targetPort: 8889 selector: deployment: wildfly sessionAffinity: None