Merge remote-tracking branch 'origin/main' into grace/win-liveness

Azure · Nov 16, 2023 · 2e1dd0b · 2e1dd0b
2 parents 14610bf + f91aa8e
commit 2e1dd0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -6,10 +6,10 @@
   * Fix Windows liveness probe for error level evaluation
 
 ## Release 11-03-2023
-* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-<tbd>`
-* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-<tbd>-win`
-* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-<tbd>-targetallocator`
-* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-<tbd>-cfg`
+* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-11-03-2023-c061beb4`
+* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-11-03-2023-c061beb4-win`
+* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-11-03-2023-c061beb4-targetallocator`
+* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.1-main-11-03-2023-c061beb4-cfg`
 * Change log -
   * Add new regions for Azure Monitor Workspace - https://github.com/Azure/prometheus-collector/pull/609
   * Add telemetry for target allocator & config side-car image tags - https://github.com/Azure/prometheus-collector/pull/661

diff --git a/internal/alerts/example-alert-template.json b/internal/alerts/example-alert-template.json
@@ -255,13 +255,13 @@
                     {
                         "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)) > 2",
-                        "for": "PT30M",
+                        "for": "PT60S",
                         "annotations": {
                             "description": "New agent version found for prometheus collector. This alert is only used in near ring regions for prod monitoring clusters"
                         },
                         "severity": 4,
                         "resolveConfiguration": {
-                            "autoResolved": true,
+                            "autoResolved": false,
                             "timeToResolve": "PT10M"
                         },
                         "actions": [