Skip to content

Commit

Permalink
Merge branch 'main' into otel-awsfirehose
Browse files Browse the repository at this point in the history
  • Loading branch information
clayton-cornell authored Jan 31, 2024
2 parents f08c106 + 73253f7 commit a9ab0f4
Showing 531 changed files with 14,083 additions and 10,867 deletions.
112 changes: 1 addition & 111 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
@@ -119,24 +119,6 @@ trigger:
type: docker
---
kind: pipeline
name: Test manifests
platform:
arch: amd64
os: linux
steps:
- commands:
- make generate-manifests
- ERR_MSG="The environment manifests are out of date. Please run 'make generate-manifests'
and commit changes!"
- if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi
image: grafana/agent-build-image:0.30.4
name: Regenerate environment manifests
trigger:
event:
- pull_request
type: docker
---
kind: pipeline
name: Test
platform:
arch: amd64
@@ -1055,94 +1037,6 @@ volumes:
name: docker
---
kind: pipeline
name: Publish Linux smoke container
platform:
arch: amd64
os: linux
steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/agent-build-image:0.30.4
name: Configure QEMU
volumes:
- name: docker
path: /var/run/docker.sock
- commands:
- mkdir -p $HOME/.docker
- printenv GCR_CREDS > $HOME/.docker/config.json
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- docker buildx create --name multiarch-agent-smoke-${DRONE_COMMIT_SHA} --driver
docker-container --use
- ./tools/ci/docker-containers smoke
- docker buildx rm multiarch-agent-smoke-${DRONE_COMMIT_SHA}
environment:
DOCKER_LOGIN:
from_secret: docker_login
DOCKER_PASSWORD:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/agent-build-image:0.30.4
name: Publish container
volumes:
- name: docker
path: /var/run/docker.sock
trigger:
ref:
- refs/heads/main
- refs/tags/v*
type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
---
kind: pipeline
name: Publish Linux crow container
platform:
arch: amd64
os: linux
steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/agent-build-image:0.30.4
name: Configure QEMU
volumes:
- name: docker
path: /var/run/docker.sock
- commands:
- mkdir -p $HOME/.docker
- printenv GCR_CREDS > $HOME/.docker/config.json
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- docker buildx create --name multiarch-agent-crow-${DRONE_COMMIT_SHA} --driver
docker-container --use
- ./tools/ci/docker-containers crow
- docker buildx rm multiarch-agent-crow-${DRONE_COMMIT_SHA}
environment:
DOCKER_LOGIN:
from_secret: docker_login
DOCKER_PASSWORD:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/agent-build-image:0.30.4
name: Publish container
volumes:
- name: docker
path: /var/run/docker.sock
trigger:
ref:
- refs/heads/main
- refs/tags/v*
type: docker
volumes:
- host:
path: /var/run/docker.sock
name: docker
---
kind: pipeline
name: Publish Windows agent container
platform:
arch: amd64
@@ -1205,8 +1099,6 @@ depends_on:
- Publish Linux agent-boringcrypto container
- Publish Linux agentctl container
- Publish Linux agent-operator container
- Publish Linux smoke container
- Publish Linux crow container
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -1266,8 +1158,6 @@ depends_on:
- Publish Linux agent-boringcrypto container
- Publish Linux agentctl container
- Publish Linux agent-operator container
- Publish Linux smoke container
- Publish Linux crow container
- Publish Windows agent container
- Publish Windows agentctl container
image_pull_secrets:
@@ -1427,6 +1317,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 28ba52df6f22c10bf77a95386a49aff65a1c372127f7d89489ac2d3ee02ce618
hmac: b4b3bb3578124bba1758f323695216281365054c623738d38e51cc37125277ae

...
8 changes: 4 additions & 4 deletions .drone/pipelines/publish.jsonnet
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ local ghTokenFilename = '/drone/src/gh-token.txt';
// job_names gets the list of job names for use in depends_on.
local job_names = function(jobs) std.map(function(job) job.name, jobs);

local linux_containers = ['agent','agent-boringcrypto', 'agentctl', 'agent-operator', 'smoke', 'crow'];
local linux_containers = ['agent', 'agent-boringcrypto', 'agentctl', 'agent-operator'];
local linux_containers_jobs = std.map(function(container) (
pipelines.linux('Publish Linux %s container' % container) {
trigger: {
@@ -163,8 +163,8 @@ linux_containers_jobs + windows_containers_jobs + [
GITHUB_APP_PRIVATE_KEY: secrets.updater_private_key.fromSecret,
},
commands: [
'/usr/bin/github-app-external-token > %s' % ghTokenFilename
]
'/usr/bin/github-app-external-token > %s' % ghTokenFilename,
],
},
{
name: 'Publish release',
@@ -188,7 +188,7 @@ linux_containers_jobs + windows_containers_jobs + [
VERSION=${DRONE_TAG} RELEASE_DOC_TAG=$(echo ${DRONE_TAG} | awk -F '.' '{print $1"."$2}') ./tools/release
|||,
],
}
},
],
volumes: [{
name: 'docker',
17 changes: 0 additions & 17 deletions .drone/pipelines/test.jsonnet
Original file line number Diff line number Diff line change
@@ -50,23 +50,6 @@ local pipelines = import '../util/pipelines.jsonnet';
}],
},

pipelines.linux('Test manifests') {
trigger: {
event: ['pull_request'],
},
steps: [{
name: 'Regenerate environment manifests',
image: build_image.linux,

commands: [
'make generate-manifests',
'ERR_MSG="The environment manifests are out of date. Please run \'make generate-manifests\' and commit changes!"',
// "git status --porcelain" reports if there's any new, modified, or deleted files.
'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
],
}],
},

pipelines.linux('Test') {
trigger: {
event: ['pull_request'],
95 changes: 90 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -10,18 +10,98 @@ internal API changes are not present.
Main (unreleased)
-----------------

### Breaking changes

- Prohibit the configuration of services within modules. (@wildum)

- For `otelcol.exporter` components, change the default value of `disable_high_cardinality_metrics` to `true`. (@ptodev)

### Features

- A new `discovery.process` component for discovering Linux OS processes on the current host. (@korniltsev)

- A new `pyroscope.java` component for profiling Java processes using async-profiler. (@korniltsev)

- A new `otelcol.processor.resourcedetection` component which inserts resource attributes
to OTLP telemetry based on the host on which Grafana Agent is running. (@ptodev)

### Enhancements

- Include line numbers in profiles produced by `pyrsocope.java` component. (@korniltsev)
- Add an option to the windows static mode installer for expanding environment vars in the yaml config. (@erikbaranowski)
- Add authentication support to `loki.source.awsfirehose` (@sberz)

- Sort kubelet endpoint to reduce pressure on K8s's API server and watcher endpoints. (@hainenber)

- Expose `physical_disk` collector from `windows_exporter` v0.24.0 to
Flow configuration. (@hainenber)

- Renamed Grafana Agent Mixin's "prometheus.remote_write" dashboard to
"Prometheus Components" and added charts for `prometheus.scrape` success rate
and duration metrics. (@thampiotr)

- Removed `ClusterLamportClockDrift` and `ClusterLamportClockStuck` alerts from
Grafana Agent Mixin to focus on alerting on symptoms. (@thampiotr)

- Increased clustering alert periods to 10 minutes to improve the
signal-to-noise ratio in Grafana Agent Mixin. (@thampiotr)

- `mimir.rules.kubernetes` has a new `prometheus_http_prefix` argument to configure
the HTTP endpoint on which to connect to Mimir's API. (@hainenber)

- `service_name` label is inferred from discovery meta labels in `pyroscope.java` (@korniltsev)

### Bugfixes

- Fix an issue in `remote.s3` where the exported content of an object would be an empty string if `remote.s3` failed to fully retrieve
the file in a single read call. (@grafana/agent-squad)

- Utilize the `instance` Argument of `prometheus.exporter.kafka` when set. (@akhmatov-s)

- Fix a duplicate metrics registration panic when sending metrics to an static
mode metric instance's write handler. (@tpaschalis)

- Fix issue causing duplicate logs when a docker target is restarted. (@captncraig)

- Fix an issue where blocks having the same type and the same label across
modules could result in missed updates. (@thampiotr)

### Other changes

- Removed support for Windows 2012 in line with Microsoft end of life. (@mattdurham)

- Split instance ID and component groupings into separate panels for `remote write active series by component` in the Flow mixin. (@tristanburgess)

- Updated dependency to add support for Go 1.22 (@stefanb)

v0.39.2 (2024-1-31)
--------------------

### Bugfixes

- Fix error introduced in v0.39.0 preventing remote write to Amazon Managed Prometheus. (@captncraig)

- An error will be returned in the converter from Static to Flow when `scrape_integration` is set
to `true` but no `remote_write` is defined. (@erikbaranowski)


v0.39.1 (2024-01-19)
--------------------

### Security fixes

- Fixes following vulnerabilities (@hainenber)
- [GO-2023-2409](https://github.com/advisories/GHSA-mhpq-9638-x6pw)
- [GO-2023-2412](https://github.com/advisories/GHSA-7ww5-4wqc-m92c)
- [CVE-2023-49568](https://github.com/advisories/GHSA-mw99-9chc-xw7r)

### Bugfixes

- Fix performance issue where perf lib where clause was not being set, leading to timeouts in collecting metrics for windows_exporter. (@mattdurham)
- Fix issue where installing the Windows Agent Flow installer would hang then crash. (@mattdurham)

v0.39.0-rc.0 (2024-01-05)
-------------------------

v0.39.0 (2024-01-09)
--------------------

### Breaking changes

@@ -43,8 +123,6 @@ v0.39.0-rc.0 (2024-01-05)

- A new `discovery.ovhcloud` component for discovering scrape targets on OVHcloud. (@ptodev)

### Features

- Allow specifying additional containers to run. (@juangom)

### Enhancements
@@ -74,6 +152,7 @@ v0.39.0-rc.0 (2024-01-05)
- `otelcol.receiver.prometheus` does not drop histograms without buckets anymore. (@wildum)

- Added exemplars support to `otelcol.receiver.prometheus`. (@wildum)

- `mimir.rules.kubernetes` may now retry its startup on failure. (@hainenber)

- Added links between compatible components in the documentation to make it
@@ -98,11 +177,15 @@ v0.39.0-rc.0 (2024-01-05)
- Add `max_cache_size` to `prometheus.relabel` to allow configurability instead of hard coded 100,000. (@mattdurham)

- Add support for `http_sd_config` within a `scrape_config` for prometheus to flow config conversion. (@erikbaranowski)

- `discovery.lightsail` now supports additional parameters for configuring HTTP client settings. (@ptodev)
- Add `sample_age_limit` to remote_write config to drop samples older than a specified duration. (@marctc)

- Handle paths in the Kubelet URL for `discovery.kubelet`. (@petewall)

- `loki.source.docker` now deduplicates targets which report the same container
ID. (@tpaschalis)

### Bugfixes

- Update `pyroscope.ebpf` to fix a logical bug causing to profile to many kthreads instead of regular processes https://github.com/grafana/pyroscope/pull/2778 (@korniltsev)
@@ -121,6 +204,8 @@ v0.39.0-rc.0 (2024-01-05)

- Fix issue where `prometheus.exporter.kafka` would crash when configuring `sasl_password`. (@rfratto)

- Fix performance issue where perf lib where clause was not being set, leading to timeouts in collecting metrics for windows_exporter. (@mattdurham)

- Fix nil panic when using the process collector with the windows exporter. (@mattdurham)

### Other changes
Loading

0 comments on commit a9ab0f4

Please sign in to comment.