Upgrade collector, targetallocator and prometheus operator to latest versions (0.90, 0.90 and 0.69.1)

.pipelines/azure-pipeline-build.yml

@@ -2,6 +2,7 @@ trigger:
   branches:
     include:
     - main
+    - rashmi/ta-wrapperandupgrade
 
 pr:
   autoCancel: true
@@ -254,7 +255,7 @@ jobs:
     - task: GoTool@0
       displayName: "Build: specify golang version"
       inputs:
-        version: '1.20'
+        version: '1.21.0'
 
     - bash: |
         sudo apt-get install build-essential -y
@@ -266,6 +267,7 @@ jobs:
       displayName: 'SDL: run binskim'
       inputs:
         InputType: 'CommandLine'
+        # Remove - $(Build.SourcesDirectory)/otelcollector/otel-allocator/targetallocator for targetallocator since go 1.21 is not yet supported by build pipeline, add this back once 1.21 is supported
         arguments: 'analyze --rich-return-code $(Build.SourcesDirectory)/otelcollector/opentelemetry-collector-builder/otelcollector $(Build.SourcesDirectory)/otelcollector/prom-config-validator-builder/promconfigvalidator $(Build.SourcesDirectory)/otelcollector/otel-allocator/targetallocator $(Build.SourcesDirectory)/otelcollector/fluent-bit/src/out_appinsights.so'
 
     - task: Gosec@1

.trivyignore

@@ -6,28 +6,27 @@
 
 # =========== HIGH ================
 # HIGH - otelcollector
-GHSA-m425-mq94-257g
-CVE-2023-47108
 # HIGH - telegraf
 GHSA-fr2g-9hjm-wr23
 # HIGH - promconfigvalidator
-GHSA-m425-mq94-257g
-CVE-2023-47108
 # HIGH - telegraf
+CVE-2023-39325  
 GHSA-m425-mq94-257g
 CVE-2023-47090
 CVE-2023-46129
 
 # =========== MEDIUM ================
 # MEDIUM - otelcollector
-CVE-2023-40577
-GHSA-jq35-85cj-fj4p
+CVE-2023-48795
 # MEDIUM - promconfigvalidator
-CVE-2023-40577
-GHSA-jq35-85cj-fj4p
+CVE-2023-48795
 # MEDIUM - telegraf
 GHSA-jq35-85cj-fj4p
-# MEDIUM - go vulnerabilities
-CVE-2023-39325
+GHSA-7ww5-4wqc-m92c
+GHSA-mhpq-9638-x6pw
+CVE-2023-48795
 CVE-2023-3978
-CVE-2023-44487
+CVE-2023-44487
+# MEDIUM - go vulnerabilities
+# MEDIUM - mariner
+CVE-2023-5678

otelcollector/build/linux/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install gcc-aarch64-linux-gnu -y
 ARG TARGETOS TARGETARCH
 RUN if [ "$TARGETARCH" = "arm64" ] ; then CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=c-shared -ldflags '-extldflags=-Wl,-z,now' -o out_appinsights.so . ; else  CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=c-shared -ldflags '-extldflags=-Wl,-z,now' -o out_appinsights.so . ; fi
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.19 as otelcollector-builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.20 as otelcollector-builder
 WORKDIR /src
 RUN apt-get update && apt-get install gcc-aarch64-linux-gnu -y
 RUN go version > goversion.txt
@@ -23,7 +23,7 @@ COPY ./prometheusreceiver /src/prometheusreceiver
 ARG TARGETOS TARGETARCH
 RUN if [ "$TARGETARCH" = "arm64" ] ; then CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=pie -ldflags '-linkmode external -extldflags=-Wl,-z,now' -o otelcollector . ; else CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=pie -ldflags '-linkmode external -extldflags=-Wl,-z,now' -o otelcollector . ; fi
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.19 as prom-config-validator-builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.20 as prom-config-validator-builder
 WORKDIR /src
 RUN apt-get update && apt-get install gcc-aarch64-linux-gnu -y
 COPY ./prom-config-validator-builder/go.mod ./prom-config-validator-builder/go.sum ./prom-config-validator-builder/

otelcollector/build/linux/configuration-reader/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.19 as prom-config-validator-builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.20 as prom-config-validator-builder
 WORKDIR /src
 RUN apt-get update && apt-get install gcc-aarch64-linux-gnu -y
 COPY ./prom-config-validator-builder/go.mod ./prom-config-validator-builder/go.sum ./prom-config-validator-builder/
@@ -13,7 +13,7 @@ COPY ./prometheusreceiver /src/prometheusreceiver
 ARG TARGETOS TARGETARCH
 RUN if [ "$TARGETARCH" = "arm64" ] ; then CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=pie -ldflags '-linkmode external -extldflags=-Wl,-z,now' -o promconfigvalidator . ; else CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -buildmode=pie -ldflags '-linkmode external -extldflags=-Wl,-z,now' -o promconfigvalidator . ; fi
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.19 as configuration-reader-builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.20 as configuration-reader-builder
 WORKDIR /src
 RUN apt-get update && apt-get install gcc-aarch64-linux-gnu -y
 COPY ./configuration-reader-builder/go.mod ./configuration-reader-builder/go.sum ./configuration-reader-builder/

otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-targetallocator.yaml

@@ -31,6 +31,7 @@ spec:
       - name: targetallocator
         args:
         - --enable-prometheus-cr-watcher
+        - --reload-config
         image: "mcr.microsoft.com{{ .Values.AzureMonitorMetrics.ImageRepository }}:{{ .Values.AzureMonitorMetrics.ImageTagTargetAllocator }}"
         imagePullPolicy: IfNotPresent
         resources:

otelcollector/opentelemetry-collector-builder/Makefile

@@ -12,6 +12,7 @@ fluentbitplugin:
 promconfigvalidator:
 	make -C ../prom-config-validator-builder
 
+# add this back once golang 1.21 is supported in ado builds
 targetallocator:
 	make -C ../otel-allocator
 

otelcollector/opentelemetry-collector-builder/PROMETHEUS_VERSION

@@ -1 +1 @@
-2.47.0
+2.48.0