From 36f368b2a68a318fb298fd1027c39cb38430f6dc Mon Sep 17 00:00:00 2001
From: Ben Keith <keitwb@gmail.com>
Date: Thu, 20 Sep 2018 15:57:05 -0400
Subject: [PATCH] Update chart for signalfx-agent 3.6.1 release (#6716)

Signed-off-by: Ben Keith <bkeith@signalfx.com>
---
 stable/signalfx-agent/Chart.yaml                 | 4 ++--
 stable/signalfx-agent/templates/clusterrole.yaml | 1 +
 stable/signalfx-agent/templates/configmap.yaml   | 6 ++++--
 stable/signalfx-agent/values.yaml                | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/stable/signalfx-agent/Chart.yaml b/stable/signalfx-agent/Chart.yaml
index ccde5aa0d1..a035caefc1 100644
--- a/stable/signalfx-agent/Chart.yaml
+++ b/stable/signalfx-agent/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: The SignalFx Kubernetes agent
 name: signalfx-agent
-appVersion: 3.2.2
-version: 0.2.1
+appVersion: 3.6.1
+version: 0.3.0
 keywords:
 - monitoring
 - alerting
diff --git a/stable/signalfx-agent/templates/clusterrole.yaml b/stable/signalfx-agent/templates/clusterrole.yaml
index 56f278150d..5e3d4030e0 100644
--- a/stable/signalfx-agent/templates/clusterrole.yaml
+++ b/stable/signalfx-agent/templates/clusterrole.yaml
@@ -22,6 +22,7 @@ rules:
   - replicationcontrollers
   - replicationcontrollers/status
   - services
+  - resourcequotas
   # Only need to be able to view secrets if using k8s annotation
   # agent.signalfx.com/configWithSecret.*.  You can also whitelist specific
   # secrets for finer-grain permission sets.
diff --git a/stable/signalfx-agent/templates/configmap.yaml b/stable/signalfx-agent/templates/configmap.yaml
index a61fe8fac1..365ffd7985 100644
--- a/stable/signalfx-agent/templates/configmap.yaml
+++ b/stable/signalfx-agent/templates/configmap.yaml
@@ -24,7 +24,7 @@ data:
     globalDimensions:
       kubernetes_cluster: {{ .Values.clusterName }}
 
-    sendMachineID: true
+    sendMachineID: false
 
     observers:
     - type: k8s-api
@@ -45,8 +45,9 @@ data:
     - type: collectd/protocols
     - type: collectd/signalfx-metadata
       procFSPath: /hostfs/proc
+    - type: host-metadata
       etcPath: /hostfs/etc
-      persistencePath: /run
+      procFSPath: /hostfs/proc
     - type: collectd/uptime
     - type: collectd/vmem
 
@@ -67,6 +68,7 @@ data:
     {{ if .Values.gatherClusterMetrics -}}
     # Collects k8s cluster-level metrics
     - type: kubernetes-cluster
+      useNodeName: true
     {{- end }}
 
     {{ if .Values.gatherDockerMetrics -}}
diff --git a/stable/signalfx-agent/values.yaml b/stable/signalfx-agent/values.yaml
index 625bdde0b0..d6e9d3351c 100644
--- a/stable/signalfx-agent/values.yaml
+++ b/stable/signalfx-agent/values.yaml
@@ -1,6 +1,6 @@
 # Version of the signalfx-agent to deploy.  This will be the default for the
 # docker image tag if not overridden with imageTag
-agentVersion: 3.2.2
+agentVersion: 3.6.1
 
 # The access token for SignalFx.  REQUIRED
 signalFxAccessToken: ""
@@ -64,7 +64,7 @@ clusterName:
 
 # How frequently to send metrics by default in the agent.  This can be
 # overridden by individual monitors.
-metricIntervalSeconds: 15
+metricIntervalSeconds: 10
 
 # The log level of the agent.  Valid values are 'debug', 'info', 'warn', and
 # 'error'.  Info is a good default and won't be too spamy.  Note that 'debug'