prometheus

Commit Graph

Author	SHA1	Message	Date
beorn7	747c5ee2b1	Apply analyzer "modernize" to the whole codebase See https://pkg.go.dev/golang.org/x/tools/gopls/internal/analysis/modernize for details. This ran into a few issues (arguably bugs in the modernize tool), which I will fix in the next commit, so that we have transparency what was done automatically. Beyond those hiccups, I believe all the changes applied are legitimate. Even where there might be no tangible direct gain, I would argue it's still better to use the "modern" way to avoid micro discussions in tiny style PRs later. Signed-off-by: beorn7 <beorn@grafana.com>	4 months ago
Dimitar Dimitrov	d94dab92a8	remote.ReadClient: allow multiple queries (#16742 ) * remote read: simplify ReadMultiple to return single SeriesSet Changed ReadMultiple to return a single SeriesSet with interleaved series from all queries instead of a slice of SeriesSets. This simplifies the interface and removes the complex multiplexing infrastructure while maintaining the ability to send multiple queries in a single HTTP request. Changes: - Updated ReadClient interface: ReadMultiple now returns storage.SeriesSet - Removed multiplexing infrastructure (MessageQueue, QueueConsumer, etc.) - Simplified response handling to interleave series from all queries - Updated tests to match new interface - All existing tests pass Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix sorting behavior in ReadMultiple for samples responses When sortSeries=false, the previous implementation incorrectly used storage.NewMergeSeriesSet which requires sorted inputs, violating the function's contract and potentially producing incorrect results. Changes: - When sortSeries=true: Use NewMergeSeriesSet for efficient merging and deduplication of sorted series - When sortSeries=false: Use simple concatenation to avoid the sorted input requirement, preserving duplicates from overlapping queries - Add comprehensive tests to verify both sorting behaviors - Update existing test expectations to match correct sorted order Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Refactor to reduce code duplication in ReadMultiple implementation Extract common query result combination logic into a shared combineQueryResults function that handles both sorted and unsorted cases. This eliminates duplication between the real client implementation and the mock client used in tests. Changes: - Add combineQueryResults helper function in client.go - Refactor handleSamplesResponseImpl to use the helper - Simplify mockedRemoteClient.ReadMultiple to use the same helper - Reduce code duplication by ~30 lines while maintaining same functionality Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>	4 months ago
zenador	d73b0f34e3	Strip newline in error when reading from remote client (#16487 ) Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	8 months ago
Jeanette Tan	b91c66cdf9	Move newline to inside the expected error Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	8 months ago
Jeanette Tan	ab2d17d7a0	Move unit test to existing suite Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	8 months ago
Jeanette Tan	f1b6694837	Add unit test Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	8 months ago
Patryk Prus	ebeeb1c823	Fix flaky TestReadClient/timeout test Signed-off-by: Patryk Prus <p@trykpr.us>	9 months ago
zenador	6a439bdffa	remote read: Use more informative error msg for timeouts (#16157 ) * Use more informative error msg for timeouts on remote read Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>	9 months ago
Matthieu MOREL	c7d4b53ec1	chore: enable unused-parameter from revive Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	10 months ago
Justin Lei	3a82cd5a7e	Add streaming remote read to ReadClient (#11379 ) * Add streaming remote read to ReadClient Signed-off-by: Justin Lei <justin.lei@grafana.com> * Apply suggestions from code review Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Justin Lei <justin.lei@grafana.com> * Remote read instrumentation tweaks Signed-off-by: Justin Lei <lei.justin@gmail.com> * Minor cleanups Signed-off-by: Justin Lei <lei.justin@gmail.com> * In-line handleChunkedResponse Signed-off-by: Justin Lei <lei.justin@gmail.com> * Fix lints Signed-off-by: Justin Lei <lei.justin@gmail.com> * Explicitly call cancel() when needed Signed-off-by: Justin Lei <lei.justin@gmail.com> * Update chunkedSeries, chunkedSeriesIterator for new interfaces Signed-off-by: Justin Lei <lei.justin@gmail.com> * Adapt remote.chunkedSeries to use prompb.ChunkedSeries Signed-off-by: Justin Lei <lei.justin@gmail.com> * Fix lint Signed-off-by: Justin Lei <lei.justin@gmail.com> --------- Signed-off-by: Justin Lei <justin.lei@grafana.com> Signed-off-by: Justin Lei <lei.justin@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>	1 year ago
Bartlomiej Plotka	a60e5ce362	[PRW 2.0] Added Sender and RW Handler support for Response Stats. (#14444 ) * [PRW 2.0] Added Sender support for Response Stats. Chained on top of https://github.com/prometheus/prometheus/pull/14427 Fixes https://github.com/prometheus/prometheus/issues/14359 Signed-off-by: bwplotka <bwplotka@gmail.com> * Addressed comments. Signed-off-by: bwplotka <bwplotka@gmail.com> * move write stats to it's own file Signed-off-by: Callum Styan <callumstyan@gmail.com> * Clean up header usage Signed-off-by: Callum Styan <callumstyan@gmail.com> * add missing license to new stats file Signed-off-by: Callum Styan <callumstyan@gmail.com> * Addressed all comments. Signed-off-by: bwplotka <bwplotka@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Callum Styan <callumstyan@gmail.com>	1 year ago
machine424	0996b78326	remote_write: add a unit test to make sure the write client sends the extra http headers as expected This will help letting prometheus off the hook from situations like https://github.com/prometheus/prometheus/issues/13030 Signed-off-by: machine424 <ayoubmrini424@gmail.com>	2 years ago
Matthieu MOREL	1ec6e407d0	ci(lint): enable errorlint on storage (#12935 ) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	2 years ago
William Dumont	ce6ad15422	remote-write: TestClientRetryAfter status code 500 and compare the retryAfter values. Signed-off-by: William Dumont <william.dumont@grafana.com>	2 years ago
William Dumont	febd62a23e	remote-write: refactor TestClientRetryAfter The new version features a set of test cases that simplify the addition of new HTTP status codes. Signed-off-by: William Dumont <william.dumont@grafana.com>	2 years ago
Paschalis Tsilias	c173cd57c9	Add a header to count retried remote write requests (#12729 ) Header name is `Retry-Attempt`, only set when >0. Signed-off-by: Marc Tuduri <marctc@protonmail.com> Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>	2 years ago
Arve Knudsen	435b500de7	remote: Convert to RecoverableError using errors.As (#12103 ) In storage/remote, try converting to RecoverableError using errors.As, instead of through direct casting. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	3 years ago
Fish-pro	43d77f7c41	Use http constants instead of string Signed-off-by: Fish-pro <zechun.chen@daocloud.io>	3 years ago
Matthieu MOREL	d56d0a9d52	(storage): move from github.com/pkg/errors to 'errors' and 'fmt' (#10946 ) Signed-off-by: Matthieu MOREL <mmorel-35@users.noreply.github.com> Co-authored-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>	4 years ago
Paweł Szulik	f5563bfe95	tests: Move from t.Errorf and others. (Part 2) (#9309 ) * Refactor util tests. Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>	4 years ago
Harkishen-Singh	77c20fd2f8	Adds support to configure retry on Rate-Limiting from remote-write config. Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>	5 years ago
Julien Pivotto	93dcc3c7be	Consider status code 429 as recoverable errors to avoid resharding (#8237 ) This reverts commit `49a8ce5239`. This commit is necessary since we only wanted to not have the functionality in 2.25. It will be improved soon on the main branch. Co-authored-by: Harkishen-Singh <harkishensingh@hotmail.com> Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	49a8ce5239	Revert "Consider status code 429 as recoverable errors to avoid resharding (#8237 )" This reverts commit `cd412470d7`. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Harkishen Singh	cd412470d7	Consider status code 429 as recoverable errors to avoid resharding (#8237 ) * Consider status code 429 as recoverable errors to avoid resharding. * Adds support for Retry-After in backoff logic in remote storage. Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>	5 years ago
Julien Pivotto	6c56a1faaa	Testify: move to require (#8122 ) * Testify: move to require Moving testify to require to fail tests early in case of errors. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * More moves Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	4e5b1722b3	Move away from testutil, refactor imports (#8087 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Joe Elliott	04b028f1e6	Exports recoverable error (#7689 ) Signed-off-by: Joe Elliott <number101010@gmail.com>	5 years ago
Bartlomiej Plotka	b788986717	storage: Adjusted fully storage layer support for chunk iterators: Remote read client, readyStorage, fanout. (#7059 ) * Fixed nits introduced by https://github.com/prometheus/prometheus/pull/7334 * Added ChunkQueryable implementation to fanout and readyStorage. * Added more comments. * Changed NewVerticalChunkSeriesMerger to CompactingChunkSeriesMerger, removed tiny interface by reusing VerticalSeriesMergeFunc for overlapping algorithm for both chunks and series, for both querying and compacting (!) + made sure duplicates are merged. * Added ErrChunkSeriesSet * Added Samples interface for seamless []promb.Sample to []tsdbutil.Sample conversion. * Deprecating non chunks serieset based StreamChunkedReadResponses, added chunk one. * Improved tests. * Split remote client into Write (old storage) and read. * Queryable client is now SampleAndChunkQueryable. Since we cannot use nice QueryableFunc I moved all config based options to sampleAndChunkQueryableClient to aboid boilerplate. In next commit: Changes for TSDB. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	6 years ago
Julien Pivotto	31700a05df	Improve testutil.ErrorEqual (#6471 ) Also improves TestPopulateLabels: testutil.ErrorEqual just returned a bool without failing the test. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	6 years ago
Callum Styan	67838643ee	Add config option for remote job name (#6043 ) * Track remote write queues via a map so we don't care about index. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Support a job name for remote write/read so we can differentiate between them using the name. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Remote write/read has Name to not confuse the meaning of the field with scrape job names. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Split queue/client label into remote_name and url labels. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Don't allow for duplicate remote write/read configs. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Ensure we restart remote write queues if the hash of their config has not changed, but the remote name has changed. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Include name in remote read/write config hashes, simplify duplicates check, update test accordingly. Signed-off-by: Callum Styan <callumstyan@gmail.com>	6 years ago
Tariq Ibrahim	8fdfa8abea	refine error handling in prometheus (#5388 ) i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors. ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives. iii) Does away with the use of fmt package for errors in favour of pkg/errors Signed-off-by: tariqibrahim <tariq181290@gmail.com>	7 years ago
Callum Styan	6f69e31398	Tail the TSDB WAL for remote_write This change switches the remote_write API to use the TSDB WAL. This should reduce memory usage and prevent sample loss when the remote end point is down. We use the new LiveReader from TSDB to tail WAL segments. Logic for finding the tracking segment is included in this PR. The WAL is tailed once for each remote_write endpoint specified. Reading from the segment is based on a ticker rather than relying on fsnotify write events, which were found to be complicated and unreliable in early prototypes. Enqueuing a sample for sending via remote_write can now block, to provide back pressure. Queues are still required to acheive parallelism and batching. We have updated the queue config based on new defaults for queue capacity and pending samples values - much smaller values are now possible. The remote_write resharding code has been updated to prevent deadlocks, and extra tests have been added for these cases. As part of this change, we attempt to guarantee that samples are not lost; however this initial version doesn't guarantee this across Prometheus restarts or non-retryable errors from the remote end (eg 400s). This changes also includes the following optimisations: - only marshal the proto request once, not once per retry - maintain a single copy of the labels for given series to reduce GC pressure Other minor tweaks: - only reshard if we've also successfully sent recently - add pending samples, latest sent timestamp, WAL events processed metrics Co-authored-by: Chris Marchbanks <csmarchbanks.com> (initial prototype) Co-authored-by: Tom Wilkie <tom.wilkie@gmail.com> (sharding changes) Signed-off-by: Callum Styan <callumstyan@gmail.com>	7 years ago
Tom Wilkie	b58199bf12	Review feedback. Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	8 years ago
Tom Wilkie	3353bbd018	Add proper unclean shutdown handling with a cancellable context. Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	8 years ago
Shubheksha Jalan	0471e64ad1	Use shared types from the `common` repo (#3674 ) * refactor: use shared types from common repo, remove util/config * vendor: add common/config * fix nit	8 years ago
Shubheksha Jalan	ec94df49d4	Refactor SD configuration to remove `config` dependency (#3629 ) * refactor: move targetGroup struct and CheckOverflow() to their own package * refactor: move auth and security related structs to a utility package, fix import error in utility package * refactor: Azure SD, remove SD struct from config * refactor: DNS SD, remove SD struct from config into dns package * refactor: ec2 SD, move SD struct from config into the ec2 package * refactor: file SD, move SD struct from config to file discovery package * refactor: gce, move SD struct from config to gce discovery package * refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil * refactor: consul, move SD struct from config into consul discovery package * refactor: marathon, move SD struct from config into marathon discovery package * refactor: triton, move SD struct from config to triton discovery package, fix test * refactor: zookeeper, move SD structs from config to zookeeper discovery package * refactor: openstack, remove SD struct from config, move into openstack discovery package * refactor: kubernetes, move SD struct from config into kubernetes discovery package * refactor: notifier, use targetgroup package instead of config * refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup * refactor: retrieval, use targetgroup package instead of config.TargetGroup * refactor: storage, use config util package * refactor: discovery manager, use targetgroup package instead of config.TargetGroup * refactor: use HTTPClient and TLS config from configUtil instead of config * refactor: tests, use targetgroup package instead of config.TargetGroup * refactor: fix tagetgroup.Group pointers that were removed by mistake * refactor: openstack, kubernetes: drop prefixes * refactor: remove import aliases forced due to vscode bug * refactor: move main SD struct out of config into discovery/config * refactor: rename configUtil to config_util * refactor: rename yamlUtil to yaml_config * refactor: kubernetes, remove prefixes * refactor: move the TargetGroup package to discovery/ * refactor: fix order of imports	8 years ago
Tom Wilkie	ee011d906d	Port remote read server to 2.0.	8 years ago
Tom Wilkie	3760f56c0c	remote: Expose ClientConfig type (see #3165 )	8 years ago
Julius Volz	9ef8518b37	Remove "package remote" garbage from license headers (#3304 )	8 years ago
Brian Brazil	ee88f0d222	Ensure all values are used or _	8 years ago
Julius Volz	8ebeed0b44	remote: Expose ClientConfig type (#3165 ) The Client type is already exposed, but can't be used without the config for it also being exposed. Using the remote.Client from other programs is useful to do full end-to-end tests of Prometheus's remote protocol against adapter implementations.	8 years ago
Ben Kochie	59aca4138b	Fix staticcheck issues.	8 years ago
Tom Wilkie	2dda5775e3	Initial port of remote storage to v2.	9 years ago
Tom Wilkie	24a113bb09	Review feedback: limit number of bytes read under error.	9 years ago
Tom Wilkie	46abe8cbf2	Remote write: read first line of response and include it in the error.	9 years ago
Julius Volz	1c72524870	Fix HTTP error handling in remote.Client.Store() (#2708 ) Regression introduced in `e5d7bbfc3c`	9 years ago

39 Commits (main)