Merge pull request #2992 from amvanbaren/disable-grafana

disable prometheus and tracing

Dockerfile

@@ -1,4 +1,4 @@
-ARG SERVER_VERSION=195ff526
+ARG SERVER_VERSION=v0.17.0
 
 # Builder image to compile the website
 FROM ubuntu as builder
@@ -29,8 +29,7 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server
-# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
-FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION}
+FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
 ARG SERVER_VERSION
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
@@ -39,4 +38,4 @@ COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/logback-sprin
 COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ehcache.xml BOOT-INF/classes/
 
 # Replace version placeholder with arg value
-RUN sed -i "s/<SERVER_VERSION>/$SERVER_VERSION/g" config/application.yml
+RUN sed -i "s/<SERVER_VERSION>/$SERVER_VERSION/g" config/application.yml

configuration/application.yml

@@ -21,6 +21,9 @@ server:
 spring:
   application:
     name: openvsx-server
+  autoconfigure:
+    # don't send traces to Zipkin
+    exclude: org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration
   config:
     import: file:${DEPLOYMENT_CONFIG}
   cache:
@@ -77,7 +80,7 @@ management:
       exposure:
         include:
           - health
-          - prometheus
+          # - prometheus
   tracing:
     sampling:
       probability: 0.1