Merge pull request #228 from signalfx/3.1.0-k8s-update

Updating sample configmap from helm

deployments/k8s/configmap.yaml

@@ -52,17 +52,23 @@ data:
     # Collects k8s cluster-level metrics
     - type: kubernetes-cluster
 
-    - type: collectd/docker
+    - type: docker-container-stats
       dockerURL: unix:///var/run/docker.sock
       excludedImages:
-        - ".*pause-amd64.*"
-      dimensions:
-        container_image: inspect:Config.Image
-        container_id: inspect:Id
-        container_spec_name: inspect:Config.Labels['io.kubernetes.container.name']
-        kubernetes_pod_name: inspect:Config.Labels['io.kubernetes.pod.name']
-        kubernetes_pod_uid: inspect:Config.Labels['io.kubernetes.pod.uid']
-        kubernetes_namespace: inspect:Config.Labels['io.kubernetes.pod.namespace']
+       - '*pause-amd64*'
+      labelsToDimensions:
+        io.kubernetes.container.name: container_spec_name
+        io.kubernetes.pod.name: kubernetes_pod_name
+        io.kubernetes.pod.uid: kubernetes_pod_uid
+        io.kubernetes.pod.namespace: kubernetes_namespace
+      metricsToExclude:
+       - metricNames:
+         - 'cpu.usage*'
+         - 'cpu.percent'
+         - 'memory.usage*'
+         - 'memory.percent'
+         - 'blkio.io_service_bytes_recursive.*'
+         negated: true
 
     - type: collectd/activemq
       discoveryRule: container_image =~ "activemq" && private_port == 1099

scripts/latest-release

@@ -11,7 +11,7 @@ strip_pkg() {
   sed -Ee 's/-(deb|rpm)[0-9]+//' <<< $1
 }
 
-tag=$(git describe --abbrev=0 --match 'v[0-9].[0-9].[0-9]*')
+tag=$(git describe --abbrev=0 --match 'v[0-9].[0-9].[0-9]')
 
 if test -z $tag
 then