Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Merge main into dev.metrics-v2 - #1169

Merged
rfratto merged 102 commits into
dev.metrics-v2from
main
Dec 15, 2021
Merged

Merge main into dev.metrics-v2#1169
rfratto merged 102 commits into
dev.metrics-v2from
main

Conversation

@rfratto

@rfratto rfratto commented Dec 15, 2021

Copy link
Copy Markdown
Contributor

Very old dev branch needs updating :)

rfratto and others added 30 commits August 30, 2021 15:56
* register missing metric for configstore consul list duration

* rename metric

* rename metric (operation type is a label)
* alias `prometheus` as `metrics` and note deprecation

* changelog/upgrade guide

* defensively ensure defaults are loaded in to deprecated prometheus
struct
* Add namespace to some queries which were missing it

* Move samples queries to samples row, update to current metric names, and allow some graphs to work with multiple instance groups

* Update example dashboards with changes

* Rename panel to match metric
…d use background context (#876)

* Honor config reshard timeout, remove timeout for lifecycle and instead use background check.

* Added timeout and background refresh

* add debugging information around deadline

* add debugging information around deadline, add new setting for timeouts, and use that timeout

* Fix cancel and refresh->reshard naming

* Catch cancel if not joining.

* Catch cancel if not joining.

* Make the linter happy

* Change comments.

* Changes recommended from PR, most importantly is moving the goroutine to the reshard instead of the caller to reshard.

* Fix changelog

* Match err with log.

* Move mutex inside goroutine

* Update changelog with 877 fix

* Revert to previous behavior
* refresh queue, remove mut

* fix logs

* more logs!

* how many logs can i add?

* how many logs can i change?

* more logging

* changelog
* poc smoke test automation

* finish smoke test environment

* debug logs

* fix typo, sync immediately

* add crow, add crow-related alerts

* have v0 and v1 libs use v2 lib

* basic cpu, memory tests

* fix chaos_loop to stop generating replica -3 which will never exist

* Add initial documentation for crow.

* update comments

* Add uml

* Cleanup documentation

* Reformate/move docs

* Fix some verbiage

* Fix doc checking

* Update cmd/grafana-agent-crow/README.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

* Small nits

* Fix pathing in readme

Co-authored-by: Matt Durham <mattdurham@ppog.org>
* Move port to load_balancing config as receiver_port

When extracting load balancing from tail sampling,
only the the load_balancing block was moved into its own block,
but the receiver's port was left in tail_sampling.

This means that the receiver port for load_balancing could not
be configured without tail_sampling.

Now its moved to load_balancing as receiver_port.

* Load balance without tail sampling

* Move port up
* Containerize merges to development branches

* Update drone.yml

Updated drone signature

Co-authored-by: mattdurham <mattdurham@ppog.org>
* ensure reshards are scheduled every reshard_interval

* use single metric for config changed events

* logs
* prepare for 0.18.4 release

* include #831
#906)

This avoids e.g. logging a warning when a target is intentionally dropped
Update `## Deploy GrafanaAgent` section to include additional kubelet metrics.  Reason:  When checking the metrics sent to Grafana Cloud, we noticed that some of kubelet metrics (cpu/memory usage) was missing.  On the agent, we are using the backwards compatibility with the Prometheus Operator CRDs ServiceMonitor and PodMonitor , so that metric instance discovery is exactly as it is with our hosted prometheus.
* Initial run through on changing tempo -> traces

* Second run through of changing tempo->traces

* Update changelog

* Fix dead link

* Clean up readme

* Clean up changelog

* Rename to fit pattern

* Fix k8s build

* Change to deprecate instead of enhancement, make tests and implement backwards compatibility

* Rename traces config until aliasing is known

* update to tempo-config

* PR feedback

* Update doc
* Convert RBAC api version from /v1beta1 to stable /v1

From the documentation: RBAC resources

The rbac.authorization.k8s.io/v1beta1 API version of ClusterRole, ClusterRoleBinding, Role, and RoleBinding is no longer served as of v1.22.

Migrate manifests and API clients to use the rbac.authorization.k8s.io/v1 API version, available since v1.8.
All existing persisted objects are accessible via the new APIs

* Update jsonnet lib alpha-1.14 to stable-1.21

* Update changelog

* Sync of vendor files
* Show targets by pod

* Switch active series back to appended samples

* Add a new samples rate panel

* 1hour time range and 30s refresh for dashboards

* Update example dashboards with changes

* Add the agent-operational dashboard to the mixin
* docs & tanka changes for s/loki/logs rename

* add alias for logs-config

* remove aliasing
* Set default scrape_interval to 1m

* Add envsubst to drone

* Update changelog
* Making configurable what method is used when adding k/v to spans

* Remove weird diff

* Remove new nesting

* Add operationType validation

* CHANGELOG
* rename prometheus to metrics in docs / jsonnet

* oops
* Add note about using backslashes and backticks

We need to note users about using backslashes in agent config file, and about not supported backticks too.
Also I've added error messages text for quicker finding the solution by error text.

* More detailed info about backslashes in regex
* Update changelog, versioning and some errors that slipped through

* update path correctly

* Updated the memory test with @rfratto suggestion to up the avalanche parameters to not get preemptive errors on memory.
* Update changelog, versioning and some errors that slipped through

* update path correctly

* Updated the memory test with @rfratto suggestion to up the avalanche parameters to not get preemptive errors on memory.

* Use correct package name for envsubst

* Use correct package name for envsubst
mapno and others added 23 commits November 15, 2021 14:30
* update github.com/go-kit/kit to v0.12.0

* node_exporter integration: fix build error on non-linux GOOS

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
* Reorg agent operator docs
* Update CHANGELOG.md
* Document new options

* Add tests and fix logic

* Changelog

* lint

* Moar fixes

* Remove noisy log

* Ups, clean up println

* Better naming
* Fix parsePostgresURL issue

* Update Implementation and fix unit test

* Add nolint and fix unit test

* Update changelog

* move changelog entry to unreleased

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
* adding the logger to statsd exporter mapper

* Updating changelog

* Fixing typo in changelog

* update statsd_exporter to include registry fix

Fixes #1002

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Prefer "removed" over "fully deprecated"

Fixes #1000
…1119)

This avoids noisy logs when someone uses the agent only for logs/traces.

Fixes #735
* Setup CD for agent

This deploys agent to dev on a merge to main.

Depends on https://github.com/grafana/deployment_tools/pull/19936

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Update config and drone hash

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Hopefully final changes

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Finally make it work!

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
* fix relref link

* Update docs/scraping-service/_index.md

Co-authored-by: Mario <mariorvinas@gmail.com>

Co-authored-by: Mario <mariorvinas@gmail.com>
* Improve k8s pod association

* Add tests

* Changelog

* typo

* Add prom_sd_pod_association

* Extend tests for pod associations

* Docs for pod association config

* Lint fixes

* Move to unreleased

* Add instrumentation recommendations

* Remove uncessary constants

* Improve tests
* sample remote config code with http provider

* use t.TempDir() in unit test

* no need to clean up after T.TempDir()

* use NewClientFromConfig and make caller responsible for calling SetDirectory

* handle nil HTTPClientConfig

* remove blank identifier assignment

* pass basic auth command line flags for remote config

* address pr nits

* add expiremental flag

* set loader inline

* update changelog

* add remote config section in docs

* pr comment updates
* Add secret type to sensitive values

* Break out config tests to their own implementation. Also remove username has a sensitive value.

* Update changelog

* Fix failing test

* Scrub secrets when marshaling instance configs

* update for v0.21

* Updated changes from the merge.

* Remove changelog

* Scrub out receivers has ***receivers_scrubber***:null

* obscure etcd/consul credentials

* Update pkg/traces/config_test.go

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update pkg/config/config.go

* go fmt

* Change to using custom object and return <secret>

* Fix bad merge

* [v0.21.2] toggle config endpoint (#19)

* disable /-/config endpoint by default

* disable scraping api get endpoint as well

* fix new test

* add test and rename flag

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

* Update version to v0.21.2

* Update defaults.go

* fix /-/config endpoint

* also fix non-pointer config bug

* temporarily disable linting for release

* fix lint errors

Co-authored-by: Matt Durham <mattdurham@ppog.org>
Co-authored-by: Robert Lankford <robert.lankford@grafana.com>
…1162)

* Fix POSTGRES_EXPORTER_DATA_SOURCE_NAME usage for postgres_exporter

A recent change broke the usage of POSTGRES_EXPORTER_DATA_SOURCE_NAME for the postgres_exporter.
As the incorrect variable was checked in the if clause, it always raises an error.

* changelog: keep feature -> enhancement -> bugfix order

* postgres_exporter: add regression test

Co-authored-by: f11r <f11r@users.noreply.github.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
@rfratto
rfratto merged commit 78a8a3b into dev.metrics-v2 Dec 15, 2021
@github-actions github-actions Bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 7, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.