This repository was archived by the owner on Jul 28, 2026. It is now read-only.
Merge of main into dev.servicegraphs - #981
Merged
mapno merged 45 commits intoOct 13, 2021
Merged
Conversation
* 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 (grafana-cold-storage#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
…ana-cold-storage#886) * 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>
…rage#881) * 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>
…orage#912) * ensure reshards are scheduled every reshard_interval * use single metric for config changed events * logs
* prepare for 0.18.4 release * include grafana-cold-storage#831
…ana-cold-storage#904) (grafana-cold-storage#906) This avoids e.g. logging a warning when a target is intentionally dropped
…#923) 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
…afana-cold-storage#925) * 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
…fana-cold-storage#920) * Making configurable what method is used when adding k/v to spans * Remove weird diff * Remove new nesting * Add operationType validation * CHANGELOG
* 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
…orage#907) * add support for managing a kubelet service * write test for kubelet reconciler * add example ServiceMonitor for the kubelet service * add instructions for kubelet ServiceMonitor
…ana-cold-storage#956) * Update documentation * PR feedback changes
* upgrading integrations depencies: elasticsearch, redis, postgres, mysql, memcached, statsd * Updating changelog * Updating changelog * Fix changelog typo * updating postgres exporter repo address on documentation * CheckKeyGroupsBatchSize directed to CheckKeysBatchSize configuration property * solving broken link
…age#953) * Note about ports in tempo remote_write enpoint Added comment with examples how to fill port of `remote_write` tempo endpoint for local and on-premises instances. For new users it's unclear which port to choose, and in most cases they try to fill the default `3200` Tempo port, instead of gRPC receiver port. * Update docs/configuration/traces-config.md Co-authored-by: mattdurham <mattdurham@ppog.org>
…ge#951) * Replace dots for underscores in autologged labels * Use SanitizeLabel function
…afana-cold-storage#959) * Update changelog with some bad merges * Flatten out dependencies and give shoutout to (@gaantunes)
* Add silent install to windows * Add silent install to windows * remove extra colon
…ge#965) * update mongodb_exporter to release-0.27.0-grafana * fix lint errors * Update pkg/integrations/mongodb_exporter/mongodb_exporter.go Co-authored-by: gaantunes <g.amaral.antunes@gmail.com> * add note for compatiblemode Co-authored-by: gaantunes <g.amaral.antunes@gmail.com>
…a-cold-storage#972) This example only works when cluster domain is set to cluster.local. When the cluster domain is changed, scraping silently fails (hidden behind the "debug" log level): grafana-agent ts=2021-10-08T15:10:06.054149178Z level=debug agent=prometheus instance=320d908d14feeac9f916f752b6276792 component="scrape manager" scrape_pool=integrations/kubernetes/cadvisor target=https://kubernetes.default.svc.cluster.local:443/api/v1/nodes/ns100566-865ef3ad/proxy/metrics/cadvisor msg="Scrape failed" err="Get "https://kubernetes.default.svc.cluster.local:443/api/v1/nodes/ns100566-865ef3ad/proxy/metrics/cadvisor\": dial tcp: lookup kubernetes.default.svc.cluster.local on 10.43.0.10:53: no such host" Luckily, kubernetes also populates /etc/resolv.conf with search domains, so we can simply specify kubernetes.default.svc, and it works with all cluster domains.
* Upgrade OTel to v0.36 * Add replace for jaeger * Remove conversion * changelog * lint * Remove g1.17 annotations * Lint again * Left annotation change
…#976) cf. 975. This is to match loki and prometheus behavior
mapno
force-pushed
the
dev.servicegraphs.merge-main
branch
from
October 13, 2021 15:59
d3459d6 to
11d264a
Compare
github-actions
Bot
added
the
frozen-due-to-age
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Description
Merge of
mainintodev.servicegraphs, with the intention of solving merge conflicts when mergingdev.servicegraphsinto main`.Updated version of #970