diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 6c71c1afb0..bd5189e5d0 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 0.6.0 +version: 0.7.0 description: DataDog Agent keywords: - monitoring @@ -11,5 +11,7 @@ sources: - https://app.datadoghq.com/account/settings#agent/kubernetes - https://github.com/DataDog/docker-dd-agent maintainers: -- name: Greg Taylor +- name: gtaylor email: gtaylor@gc-taylor.com +- name: hkaj + email: haissam@datadoghq.com diff --git a/stable/datadog/README.md b/stable/datadog/README.md index b9a1de65f2..0b1a2560af 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -4,7 +4,7 @@ ## Introduction -This chart adds the DataDog Agent to all nodes in your cluster via a DaemonSet. +This chart adds the DataDog Agent to all nodes in your cluster via a DaemonSet. It also depends on the [kube-state-metrics chart](https://github.com/kubernetes/charts/tree/master/stable/kube-state-metrics). ## Prerequisites @@ -37,26 +37,25 @@ The command removes all the Kubernetes components associated with the chart and The following tables lists the configurable parameters of the Datadog chart and their default values. -| Parameter | Description | Default | +| Parameter | Description | Default | |-----------------------------|------------------------------------|-------------------------------------------| | `datadog.apiKey` | Your Datadog API key | `Nil` You must provide your own key | | `image.repository` | The image repository to pull from | `datadog/docker-dd-agent` | | `image.tag` | The image tag to pull | `latest` | -| `imagePullPolicy` | Image pull policy | `IfNotPresent` | -| `datadog.env` | Additional Datadog environment variables | `nil` | -| `datadog.apmEnabled` | Enable tracing from the host | `nil` | -| `datadog.autoconf` | Additional Datadog service discovery configurations | `nil` | -| `datadog.checksd` | Additional Datadog service checks | `nil` | -| `datadog.confd` | Additional Datadog service configurations | `nil` | -| `imagePullPolicy` | Image pull policy | `IfNotPresent` | -| `resources.requests.cpu` | CPU resource requests | 128M | -| `resources.limits.cpu` | CPU resource limits | 512Mi | -| `resources.requests.memory` | Memory resource requests | 100m | -| `resources.limits.memory` | Memory resource limits | 256m | +| `image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `datadog.env` | Additional Datadog environment variables | `nil` | +| `datadog.apmEnabled` | Enable tracing from the host | `nil` | +| `datadog.autoconf` | Additional Datadog service discovery configurations | `nil` | +| `datadog.checksd` | Additional Datadog service checks | `nil` | +| `datadog.confd` | Additional Datadog service configurations | `nil` | +| `resources.requests.cpu` | CPU resource requests | `100m` | +| `resources.limits.cpu` | CPU resource limits | `256m` | +| `resources.requests.memory` | Memory resource requests | `128Mi` | +| `resources.limits.memory` | Memory resource limits | `512Mi` | +| `kubeStateMetrics.enabled` | If true, create kube-state-metrics | `true` | | `daemonset.podAnnotations` | Annotations to add to the DaemonSet's Pods | `nil` | | `daemonset.tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil` | - Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```bash @@ -112,3 +111,4 @@ datadog: - host: "outside-k8s.example.com" port: 6379 ``` + diff --git a/stable/datadog/requirements.lock b/stable/datadog/requirements.lock new file mode 100644 index 0000000000..c6a9478465 --- /dev/null +++ b/stable/datadog/requirements.lock @@ -0,0 +1,10 @@ +dependencies: +- condition: "" + enabled: false + import-values: null + name: kube-state-metrics + repository: https://kubernetes-charts.storage.googleapis.com/ + tags: null + version: 0.1.0 +digest: sha256:4a0aae1223aa488202fafd0d1bf83acf79e33658aa182e67246555bb673be5f8 +generated: 2017-06-08T14:44:57.672594138+02:00 diff --git a/stable/datadog/requirements.yaml b/stable/datadog/requirements.yaml new file mode 100644 index 0000000000..84d02bbb40 --- /dev/null +++ b/stable/datadog/requirements.yaml @@ -0,0 +1,5 @@ +dependencies: + - name: kube-state-metrics + version: 0.1.0 + repository: https://kubernetes-charts.storage.googleapis.com/ + condition: kubeStateMetrics.enabled diff --git a/stable/datadog/templates/_helpers.tpl b/stable/datadog/templates/_helpers.tpl index 0d6cb42e72..cfda4c8c5a 100644 --- a/stable/datadog/templates/_helpers.tpl +++ b/stable/datadog/templates/_helpers.tpl @@ -38,4 +38,3 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- define "checksd.fullname" -}} {{- printf "%s-datadog-checksd" .Release.Name | trunc 63 | trimSuffix "-" -}} {{- end -}} - diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 6fb206b172..b286618603 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -27,6 +27,11 @@ daemonset: deployment: enabled: false replicas: 1 + +## deploy the kube-state-metrics deployment +## ref: https://github.com/kubernetes/charts/tree/master/stable/kube-state-metrics +## +kubeStateMetrics.enabled: true datadog: ## You'll need to set this to your Datadog API key before the agent will run. @@ -34,6 +39,10 @@ datadog: ## # apiKey: + ## dd-agent container name + ## + name: dd-agent + ## Set logging verbosity. ## ref: https://github.com/DataDog/docker-dd-agent#environment-variables ## @@ -97,10 +106,13 @@ datadog: # checksd: # service.py: |- -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 256m - memory: 512Mi + ## dd-agent resource requests and limits + ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 256m + memory: 512Mi