merge from main

Azure · Feb 21, 2025 · e44b30f · e44b30f
2 parents e22fe2e + 4acb2b4
commit e44b30f
Show file tree

Hide file tree

Showing 43 changed files with 1,061 additions and 845 deletions.
diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml
@@ -538,7 +538,7 @@ stages:
           docker buildx create --name dockerbuilder --driver docker-container --driver-opt image=mcr.microsoft.com/azuremonitor/containerinsights/cidev/prometheus-collector/images:buildx-stable-1 --use 
           docker buildx inspect --bootstrap
           docker login containerinsightsprod.azurecr.io -u $(ACR_USERNAME) -p $(ACR_PASSWORD)
-          docker buildx build . -f arc-conformance/Dockerfile -t $(ARC_CONFORMANCE_FULL_IMAGE_NAME) --push
+          docker buildx build . -f arc-conformance/Dockerfile -t $(ARC_CONFORMANCE_FULL_IMAGE_NAME) --build-arg "GOLANG_VERSION=$(GOLANG_VERSION)" --push
           docker pull $(ARC_CONFORMANCE_FULL_IMAGE_NAME)  
         workingDirectory: $(Build.SourcesDirectory)/otelcollector/test/
         displayName: "Build: build and push Arc conformance test image to dev ACR"

diff --git a/.trivyignore b/.trivyignore
@@ -3,15 +3,6 @@
 CVE-2024-45337 # golang.org/x/crypto
 CVE-2024-24790 # stdlib
 # HIGH
-# otelcollector
-CVE-2024-45338 # golang.org/x/net
-# promconfigvalidator
-CVE-2024-45338 # golang.org/x/net
-# configurationreader
-CVE-2024-45338 # golang.org/x/net
-# targetallocator
-CVE-2024-45338 # golang.org/x/net
-CVE-2025-22866 # stdlib
 # kube-state-metrics
 CVE-2024-45338 # golang.org/x/net
 CVE-2024-34156 # stdlib
@@ -24,3 +15,8 @@ CVE-2024-34155 # stdlib
 CVE-2024-34158 # stdlib
 CVE-2024-45336 # stdlib
 CVE-2024-45341 # stdlib
+# prometheus-collector
+# targetallocator
+# config-reader
+CVE-2025-22866 # stdlib
+
diff --git a/AddonPolicyTemplate/AddonPolicyMetricsProfile.rules.json b/AddonPolicyTemplate/AddonPolicyMetricsProfile.rules.json
@@ -201,7 +201,8 @@
 								"properties": {
 									"description": "[concat(variables('nodeRecordingRuleGroupDescription'), variables('version'))]",
 									"scopes": [
-										"[parameters('azureMonitorWorkspaceResourceId')]"
+										"[parameters('azureMonitorWorkspaceResourceId')]",
+										"[parameters('clusterResourceId')]"
 									],
 									"clusterName": "[variables('clusterName')]",
 									"interval": "PT1M",
@@ -261,7 +262,8 @@
 								"properties": {
 									"description": "[concat(variables('kubernetesRecordingRuleGroupDescription'), variables('version'))]",
 									"scopes": [
-										"[parameters('azureMonitorWorkspaceResourceId')]"
+										"[parameters('azureMonitorWorkspaceResourceId')]",
+										"[parameters('clusterResourceId')]"
 									],
 									"clusterName": "[variables('clusterName')]",
 									"interval": "PT1M",
@@ -365,7 +367,8 @@
 								"properties": {
 									"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
 									"scopes": [
-										"[parameters('azureMonitorWorkspaceResourceId')]"
+										"[parameters('azureMonitorWorkspaceResourceId')]",
+										"[parameters('clusterResourceId')]"
 									],
 									"enabled": "[parameters('enableWindowsRecordingRules')]",
 									"clusterName": "[variables('clusterName')]",
@@ -442,7 +445,8 @@
 								"properties": {
 									"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
 									"scopes": [
-										"[parameters('azureMonitorWorkspaceResourceId')]"
+										"[parameters('azureMonitorWorkspaceResourceId')]",
+										"[parameters('clusterResourceId')]"
 									],
 									"enabled": "[parameters('enableWindowsRecordingRules')]",
 									"clusterName": "[variables('clusterName')]",

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,15 +1,20 @@
 # Azure Monitor Metrics for AKS clusters
-
 ## Release TBD
 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>`
 * Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>-win`
 * TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>-targetallocator`
 * cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>-cfg`
 * AKS and Arc Container Images:
+  - Add scrape_samples_scraped metric to telemetry when debug mode is enabled (https://github.com/Azure/prometheus-collector/pull/1055)
+  - fix: set proxy the old way for mdsd in golang (https://github.com/Azure/prometheus-collector/pull/1062)
+  - fix: add cluster scope to recording rules in policy (https://github.com/Azure/prometheus-collector/pull/1064)
+  - upgrade: Upgrade otelcollector and targetallocator to 0.117.0 (https://github.com/Azure/prometheus-collector/pull/1063)
   - feat: Configmap update for CCP (v2 + v1 schema support) (https://github.com/Azure/prometheus-collector/pull/1056)
-* Arc Extension Chart:
 
 * Pipeline/Docs/Templates Updates:
+   * fix: add cluster scope to recording rules in policy (https://github.com/Azure/prometheus-collector/pull/1064) 
+   * Add job labels to monitoring alerts (https://github.com/Azure/prometheus-collector/pull/1065)
+   * fix: arc conformance build in pipeline (https://github.com/Azure/prometheus-collector/pull/1066)
 
 ## Release 01-16-2025
 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.14.0-main-01-16-2025-8d52acfe`

diff --git a/REMOTE-WRITE-RELEASENOTES.md b/REMOTE-WRITE-RELEASENOTES.md
@@ -1,6 +1,14 @@
 # Azure Monitor managed service for Prometheus remote write
 
 
+## Release 01-06-2025
+* Image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20250214.1`
+* Change log -
+* CVE fixes
+   - CVE-2024-45339
+   - CVE-2019-11254
+* golang upgrade - 1.225 -> 1.23.6
+
 ## Release 01-06-2025
 * Image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20250106.1`
 * Change log -

diff --git a/internal/alerts/example-alert-template.json b/internal/alerts/example-alert-template.json
@@ -20,7 +20,7 @@
                 "rules": [
                     {
                         "alert": "Amd64 metric missing in cluster ci-dev-aks-mac-eus",
-                        "expression": "absent(node_uname_info{machine=\"x86_64\"}) == 1 or node_uname_info{machine=\"x86_64\"} == 0",
+                        "expression": "absent(node_uname_info{job=\"node\",machine=\"x86_64\"}) == 1 or node_uname_info{job=\"node\",machine=\"x86_64\"} == 0",
                         "for": "PT30M",
                         "annotations": {
                             "description": "Amd64 metric missing in cluster ci-dev-aks-mac-eus"
@@ -200,7 +200,7 @@
                     },
                     {
                         "alert": "CPU usage % greater than 75 for prometheus-collector containers on cluster ci-dev-aks-mac-eus",
-                        "expression": "sum(sum by (cluster, namespace, pod, container) ( rate(container_cpu_usage_seconds_total{job=\"cadvisor\", image!=\"\", namespace=\"kube-system\", container=\"prometheus-collector\"}[5m]) ) * on (cluster, namespace, pod) group_left(node) topk by (cluster, namespace, pod) ( 1, max by(cluster, namespace, pod, node) (kube_pod_info{node!=\"\", namespace=\"kube-system\"}) )) by (container, pod) *100 > 75",
+                        "expression": "sum(sum by (cluster, namespace, pod, container) ( rate(container_cpu_usage_seconds_total{job=\"cadvisor\", image!=\"\", namespace=\"kube-system\", container=\"prometheus-collector\"}[5m]) ) * on (cluster, namespace, pod) group_left(node) topk by (cluster, namespace, pod) ( 1, max by(cluster, namespace, pod, node) (kube_pod_info{job=\"kube-state-metrics\",node!=\"\", namespace=\"kube-system\"}) )) by (container, pod) *100 > 75",
                         "for": "PT3M",
                         "annotations": {
                             "description": "CPU usage greater than 75% for prometheus-collector on cluster ci-dev-aks-mac-eus"
@@ -218,7 +218,7 @@
                     },
                     {
                         "alert": "Memory usage % greater than 75 for prometheus-collector containers on cluster ci-dev-aks-mac-eus",
-                        "expression": "(sum(container_memory_working_set_bytes{namespace=\"kube-system\", container=\"prometheus-collector\", image!=\"\"}) by (container, pod) / sum(kube_pod_container_resource_limits{namespace=\"kube-system\", container=\"prometheus-collector\", resource=\"memory\"}) by (container, pod)) * 100> 75",
+                        "expression": "(sum(container_memory_working_set_bytes{job=\"cadvisor\",namespace=\"kube-system\", container=\"prometheus-collector\", image!=\"\"}) by (container, pod) / sum(kube_pod_container_resource_limits{job=\"kube-state-metrics\",namespace=\"kube-system\", container=\"prometheus-collector\", resource=\"memory\"}) by (container, pod)) * 100> 75",
                         "for": "PT3M",
                         "annotations": {
                             "description": "Memory usage greater than 75% for prometheus-collector containers on cluster ci-dev-aks-mac-eus"
@@ -254,7 +254,7 @@
                     },
                     {
                         "alert": "New agent version found for prometheus collector",
-                        "expression": "count(count (kube_pod_container_info{image=~\"mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector.*\"})  by (image)) > 4",
+                        "expression": "count(count (kube_pod_container_info{job=\"kube-state-metrics\",image=~\"mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector.*\"})  by (image)) > 4",
                         "for": "PT60S",
                         "annotations": {
                             "description": "New agent version found for prometheus collector. This alert is only used in near ring regions for prod monitoring clusters"

diff --git a/otelcollector/VERSION b/otelcollector/VERSION
@@ -1 +1 @@
-6.14.0
+6.15.0
diff --git a/otelcollector/configuration-reader-builder/go.mod b/otelcollector/configuration-reader-builder/go.mod
@@ -1,15 +1,15 @@
 module github.com/configurationreader
 
-go 1.22.0
+go 1.22.7
 
-toolchain go1.22.5
+toolchain go1.23.6
 
 replace github.com/prometheus-collector/shared => ../shared
 
 replace github.com/prometheus-collector/shared/configmap/mp => ../shared/configmap/mp
 
 require (
-	github.com/open-telemetry/opentelemetry-operator v0.116.0
+	github.com/open-telemetry/opentelemetry-operator v0.117.0
 	github.com/prometheus-collector/shared/configmap/mp v0.0.0-00010101000000-000000000000
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.31.3
@@ -18,7 +18,7 @@ require (
 require (
 	cloud.google.com/go/auth v0.9.4 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
-	cloud.google.com/go/compute/metadata v0.5.1 // indirect
+	cloud.google.com/go/compute/metadata v0.5.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
@@ -33,15 +33,15 @@ require (
 	github.com/aws/aws-sdk-go v1.55.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 // indirect
+	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/digitalocean/godo v1.125.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/docker v27.2.0+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.13.0 // indirect
+	github.com/envoyproxy/go-control-plane v0.13.1 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -127,29 +127,30 @@ require (
 	github.com/vultr/govultr/v2 v2.17.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
-	go.opentelemetry.io/otel v1.32.0 // indirect
-	go.opentelemetry.io/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.24.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.25.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/api v0.198.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/grpc v1.69.4 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect