prepare for 0.6.1 release (#191)

* prepare for 0.6.1 release

* add deadlock fix to changelog

CHANGELOG.md

@@ -4,12 +4,21 @@ NOTE: FreeBSD builds will not be included for this release. There is a bug in an
 upstream library preventing cross-compilation of the Grafana Cloud Agent for
 this platform. FreeBSD builds will return in a future release.
 
-- [BUGFIX] Fix issue where build information was empty when running the Agent 
+# v0.6.1 (2020-04-11)
+
+NOTE: FreeBSD builds will not be included for this release. There is a bug in an
+upstream library preventing cross-compilation of the Grafana Cloud Agent for
+this platform. FreeBSD builds will return in a future release.
+
+- [BUGFIX] Fix issue where build information was empty when running the Agent
   with --version. (@rfratto)
 
-- [BUGFIX] Fix issue where updating a config in the scraping service may fail to 
+- [BUGFIX] Fix issue where updating a config in the scraping service may fail to
   pick up new targets. (@rfratto)
 
+- [BUGFIX] Fix deadlock that slowly prevents the Agent from scraping targets at
+  a high scrape volume. (@rfratto)
+
 # v0.6.0 (2020-09-04)
 
 NOTE: FreeBSD builds will not be included for this release. There is a bug in an

docs/configuration-reference.md

@@ -1541,7 +1541,7 @@ docker run \
   -v "/proc:/host/proc:ro,rslave" \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
-  grafana/agent:v0.6.0 \
+  grafana/agent:v0.6.1 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -1581,7 +1581,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.6.0
+  - image: grafana/agent:v0.6.1
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml
@@ -1847,7 +1847,7 @@ docker run \
   -v "/proc:/proc:ro" \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
-  grafana/agent:v0.6.0 \
+  grafana/agent:v0.6.1 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -1864,7 +1864,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.6.0
+  - image: grafana/agent:v0.6.1
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml
@@ -1941,8 +1941,8 @@ Full reference of options:
   [recheck_on_scrape: <boolean> | default = false]
 
   # A collection of matching rules to use for deciding which processes to
-  # monitor. Each config can match multiple processes to be tracked as a single 
-  # process "group." 
+  # monitor. Each config can match multiple processes to be tracked as a single
+  # process "group."
   process_names:
     [- <process_matcher_config>]
 ```
@@ -1951,10 +1951,10 @@ Full reference of options:
 
 ```yaml
 # The name to use for identifying the process group name in the metric. By
-# default, it uses the base path of the executable. 
+# default, it uses the base path of the executable.
 #
 # The following template variables are available:
-# 
+#
 # - {{.Comm}}:      Basename of the original executable from /proc/<pid>/stat
 # - {{.ExeBase}}:   Basename of the executable from argv[0]
 # - {{.ExeFull}}:   Fully qualified path of the executable
@@ -1967,7 +1967,7 @@ Full reference of options:
 #                   with PID as PIDS get reused over time.
 [name: <string> | default = "{{.ExeBase}}"]
 
-# A list of strings that match the base executable name for a process, truncated 
+# A list of strings that match the base executable name for a process, truncated
 # at 15 characters. It is derived from reading the second field of
 # /proc/<pid>/stat minus the parens.
 #
@@ -1976,16 +1976,16 @@ comm:
   [- <string>]
 
 # A list of strings that match argv[0] for a problem. If there are no slashes,
-# only the basename of argv[0] needs to match. Otherwise the name must be an 
+# only the basename of argv[0] needs to match. Otherwise the name must be an
 # exact match. For example, "postgres" may match any postgres binary but
 # "/usr/local/bin/postgres" can only match a postgres at that path exactly.
 #
 # If any of the strings match, the process will be tracked.
 exe:
   [- <string>]
 
-# A list of regular expressions applied to the argv of the process. Each 
-# regex here must match the corresponding argv for the process to be tracked. 
+# A list of regular expressions applied to the argv of the process. Each
+# regex here must match the corresponding argv for the process to be tracked.
 # The first element that is matched is argv[1].
 #
 # Regex Captures are added to the .Matches map for use in the name.

docs/getting-started.md

@@ -46,7 +46,7 @@ Currently, there are five ways to install the agent:
 ### Docker Container
 
 ```
-docker pull grafana/agent:v0.6.0
+docker pull grafana/agent:v0.6.1
 ```
 
 ### Kubernetes Install Script
@@ -252,7 +252,7 @@ path of your Agent's YAML configuration file.
 docker run \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
-  grafana/agent:v0.6.0
+  grafana/agent:v0.6.1
 ```
 
 ### Locally

example/docker-compose/agent/config/agent.yaml

@@ -14,36 +14,32 @@ prometheus:
             - targets: ['127.0.0.1:12345']
               labels:
                 cluster: 'docker_compose'
-                origin: 'agent'
                 container: 'agent'
+                pod: 'grafana-agent-local'
         - job_name: cortex_scrape
           static_configs:
             - targets: ['cortex:9009']
               labels:
                 cluster: 'docker_compose'
-                origin: 'agent'
                 container: 'cortex'
 
         - job_name: avalanche-1
           static_configs:
             - targets: ['avalanche-1:9001']
               labels:
                 cluster: 'docker_compose'
-                origin: 'agent'
                 container: 'avalanche-1'
         - job_name: avalanche-2
           static_configs:
             - targets: ['avalanche-2:9001']
               labels:
                 cluster: 'docker_compose'
-                origin: 'agent'
                 container: 'avalanche-2'
         - job_name: avalanche-3
           static_configs:
             - targets: ['avalanche-3:9001']
               labels:
                 cluster: 'docker_compose'
-                origin: 'agent'
                 container: 'avalanche-3'
 
       remote_write:

example/docker-compose/agent/instance-configs/agents.yaml

@@ -6,21 +6,21 @@ scrape_configs:
       - targets: ['agent-1:12345']
         labels:
           cluster: 'docker_compose'
-          origin: 'agent'
           container: 'agent-1'
+          pod: 'grafana-agent-1'
   - job_name: agent-2
     static_configs:
       - targets: ['agent-2:12345']
         labels:
           cluster: 'docker_compose'
-          origin: 'agent'
           container: 'agent-2'
+          pod: 'grafana-agent-2'
   - job_name: agent-3
     static_configs:
       - targets: ['agent-3:12345']
         labels:
           cluster: 'docker_compose'
-          origin: 'agent'
           container: 'agent-3'
+          pod: 'grafana-agent-3'
 remote_write:
   - url: http://cortex:9009/api/prom/push

example/docker-compose/docker-compose.yaml

@@ -15,7 +15,7 @@ services:
 
   loki:
     image: grafana/loki:1.5.0
-    ports: 
+    ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
 
@@ -44,17 +44,6 @@ services:
     ports:
       - "3000:3000"
 
-  #
-  # Launch a Prometheus just for comparison against the Agent
-  #
-  # prometheus:
-  # image: prom/prometheus:latest
-  # volumes:
-  #   - ./prometheus/config/prometheus.yml:/etc/prometheus.yaml
-  # entrypoint:
-  #   - /bin/prometheus
-  #   - --config.file=/etc/prometheus.yaml
-
   #
   # Launch avalanche instances with a relatively low churn rate
   #

production/README.md

@@ -35,7 +35,7 @@ docker run \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
   --entrypoint "/bin/agent -config.file=/etc/agent-config/agent.yaml -prometheus.wal-directory=/etc/agent/data"
-  grafana/agent:v0.6.0
+  grafana/agent:v0.6.1
 ```
 
 ## Running the Agent locally
@@ -79,9 +79,9 @@ Then put this in `environments/default/main.jsonnet`:
 local agent = import 'grafana-agent/grafana-agent.libsonnet';
 
 agent {
-	_config+:: {
-		namespace: 'grafana-agent'
-	},
+  _config+:: {
+    namespace: 'grafana-agent'
+  },
 }
 ```
 

production/kubernetes/README.md

@@ -28,8 +28,8 @@ Here's a two-line script to copy and paste to install the Agent on
 Kubernetes for collecting metrics and logs (requires `envsubst` (GNU gettext)):
 
 ```
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/grafana/agent/v0.6.0/production/kubernetes/install.sh)" | kubectl -ndefault apply -f -
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/grafana/agent/v0.6.0/production/kubernetes/install-loki.sh)" | kubectl -ndefault apply -f -
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/grafana/agent/release/production/kubernetes/install.sh)" | kubectl -ndefault apply -f -
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/grafana/agent/release/production/kubernetes/install-loki.sh)" | kubectl -ndefault apply -f -
 ```
 
 ## Manually Applying
@@ -51,17 +51,17 @@ the installation script does:
 
   2. Replace `${REMOTE_WRITE_PASSWORD}` or `${LOKI_PASSWORD}` with the password
      for authentication against the remote API. If you do not need
-     authentication, remove the entire authentication section. 
+     authentication, remove the entire authentication section.
 
   3. If you did not remove the authentication section from the previous step,
      replace `${REMOTE_WRITE_USERNAME}` or `${LOKI_USERNAME}` with the username
      used to connect to the remote API.
 
 3. Apply the modified manifest file: `kubectl -ndefault apply -f manifest.yaml`.
 
-## Rebuilding the manifests 
+## Rebuilding the manifests
 
-The manifests provided are created using Grafana Labs' production 
+The manifests provided are created using Grafana Labs' production
 [Tanka configs](../tanka/grafana-agent) with some default values. If you want to
 build the YAML file with some custom values, you will need the following pieces
 of software installed:

production/kubernetes/agent-bare.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: grafana-agent
+  namespace: default
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -42,6 +43,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: grafana-agent
+  namespace: default
 spec:
   minReadySeconds: 10
   selector:
@@ -61,7 +63,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/agent:v0.6.0
+        image: grafana/agent:v0.6.1
         imagePullPolicy: IfNotPresent
         name: agent
         ports:

production/kubernetes/agent-loki.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: grafana-agent-logs
+  namespace: default
 ---
 apiVersion: v1
 data:
@@ -322,7 +323,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/agent:v0.6.0
+        image: grafana/agent:v0.6.1
         imagePullPolicy: IfNotPresent
         name: agent
         ports: