From cf5755dd20dceb6380decc8c4918cf226d623aec Mon Sep 17 00:00:00 2001 From: Vishwanath Date: Sun, 4 Nov 2018 05:54:31 -0800 Subject: [PATCH] Updating to latest released agent (ciprod10162018-2) (#8862) * Updating to latest released agent (ciprod10162018-2) Signed-off-by: Vishwanath Narasimhan * Making minor readme/text updates Signed-off-by: Vishwanath Narasimhan --- incubator/azuremonitor-containers/Chart.yaml | 2 +- incubator/azuremonitor-containers/README.md | 14 ++++++++------ .../azuremonitor-containers/templates/NOTES.txt | 2 +- incubator/azuremonitor-containers/values.yaml | 10 +++++----- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml index 6aacace719..8322450e91 100644 --- a/incubator/azuremonitor-containers/Chart.yaml +++ b/incubator/azuremonitor-containers/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 2.0.0-3 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes name: azuremonitor-containers -version: 0.2.0 +version: 0.3.0 keywords: - monitoring - azuremonitor diff --git a/incubator/azuremonitor-containers/README.md b/incubator/azuremonitor-containers/README.md index 5fbb01703e..a11829751c 100644 --- a/incubator/azuremonitor-containers/README.md +++ b/incubator/azuremonitor-containers/README.md @@ -22,13 +22,16 @@ This article describes how to set up and use [Azure Monitor - Containers](https: 2. [Add the 'AzureMonitor-Containers' Solution to your Log Analytics workspace.](http://aka.ms/coinhelmdoc) +3. [For ACS-engine K8S cluster, add Log Analytics workspace tag to cluster resources, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers)](http://aka.ms/coin-acs-tag-doc) + --- ## Installing the Chart ```bash $ helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/ -$ helm install --name azuremonitorcontainers incubator/azuremonitor-containers +$ helm install --name myrelease-1 \ +--set omsagent.secret.wsid=,omsagent.secret.key=,omsagent.env.clusterName= incubator/azuremonitor-containers ``` @@ -57,7 +60,7 @@ The following table lists the configurable parameters of the MSOMS chart and the | `omsagent.secret.wsid` | Azure Log analytics workspace id | Does not have a default value, needs to be provided | | `omsagent.secret.key` | Azure Log analytics workspace key | Does not have a default value, needs to be provided | | `omsagent.domain` | Azure Log analytics cloud domain (public / govt) | opinsights.azure.com (Public cloud as default), opinsights.azure.us (Govt Cloud) | -| `omsagent.env.clusterName` | Name of your cluster | Does not have a default value, needs to be provided | +| `omsagent.env.clusterName` | Name of your cluster | Does not have a default value, needs to be provided. If ACS-engine cluster, recommended to provide Azure Resource group resource ID of ACS-Engine cluster, to be able to use Azure Container monitoring User experience (aka.ms/azmon-containers) | |`omsagent.env.doNotCollectKubeSystemLogs`| Disable collecting logs from containers in 'kube-system' namespace | true| | `omsagent.rbac` | rbac enabled/disabled | true (i.e enabled) | @@ -69,8 +72,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```bash $ helm install --name myrelease-1 \ - ---set omsagent.secret.wsid=,omsagent.secret.key=,omsagent.env.clusterName= incubator/azuremonitor-containers +--set omsagent.secret.wsid=,omsagent.secret.key=,omsagent.env.clusterName= incubator/azuremonitor-containers ``` Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, @@ -81,6 +83,6 @@ $ helm install --name omsagent -f values.yaml incubator/azuremonitor-containers ``` -After you successfully deploy the chart, you will be able to see your data in the [azure portal](aka.ms/coinprod) +After you successfully deploy the chart, you will be able to see your data in the [azure portal](aka.ms/azmon-containers) -If you need help with this chart, please reach us out thru [this](mailto:omscontainers@microsoft.com) email. \ No newline at end of file +If you need help with this chart, please reach us out thru [this](mailto:askcoin@microsoft.com) email. \ No newline at end of file diff --git a/incubator/azuremonitor-containers/templates/NOTES.txt b/incubator/azuremonitor-containers/templates/NOTES.txt index a526d67c2d..27411afd1e 100644 --- a/incubator/azuremonitor-containers/templates/NOTES.txt +++ b/incubator/azuremonitor-containers/templates/NOTES.txt @@ -35,6 +35,6 @@ This deployment will not complete. To proceed, run {{ .Release.Name }} deployment is complete. Data should start flowing to the Log Analytics workspace shortly. -Proceed to https://aka.ms/coinprod if you would like to view this data. +Proceed to https://aka.ms/azmon-containers if you would like to view this data. {{- end }} \ No newline at end of file diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml index e4fce29390..70f282cf47 100644 --- a/incubator/azuremonitor-containers/values.yaml +++ b/incubator/azuremonitor-containers/values.yaml @@ -6,9 +6,9 @@ ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod omsagent: image: - tag: "ciprod07312018" + tag: "ciprod10162018-2" pullPolicy: IfNotPresent - dockerProviderVersion: "2.0.0-4" + dockerProviderVersion: "3.0.0-1" agentVersion: "1.6.0-163" ## To get your workspace id and key do the following ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux. @@ -18,7 +18,7 @@ omsagent: key: domain: opinsights.azure.com env: - clusterName: + clusterName: doNotCollectKubeSystemLogs: "true" rbac: true @@ -29,10 +29,10 @@ omsagent: daemonset: requests: cpu: 50m - memory: 200Mi + memory: 150Mi limits: cpu: 150m - memory: 750Mi + memory: 300Mi deployment: requests: cpu: 50m