Merge branch 'main' of github.com:grafana/agent

.github/depcheck.yml

@@ -5,7 +5,7 @@ go_modules:
   - github.com/grafana/loki
   - github.com/justwatchcom/elasticsearch_exporter
   - github.com/oliver006/redis_exporter
-  - github.com/prometheus/consul_exporter 
+  - github.com/prometheus/consul_exporter
   - github.com/prometheus/memcached_exporter
   - github.com/prometheus/statsd_exporter
   - github.com/weaveworks/common
@@ -21,5 +21,5 @@ github_repos:
   - github.com/google/dnsmasq_exporter v0.2.0
   - github.com/ncabatoff/process-exporter v0.7.5
   - github.com/prometheus/mysqld_exporter v0.12.1
-  - github.com/prometheus/prometheus v2.21.0
+  - github.com/prometheus/prometheus v2.26.0
   - github.com/wrouesnel/postgres_exporter v0.8.0

.github/stale.yml

@@ -8,6 +8,7 @@ daysUntilClose: 7
 exemptLabels:
   - keepalive
   - proposal
+  - outdated-dependency
 
 # Label to use to identify a stale issue
 staleLabel: stale

.gitignore

@@ -9,3 +9,5 @@ cover*.out
 cmd/agent/agent
 cmd/agentctl/agentctl
 dist/
+
+.DS_Store

.golangci.yml

@@ -62,5 +62,13 @@ linters:
     - typecheck
 
 issues:
+  # golangci-lint excludes some stuff we want by default (i.e., proper go-style comments).
+  # We exclude the defaults and then manually exclude the subset of defaults we truly don't
+  # care about.
+  exclude-use-default: false
+
   exclude:
-    - Error return value of .*.Log\x60 is not checked
+    # EXC0001 errcheck: Almost all programs ignore errors on these functions
+    # and in most cases it's ok. This is copied from the golangci-lint defaults
+    # mut modified to include go-kit logging.
+    - Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv|.*\.Log). is not checked

ADOPTERS.md

@@ -1,4 +1,4 @@
-This is the list of organizations, organized alphebetically, that are using the Grafana Cloud Agent in 
+This is the list of organizations, organized alphebetically, that are using the Grafana Agent in
 production environments. Please send PRs to add or remove organizations.
 
 * [AB Tasty](https://www.abtasty.com/)

CHANGELOG.md

@@ -1,30 +1,115 @@
 NOTE: FreeBSD builds have not been available since v0.6.0 due to a
-cross-compilation issue. The issue for tracking adding support back
-can be found at [#317](https://github.com/grafana/agent/issues/317).
+cross-compilation issue, but will return in v0.13.0.
 
 # Main (unreleased)
 
+- [BUGFIX] Ensure defaults are applied to undefined sections in config file.
+  This fixes a problem where integrations didn't work if `prometheus:` wasn't
+  configured. (@rfratto)
+
+# 0.14.0-rc.3 (2021-04-15)
+
+- [ENHANCEMENT] Add  `headers` field in `remote_write` config for Tempo. `headers`
+  specifies HTTP headers to forward to the remote endpoint. (@alexbiehl)
+- [CHANGE] Add `tempo_spanmetrics` namespace in spanmetrics (@mapno)
+
+- [BUGFIX] Grafana Agent running as a Windows service should start automatically on startup
+  (@mattdurham)
+
+- [BUGFIX] Validate that incoming scraped metrics do not have an empty label
+  set or a label set with duplicate labels, mirroring the behavior of
+  Prometheus. (@rfratto)
+
+- [FEATURE] Tail-based sampling for tracing pipelines (@mapno)
+
+# v0.13.1 (2021-04-09)
+
+- [BUGFIX] Validate that incoming scraped metrics do not have an empty label
+  set or a label set with duplicate labels, mirroring the behavior of
+  Prometheus. (@rfratto)
+
+# 0.14.0-rc.2 (2021-04-08)
+
+- [BUGFIX] Include Windows Installer when building for release (@mattdurham)
+
+# 0.14.0-rc.1 (2021-04-08)
+
+(No changes from 0.14.0-rc.0)
+
+# 0.14.0-rc.0 (2021-04-07)
+
+BREAKING CHANGES: This release has a breaking change for SigV4 support. Please
+read the release notes carefully and our [migration
+guide](./docs/migration-guide.md) to help migrate your configuration files to
+the new format.
+
+As of this release, functionality that is not recommended for production use
+and is expected to change will be tagged interchangably as "experimental" or
+"beta."
+
+- [FEATURE] (beta) New integration: windows_exporter (@mattdurham)
+
+- [FEATURE] (beta) Grafana Agent Windows Installer is now included as a release
+  artifact. (@mattdurham)
+
 - [FEATURE] Official M1 Mac release builds will now be generated! Look for
   `agent-darwin-arm64` and `agentctl-darwin-arm64` in the release assets.
   (@rfratto)
 
+- [FEATURE] Add support for running as a Windows service (@mattdurham)
+
+- [FEATURE] (beta) Add /-/reload support. It is not recommended to invoke
+  `/-/reload` against the main HTTP server. Instead, two new command-line flags
+  have been added: `--reload-addr` and `--reload-port`. These will launch a
+  `/-/reload`-only HTTP server that can be used to safely reload the Agent's
+  state.  (@rfratto)
+
+- [FEATURE] Add a /-/config endpoint. This endpoint will return the current
+  configuration file with defaults applied that the Agent has loaded from disk.
+  (@rfratto)
+
+- [FEATURE] (beta) Support generating metrics and exposing them via a Prometheus exporter
+  from span data. (@yeya24)
+
 - [ENHANCEMENT] Support compression for trace export. (@mdisibio)
 
-- [ENHANCEMENT] Allow Prometheus URL configuration to propagate to instances and integrations, if not given. (@mattdurham)
+- [ENHANCEMENT] Add global remote_write configuration that is shared between all
+  instances and integrations. (@mattdurham)
 
 - [ENHANCEMENT] Go 1.16 is now used for all builds of the Agent. (@rfratto)
 
+- [ENHANCEMENT] Update Prometheus dependency to v2.26.0. (@rfratto)
+
 - [BUGFIX] Native Darwin arm64 builds will no longer crash when writing metrics
   to the WAL. (@rfratto)
 
 - [BUGFIX] Remote write endpoints that never function across the lifetime of the
   Agent will no longer prevent the WAL from being truncated. (@rfratto)
 
+- [BUGFIX] Bring back FreeBSD support. (@rfratto)
+
+- [BUGFIX] agentctl will no longer leak WAL resources when retrieving WAL stats. (@rfratto)
+
+- [CHANGE] The Grafana Cloud Agent has been renamed to the Grafana Agent.
+  (@rfratto)
+
 - [CHANGE] Instance configs uploaded to the Config Store API will no longer be
   stored along with the global Prometheus defaults. This is done to allow
   globals to be updated and re-apply the new global defaults to the configs from
   the Config Store. (@rfratto)
 
+- [CHANGE] The User-Agent header sent for logs will now be
+  `GrafanaAgent/<version>` (@rfratto)
+
+- [ENHANCEMENT] Upgrade `go.opentelemetry.io/collector` to v0.21.0 (@mapno)
+
+- [ENHANCEMENT] Add kafka trace receiver (@mapno)
+
+- [ENHANCEMENT] Support mirroring a trace pipeline to multiple backends (@mapno)
+
+- [DEPRECATION] `push_config` is now supplanted by `remote_block` and `batch`.
+  `push_config` will be removed in a future version (@mapno)
+
 # v0.13.0 (2021-02-25)
 
 The primary branch name has changed from `master` to `main`. You may have to
@@ -303,7 +388,7 @@ files to the new format.
 
 # v0.6.0 (2020-09-04)
 
-- [FEATURE] The Grafana Cloud Agent can now collect logs and send to Loki. This
+- [FEATURE] The Grafana Agent can now collect logs and send to Loki. This
   is done by embedding Promtail, the official Loki log collection client.
   (@rfratto)
 

CODEOWNERS

@@ -0,0 +1 @@
+/pkg/tempo/ @joe-elliott @mapno

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at conduct@grafana.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq