Skip to content

Commit

Permalink
prepare for 0.6.0 (#183)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rfratto
rfratto authored Sep 4, 2020
1 parent d99cfbb commit 2be7705
Show file tree
Hide file tree
Showing 17 changed files with 228 additions and 110 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ 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.

# v0.6.0 (2020-09-04)

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.

- [FEATURE] The Grafana Cloud Agent can now collect logs and send to Loki. This
is done by embedding Promtail, the official Loki log collection client.
(@rfratto)
Expand Down
8 changes: 4 additions & 4 deletions docs/configuration-reference.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0 \
grafana/agent:v0.6.0 \
--config.file=/etc/agent-config/agent.yaml
```

Expand Down Expand Up @@ -1581,7 +1581,7 @@ metadata:
name: agent
spec:
containers:
- image: grafana/agent:v0.5.0
- image: grafana/agent:v0.6.0
name: agent
args:
- --config.file=/etc/agent-config/agent.yaml
Expand Down Expand Up @@ -1848,7 +1848,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.5.0 \
grafana/agent:v0.6.0 \
--config.file=/etc/agent-config/agent.yaml
```

Expand All @@ -1865,7 +1865,7 @@ metadata:
name: agent
spec:
containers:
- image: grafana/agent:v0.5.0
- image: grafana/agent:v0.6.0
name: agent
args:
- --config.file=/etc/agent-config/agent.yaml
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Currently, there are five ways to install the agent:
### Docker Container

```
docker pull grafana/agent:v0.5.0
docker pull grafana/agent:v0.6.0
```

### Kubernetes Install Script
Expand Down Expand Up @@ -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.5.0
grafana/agent:v0.6.0
```
### Locally
Expand Down
10 changes: 6 additions & 4 deletions docs/maintaining.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ export GPG_TTY=$(tty)
for generating the list (modifying the date to the date of the previous release): `curl https://api.github.com/search/issues?q=repo:grafana/agent+is:pr+"merged:>=2019-08-02" | jq -r ' .items[] | "* [" + (.number|tostring) + "](" + .html_url + ") **" + .user.login + "**: " + .title'`
4. Go through the entire repository and find references to the previous release
version, updating them to reference the new version.
5. *Without creating a tag*, create a commit based on your changes and open a PR
5. Run `make example-kubernetes` and `make example-dashboards` to update
manifests in case they are stale.
6. *Without creating a tag*, create a commit based on your changes and open a PR
for updating the release notes.
6. Merge the changelog PR.
7. Create a new tag for the release.
7. Merge the changelog PR.
8. Create a new tag for the release.
1. After following step 2, the CI will be triggered to create release
artifacts and publish them to a draft release. The tag will be made
publicly available immediately.
Expand All @@ -69,7 +71,7 @@ export GPG_TTY=$(tty)
git tag -s $RELEASE -m "release $RELEASE"
git push origin $RELEASE
```
8. Watch GitHub Actions and wait for all the jobs to finish running.
9. Watch GitHub Actions and wait for all the jobs to finish running.

## Publishing the Release Draft

Expand Down
70 changes: 35 additions & 35 deletions example/docker-compose/grafana/dashboards/agent-operational.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(go_gc_duration_seconds_count{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"}[5m])",
"expr": "rate(go_gc_duration_seconds_count{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -121,10 +121,10 @@
"steppedLine": false,
"targets": [
{
"expr": "go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"}",
"expr": "go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -197,10 +197,10 @@
"steppedLine": false,
"targets": [
{
"expr": "go_goroutines{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"}",
"expr": "go_goroutines{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -273,10 +273,10 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(container_cpu_usage_seconds_total{cluster=~\"$cluster\", pod_name=~\".*grafana-agent.*\"}[5m])",
"expr": "rate(container_cpu_usage_seconds_total{cluster=~\"$cluster\", container=~\"$container\", pod=~\"$pod\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -349,10 +349,10 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_working_set_bytes{cluster=~\"$cluster\", pod_name=~\".*grafana-agent.*\"}",
"expr": "container_memory_working_set_bytes{cluster=~\"$cluster\", container=~\"$container\", pod=~\"$pod\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -513,18 +513,18 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(container_network_receive_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod_name=~\".*grafana-agent.*\"}[5m])",
"expr": "sum by (pod) (rate(container_network_receive_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "RX",
"title": "RX by Pod",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down Expand Up @@ -589,18 +589,18 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(container_network_transmit_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod_name=~\".*grafana-agent.*\"}[5m])",
"expr": "sum by (pod) (rate(container_network_transmit_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "TX",
"title": "TX by Pod",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down Expand Up @@ -677,18 +677,18 @@
"steppedLine": false,
"targets": [
{
"expr": "(sum by (job, instance) (avg_over_time(go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[1m])))\n/\n(sum by (job, instance) (agent_wal_storage_active_series{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}))\n",
"expr": "(sum by (pod) (avg_over_time(go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}[1m])))\n/\n(sum by (pod) (agent_wal_storage_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Bytes/Series/Instance",
"title": "Bytes/Series/Pod",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down Expand Up @@ -753,10 +753,10 @@
"steppedLine": false,
"targets": [
{
"expr": "(sum by (job) (avg_over_time(go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[1m])))\n/\n(sum by (job) (agent_wal_storage_active_series{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}))\n",
"expr": "(sum by (container) (avg_over_time(go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}[1m])))\n/\n(sum by (container) (agent_wal_storage_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"}))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{container}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -829,18 +829,18 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (instance) (agent_wal_storage_active_series{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})",
"expr": "sum by (pod) (agent_wal_storage_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Series/Instance",
"title": "Series/Pod",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down Expand Up @@ -905,10 +905,10 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (instance_name) (agent_wal_storage_active_series{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})",
"expr": "sum by (instance_group_name) (agent_wal_storage_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance_name}}",
"legendFormat": "{{instance_group_name}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -981,10 +981,10 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (agent_wal_storage_active_series{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})",
"expr": "sum by (container) (agent_wal_storage_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", pod=~\"$pod\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}}",
"legendFormat": "{{container}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -1111,11 +1111,11 @@
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
"label": "job",
"label": "container",
"multi": true,
"name": "job",
"name": "container",
"options": [ ],
"query": "label_values(agent_build_info, job)",
"query": "label_values(agent_build_info, container)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand All @@ -1126,7 +1126,7 @@
"useTags": false
},
{
"allValue": null,
"allValue": "grafana-agent-.*",
"current": {
"selected": true,
"text": "All",
Expand All @@ -1135,11 +1135,11 @@
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
"label": "instance",
"label": "pod",
"multi": true,
"name": "instance",
"name": "pod",
"options": [ ],
"query": "label_values(agent_build_info, instance)",
"query": "label_values(agent_build_info{container=~\"$container\"}, pod)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand Down
Loading

0 comments on commit 2be7705

Please sign in to comment.