Skip to content

Commit

Permalink
chart and other updates (#519)
Browse files Browse the repository at this point in the history
  • Loading branch information
rashmichandrashekar authored Mar 26, 2021
1 parent 16936aa commit 12964be
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 18 deletions.
17 changes: 17 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,23 @@ additional questions or comments.
## Release History

Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)

### 03/26/2021 -
##### Version microsoft/oms:ciprod03262021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03262021 (linux)
##### Version microsoft/oms:win-ciprod03262021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod03262021 (windows)
##### Code change log
- Started collecting new metric - kubelet running pods count
- Onboarding script fixes to add explicit json output
- Proxy and token updates for ARC
- Doc updates for Microsoft charts repo release
- Bug fixes for trailing whitespaces in enable-monitoring.sh script
- Support for higher volume of prometheus metrics by scraping metrics from sidecar
- Update to get new version of telegraf - 1.18
- Add label and field selectors for prometheus scraping using annotations
- Support for OSM integration
- Removed wireserver calls to get CA certs since access is removed
- Added liveness timeout for exec for linux containers

### 02/23/2021 -
##### Version microsoft/oms:ciprod02232021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021 (linux)
##### Version microsoft/oms:win-ciprod02232021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod02232021 (windows)
Expand Down
4 changes: 2 additions & 2 deletions build/version
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

# Build Version Information

CONTAINER_BUILDVERSION_MAJOR=13
CONTAINER_BUILDVERSION_MAJOR=14
CONTAINER_BUILDVERSION_MINOR=0
CONTAINER_BUILDVERSION_PATCH=0
CONTAINER_BUILDVERSION_BUILDNR=0
CONTAINER_BUILDVERSION_DATE=20210223
CONTAINER_BUILDVERSION_DATE=20210326
CONTAINER_BUILDVERSION_STATUS=Developer_Build

#-------------------------------- End of File -----------------------------------
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 7.0.0-1
description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
name: azuremonitor-containers
version: 2.8.1
version: 2.8.2
kubeVersion: "^1.10.0-0"
keywords:
- monitoring
Expand Down
6 changes: 3 additions & 3 deletions charts/azuremonitor-containers/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Azure:
omsagent:
image:
repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
tag: "ciprod02232021"
tagWindows: "win-ciprod02232021"
tag: "ciprod03262021"
tagWindows: "win-ciprod03262021"
pullPolicy: IfNotPresent
dockerProviderVersion: "13.0.0-0"
dockerProviderVersion: "14.0.0-0"
agentVersion: "1.10.0.1"

# The priority used by the omsagent priority class for the daemonset pods
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:18.04
MAINTAINER [email protected]
LABEL vendor=Microsoft\ Corp \
com.microsoft.product="Azure Monitor for containers"
ARG IMAGE_TAG=ciprod02232021
ARG IMAGE_TAG=ciprod03262021
ENV AGENT_VERSION ${IMAGE_TAG}
ENV tmpdir /opt
ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi
Expand Down
14 changes: 7 additions & 7 deletions kubernetes/omsagent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ spec:
tier: node
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "13.0.0-0"
dockerProviderVersion: "14.0.0-0"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
Expand All @@ -368,7 +368,7 @@ spec:
value: "3"
containers:
- name: omsagent
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03262021"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -446,7 +446,7 @@ spec:
timeoutSeconds: 15
#Only in sidecar scraping mode
- name: omsagent-prometheus
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11092020"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03262021"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -583,13 +583,13 @@ spec:
rsName: "omsagent-rs"
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "13.0.0-0"
dockerProviderVersion: "14.0.0-0"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
containers:
- name: omsagent
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03262021"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -750,7 +750,7 @@ spec:
tier: node-win
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "13.0.0-0"
dockerProviderVersion: "14.0.0-0"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
Expand All @@ -760,7 +760,7 @@ spec:
value: "3"
containers:
- name: omsagent-win
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod02232021"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod03262021"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAINTAINER [email protected]
LABEL vendor=Microsoft\ Corp \
com.microsoft.product="Azure Monitor for containers"

ARG IMAGE_TAG=win-ciprod02232021
ARG IMAGE_TAG=win-ciprod03262021

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand Down
2 changes: 1 addition & 1 deletion scripts/onboarding/managed/enable-monitoring.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $isUsingServicePrincipal = $false

# released chart version in mcr
$mcr = "mcr.microsoft.com"
$mcrChartVersion = "2.8.1"
$mcrChartVersion = "2.8.2"
$mcrChartRepoPath = "azuremonitor/containerinsights/preview/azuremonitor-containers"
$helmLocalRepoName = "."
$omsAgentDomainName="opinsights.azure.com"
Expand Down
2 changes: 1 addition & 1 deletion scripts/onboarding/managed/enable-monitoring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ defaultAzureCloud="AzureCloud"
omsAgentDomainName="opinsights.azure.com"

# released chart version in mcr
mcrChartVersion="2.8.1"
mcrChartVersion="2.8.2"
mcr="mcr.microsoft.com"
mcrChartRepoPath="azuremonitor/containerinsights/preview/azuremonitor-containers"
helmLocalRepoName="."
Expand Down
2 changes: 1 addition & 1 deletion scripts/onboarding/managed/upgrade-monitoring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -e
set -o pipefail

# released chart version for Azure Arc enabled Kubernetes public preview
mcrChartVersion="2.8.1"
mcrChartVersion="2.8.2"
mcr="mcr.microsoft.com"
mcrChartRepoPath="azuremonitor/containerinsights/preview/azuremonitor-containers"

Expand Down

0 comments on commit 12964be

Please sign in to comment.