prometheus

Commit Graph

Author	SHA1	Message	Date
Matthieu MOREL	af1a19fc78	enable errorf rule from perfsprint linter Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	1 year ago
TJ Hoplock	6ebfbd2d54	chore!: adopt log/slog, remove go-kit/log For: #14355 This commit updates Prometheus to adopt stdlib's log/slog package in favor of go-kit/log. As part of converting to use slog, several other related changes are required to get prometheus working, including: - removed unused logging util func `RateLimit()` - forward ported the util/logging/Deduper logging by implementing a small custom slog.Handler that does the deduping before chaining log calls to the underlying real slog.Logger - move some of the json file logging functionality to use prom/common package functionality - refactored some of the new json file logging for scraping - changes to promql.QueryLogger interface to swap out logging methods for relevant slog sugar wrappers - updated lots of tests that used/replicated custom logging functionality, attempting to keep the logical goal of the tests consistent after the transition - added a healthy amount of `if logger == nil { $makeLogger }` type conditional checks amongst various functions where none were provided -- old code that used the go-kit/log.Logger interface had several places where there were nil references when trying to use functions like `With()` to add keyvals on the new *slog.Logger type Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>	1 year ago
sellskin	ff15b17400	remove code that will not be executed Signed-off-by: sellskin <mydesk@yeah.net>	2 years ago
Bryan Boreham	857138d3ce	review feedback Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2 years ago
Paweł Szulik	7f24efccdb	Refactor discovery tests to use testify. Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>	2 years ago
Paulin Todev	78411d5e8b	SD Managers taking over responsibility for registration of debug metrics (#13375 ) SD Managers take over responsibility for SD metrics registration --------- Signed-off-by: Paulin Todev <paulin.todev@gmail.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Björn Rabenstein <github@rabenste.in>	2 years ago
machine424	afc05129f1	fix(discovery): allow requireUpdate util to timeout in discovery/file/file_test.go. The loop ran indefinitely if the condition isn't met. Before, each iteration created a new timer channel which was always outpaced by the other timer channel with smaller duration. minor detail: There was a memory leak: resources of the ~10 previous timers were constantly kept. With the fix, we may keep the resources of one timer around for defaultWait but this isn't worth the changes to make it right. Signed-off-by: machine424 <ayoubmrini424@gmail.com>	2 years ago
Paulin Todev	6de80d7fb0	Allow non-default registry to be used for metrics of SD components Signed-off-by: Paulin Todev <paulin.todev@gmail.com>	2 years ago
Matt Harbison	02277bbe0d	Fix path handling in File-SD watcher to allow directory monitoring on Windows Previously, `d.paths` were normalized to backslashes on Windows, even when if the config file used Unix style. The end result meant always watching `./`, so changes for this config were always ignored: scrape_configs: - job_name: 'envmsc1' file_sd_configs: - files: - 'targets/envmsc1.d/.yml' - 'targets/envmsc1.d/.yaml' Additionally, unlike the other platforms, no warning was emitted on startup about not being able to install the watch if the directory didn't exist. Now it is logged. Signed-off-by: Matt Harbison <mharbison@atto.com>	3 years ago
Michael Fuller	15ba7a0d2d	file sd: create and increment an inotify error counter when file-SD i… (#11066 ) * file sd: create and increment an inotify error counter when file-SD is unable to watch files. Additionally, order metrics alphabetically. Signed-off-by: Michael Fuller <mfuller@digitalocean.com> * file.go: consistent naming and help for prometheus_sd_file_watcher_errors_total Signed-off-by: Michael Fuller <mfuller@digitalocean.com> Signed-off-by: Michael Fuller <mfuller@digitalocean.com> Co-authored-by: Michael Fuller <mfuller@digitalocean.com>	3 years ago
Cosrider	bef6556ca5	delete redundant alias (#11180 ) Signed-off-by: Cosrider <cosrider7@gmail.com> Signed-off-by: Cosrider <cosrider7@gmail.com>	3 years ago
Renato Costa	d521933053	Fix incorrect use of loop variable in parallel test (#11205 ) This fixes an occurrence of a loop variable being captured in a parallel test (`TestInitialUpdate`). Prior to this commit, only the last test case declared in that test would actually execute. To work around this problem, we create a copy of the range variable before the paralllel test, as suggested in the documentation for the `testing` package: https://pkg.go.dev/testing#hdr-Subtests_and_Sub_benchmarks The test immediately after the one fixed here (`TestInvalidFile`) followed the same pattern but correctly created a copy of the loop variable, illustrating how easy it is to forget to do this in practice. Issue was automatically found using the `loopvarcapture` linter. Signed-off-by: Renato Costa <renato@cockroachlabs.com> Signed-off-by: Renato Costa <renato@cockroachlabs.com>	3 years ago
Matthieu MOREL	f43749e82f	refactor (discovery): move from github.com/pkg/errors to 'errors' and 'fmt' (#10807 ) 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
Matthieu MOREL	e2ede285a2	refactor: move from io/ioutil to io and os packages (#10528 ) * refactor: move from io/ioutil to io and os packages * use fs.DirEntry instead of os.FileInfo after os.ReadDir Signed-off-by: MOREL Matthieu <matthieu.morel@cnp.fr>	4 years ago
Julien Pivotto	9a2e93228e	Switch to grafana/regexp everywhere (#10268 ) Let's have a consistent library for regexp. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Eng Zer Jun	3e67654d37	refactor: use `T.TempDir()` and `B.TempDir` to create temporary directory The directory created by `T.TempDir()` and `B.TempDir()` is automatically removed when the test and all its subtests complete. Reference: https://pkg.go.dev/testing#T.TempDir Reference: https://pkg.go.dev/testing#B.TempDir Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>	4 years ago
Augustin Husson	d140df2335	replace gopkg.in/fsnotify/fsnotify.v1 by github.com/fsnotify/fsnotify (#9781 ) Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	4 years ago
Mateusz Gozdek	1a6c2283a3	Format Go source files using 'gofumpt -w -s -extra' Part of #9557 Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>	4 years ago
Michal Wasilewski	3f686cad8b	fixes yamllint errors Signed-off-by: Michal Wasilewski <mwasilewski@gmx.com>	5 years ago
Levi Harrison	b5f6f8fb36	Switched to go-kit/log Signed-off-by: Levi Harrison <git@leviharrison.dev>	5 years ago
songjiayang	b781b5cac5	Refactor file discovery init function (#8891 ) * Refactor file discovery init function Combine to one init function like other discovery. Signed-off-by: songjiayang <songjiayang1@gmail.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
Andy Bursavich	4e6a94a27d	Invert service discovery dependencies (#7701 ) This also fixes a bug in query_log_file, which now is relative to the config file like all other paths. Signed-off-by: Andy Bursavich <abursavich@gmail.com>	5 years ago
Julien Pivotto	e76c436e9c	Goleak in discoveries, scrape, rules (#7662 ) * Add go leak tests for discoveries with goroutines Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Add go leak tests in rules Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Add go leak tests in scrape tests Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
ZouYu	2b7437d60e	Fix some warnings: 'redundant type from array, slice, or map composite literal' (#7109 ) Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>	6 years ago
Julien Pivotto	2b2eb79e8b	Add windows tests for query logger (#6653 ) * Add windows tests * Do not rely on time.Time in timer Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	6 years ago
Simon Pasquier	80bc8553be	discovery/file: fix flaky tests (#5948 ) * discovery/file: fix flaky tests Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Fix typos Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Add copyFileTo() method Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
beorn7	dd81912554	Add objectives to Summaries With the next release of client_golang, Summaries will not have objectives by default. To not lose the objectives we have right now, explicitly state the current default objectives. Signed-off-by: beorn7 <beorn@grafana.com>	7 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
Simon Pasquier	dacb6c530a	discovery/file: fix logging (#4178 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	8 years ago
Simon Pasquier	0e5e7f75cd	discovery/file: fix logging (#4178 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	8 years ago
Manos Fokas	25f929b772	Yaml UnmarshalStrict implementation. (#4033 ) * Updated yaml vendor package. * remove checkOverflow duplicate in rulefmt * remove duplicated HTTPClientConfig.Validate() * Added yaml static check.	8 years ago
Aaron Kirkbride	c47fbcb626	Fix moved fsnotify dependency (#3995 )	8 years ago
Krasi Georgiev	b75428ec19	rename package retrieve to scrape no fucnctinal changes just renaming retrieval to scrape	8 years ago
Ganesh Vernekar	66b0aa3b45	Fixed race condition in map iteration and map write in Discovery (#3735 ) (#3738 ) * Fixed concurrent map iteration and map write in Discovery (#3735) * discovery: Changed Lock to RLock in Collect	8 years ago
Julius Volz	09e460a647	discovery: Rename file SD mtime metric (#3723 ) - "timestamp" -> "mtime" to be in line with node exporter and clearer. - add unit suffix	8 years ago
Callum Styan	97464236c7	comments with TargetProvider should read Discoverer instead (#3667 )	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
Callum Styan	d76d5de66f	refactor to make timestamp collector work for multiple file_sd's	8 years ago
KalivarapuReshma	a00fc883c3	Add metric for timestamp of the files file_sd is using.	8 years ago
pasquier-s	78625f85a7	Fix race condition on file SD (#3468 ) The file discovery should only stop the watcher if it has been created otherwise it may trigger a segmentation fault.	8 years ago
Brian Brazil	d7b3df5ae1	Fix staticcheck errors	8 years ago
Krasi Georgiev	29506e0bca	one meaningless write to the config file to trigger anothe fsnotify (#3492 )	8 years ago
Krasi Georgiev	1005ef0a70	Fix flaky file discovery tests - sync the channel draining goroutine	8 years ago
Krasi Georgiev	c8a735ceb6	Fix flaky file discovery tests (#3438 ) * flaky test caused by invalid fsnotify updates before the test files are written to disk causing the fd service to send empty `group[]` struct * `close(filesReady)` needs to be before the file closing so that fsnotify triggers a new loop of the discovery service. * nits * use filepath.Join for the path url to be cross platform * stupid mistake revert	8 years ago
Julius Volz	099df0c5f0	Migrate "golang.org/x/net/context" -> "context" (#3333 ) In some places, where ctxhttp or gRPC are concerned, we still need to use the old contexts.	8 years ago
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	8 years ago
Colstuwjx	2b49df2c61	Fix target group foreach nil bug, directly return err.	8 years ago
Fuente, Pablo Andres	902fafb8e7	Fixing tests for Windows Fixing the config/config_test, the discovery/file/file_test and the promql/promql_test tests for Windows. For most of the tests, the fix involved correct handling of path separators. In the case of the promql tests, the issue was related to the removal of the temporal directories used by the storage. The issue is that the RemoveAll() call returns an error when it tries to remove a directory which is not empty, which seems to be true due to some kind of process that is still running after closing the storage. To fix it I added some retries to the remove of the temporal directories. Adding tags file from Universal Ctags to .gitignore	9 years ago

1 2

53 Commits (bwplotka-patch-2)