mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[incubator/azuremonitor-containers] add additional parameters and update the instructions for Helm3 (#19352)
* updates related to ignite release with unofficial image Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * update with latest image Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * bump the chart minor version Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * update with official image tag Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * bump dockerProviderVersion Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * update to latest agent image and bumping docker provider version Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * bump chart version Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * revert 1.16 api version updates Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * doc update for kubernetes version support Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * update to 11012019 Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * change affinity to blacklist master and controlplane nodes for rs pod Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * removing role dependency for rs pod Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * add additional parameters clusterId and clusterRegion Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * fix pr feedback Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com> * revert minor text change Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com>
This commit is contained in:
ganga1980
committed by
Kubernetes Prow Robot
Kubernetes Prow Robot
parent
2b70fb7e2a
commit
775a3d7140
@@ -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.4.0
|
||||
version: 2.5.0
|
||||
kubeVersion: "^1.10.0-0"
|
||||
keywords:
|
||||
- monitoring
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
## Introduction
|
||||
|
||||
This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments. Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
|
||||
This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments.
|
||||
|
||||
Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
|
||||
|
||||
---
|
||||
|
||||
@@ -27,13 +29,13 @@ This article describes how to set up and use [Azure Monitor - Containers](https:
|
||||
|
||||
## Installing the Chart
|
||||
|
||||
> Note: `--name` flag not required in Helm3 since this flag is deprecated
|
||||
### To Use Azure Log Analytics Workspace in Public Cloud
|
||||
|
||||
```bash
|
||||
$ helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
|
||||
$ helm install --name myrelease-1 \
|
||||
--set omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<my_prod_cluster> incubator/azuremonitor-containers
|
||||
|
||||
```
|
||||
|
||||
### To Use Azure Log Analytics Workspace in Azure China Cloud
|
||||
@@ -56,7 +58,7 @@ $ helm install --name myrelease-1 \
|
||||
## Uninstalling the Chart
|
||||
|
||||
To uninstall/delete the `myrelease-1` release:
|
||||
|
||||
> Note: `--purge` flag not required in Helm3 since this flag deprecated
|
||||
```bash
|
||||
|
||||
$ helm del --purge myrelease-1
|
||||
@@ -77,7 +79,7 @@ The following table lists the configurable parameters of the MSOMS chart and the
|
||||
| `omsagent.image.pullPolicy`| `msoms` image pull policy. | IfNotPresent |
|
||||
| `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,china, us govt) | opinsights.azure.com (Public cloud as default), opinsights.azure.cn (China Cloud), opinsights.azure.us (US Govt Cloud) |
|
||||
| `omsagent.domain` | Azure Log analytics cloud domain (public,china, us govt)| opinsights.azure.com (Public cloud as default), opinsights.azure.cn (China Cloud), opinsights.azure.us (US Govt Cloud) |
|
||||
| `omsagent.env.clusterName` | Name of your cluster | Does not have a default value, needs to be provided |
|
||||
| `omsagent.rbac` | rbac enabled/disabled | true (i.e enabled) |
|
||||
|
||||
@@ -95,6 +97,7 @@ You can create a Azure Loganalytics workspace from portal.azure.com and get its
|
||||
|
||||
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
|
||||
|
||||
|
||||
```bash
|
||||
|
||||
$ helm install --name myrelease-1 \
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
{{- end }}
|
||||
|
||||
{{- if eq .Values.omsagent.env.clusterName "<your_cluster_name>" }}
|
||||
{{- if and (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>") }}
|
||||
|
||||
##############################################################################
|
||||
#### ERROR: You did not provide cluster name ####
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
{{- end }}
|
||||
|
||||
{{- if or (eq .Values.omsagent.secret.key "<your_workspace_key>") (eq .Values.omsagent.secret.wsid "<your_workspace_id>") (eq .Values.omsagent.env.clusterName "<your_cluster_name>")}}
|
||||
{{- if or (eq .Values.omsagent.secret.key "<your_workspace_key>") (eq .Values.omsagent.secret.wsid "<your_workspace_id>") (and (eq .Values.omsagent.env.clusterName "<your_cluster_name>") (eq .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
|
||||
|
||||
This deployment will not complete. To proceed, run
|
||||
helm upgrade {{ .Release.Name }} \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
@@ -34,8 +34,17 @@ spec:
|
||||
resources:
|
||||
{{ toYaml .Values.omsagent.resources.daemonset | indent 9 }}
|
||||
env:
|
||||
{{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
|
||||
- name: AKS_RESOURCE_ID
|
||||
value: {{ .Values.omsagent.env.clusterId | quote }}
|
||||
{{- if ne .Values.omsagent.env.clusterRegion "<your_cluster_region>" }}
|
||||
- name: AKS_REGION
|
||||
value: {{ .Values.omsagent.env.clusterRegion | quote }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
- name: ACS_RESOURCE_NAME
|
||||
value: {{ .Values.omsagent.env.clusterName | quote }}
|
||||
{{- end }}
|
||||
- name: CONTROLLER_TYPE
|
||||
value: "DaemonSet"
|
||||
- name: NODE_IP
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -38,8 +38,17 @@ spec:
|
||||
resources:
|
||||
{{ toYaml .Values.omsagent.resources.deployment | indent 9 }}
|
||||
env:
|
||||
{{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
|
||||
- name: AKS_RESOURCE_ID
|
||||
value: {{ .Values.omsagent.env.clusterId | quote }}
|
||||
{{- if ne .Values.omsagent.env.clusterRegion "<your_cluster_region>" }}
|
||||
- name: AKS_REGION
|
||||
value: {{ .Values.omsagent.env.clusterRegion | quote }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
- name: ACS_RESOURCE_NAME
|
||||
value: {{ .Values.omsagent.env.clusterName | quote }}
|
||||
{{- end }}
|
||||
- name: CONTROLLER_TYPE
|
||||
value: "ReplicaSet"
|
||||
- name: NODE_IP
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
|
||||
kind: ConfigMap
|
||||
apiVersion: v1
|
||||
data:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
|
||||
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
@@ -13,4 +13,4 @@ data:
|
||||
WSID: {{ required "A valid workspace id is required!" .Values.omsagent.secret.wsid | b64enc | quote }}
|
||||
KEY: {{ required "A valid workspace key is required!" .Values.omsagent.secret.key | b64enc | quote }}
|
||||
DOMAIN: {{ .Values.omsagent.domain | b64enc | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
@@ -19,6 +19,9 @@ omsagent:
|
||||
domain: opinsights.azure.com
|
||||
env:
|
||||
clusterName: <your_cluster_name>
|
||||
## Applicable for only managed clusters hosted in Azure
|
||||
clusterId: <your_cluster_id>
|
||||
clusterRegion: <your_cluster_region>
|
||||
rbac: true
|
||||
logsettings:
|
||||
logflushintervalsecs: ""
|
||||
|
||||
Reference in New Issue
Block a user