prometheus

Commit Graph

Author	SHA1	Message	Date
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>	2 months ago
Paulin Todev	27bb57a37b	Define metric label values in one place Signed-off-by: Paulin Todev <paulin.todev@gmail.com>	12 months ago
Paulin Todev	108a749a45	Set up labels for counters in advance Signed-off-by: Paulin Todev <paulin.todev@gmail.com>	12 months 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>	12 months ago
Oleksandr Redko	8e5f0387a2	ci(lint): enable nolintlint and remove redundant comments (#12926 ) Signed-off-by: Oleksandr Redko <Oleksandr_Redko@epam.com>	1 year ago
renzheng.wang	b2c5de2e65	fix lint issue Signed-off-by: renzheng.wang <wangrzneu@gmail.com>	2 years ago
renzheng.wang	866fa25b20	add label and labelpresent for endpointslice role in k8s discovery Signed-off-by: renzheng.wang <wangrzneu@gmail.com>	2 years ago
beorn7	c3c7d44d84	lint: Adjust to the lint warnings raised by current versions of golint-ci We haven't updated golint-ci in our CI yet, but this commit prepares for that. There are a lot of new warnings, and it is mostly because the "revive" linter got updated. I agree with most of the new warnings, mostly around not naming unused function parameters (although it is justified in some cases for documentation purposes – while things like mocks are a good example where not naming the parameter is clearer). I'm pretty upset about the "empty block" warning to include `for` loops. It's such a common pattern to do something in the head of the `for` loop and then have an empty block. There is still an open issue about this: https://github.com/mgechev/revive/issues/810 I have disabled "revive" altogether in files where empty blocks are used excessively, and I have made the effort to add individual `// nolint:revive` where empty blocks are used just once or twice. It's borderline noisy, though, but let's go with it for now. I should mention that none of the "empty block" warnings for `for` loop bodies were legitimate. Signed-off-by: beorn7 <beorn@grafana.com>	2 years ago
Julien Pivotto	3677d61a4b	Update kubernetes dependencies A new API is available for AddEventHandlers, to get errors but also be able to cancel handlers. Doing the easy thing for the release, which is just to log errors. We could see how to improve this in the future to handle the errors properly and cancel the handlers. Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Karl Piplies	3782cb40d5	add loadbalancerip to service labels Signed-off-by: Karl Piplies <karl.piplies@mercedes-benz.com>	2 years ago
yngwiewang	1abbf5a5c5	add __meta_kubernetes_service_port_number (#10945 ) Signed-off-by: yngwiewang <yngwiewang@163.com>	2 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>	3 years ago
Levi Harrison	b5f6f8fb36	Switched to go-kit/log Signed-off-by: Levi Harrison <git@leviharrison.dev>	4 years ago
李国忠	029b45aa30	add service type metadata to kubernetes_sd_config service role #6496 (#6684 ) * [service discovery] add service type metadata to kubernetes_sd_config service role Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [fix] ServiceType -> string Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [fix] fix testcase Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [style] Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [doc] add service type Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [doc] sort Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>	5 years ago
Simon Pasquier	06c1a07d5a	discovery/kubernetes: remove extraneous parameters from send() Signed-off-by: Simon Pasquier <spasquie@redhat.com>	5 years ago
Ben Ye	1a18594176	keep kubernetes metrics in global vars (#6765 ) Signed-off-by: yeya24 <yb532204897@gmail.com>	5 years ago
Yao Zengzeng	1afa476b8a	minor fix for making map (#6076 ) Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>	5 years ago
Simon Pasquier	8ec6f02854	discovery: don't log errors on context cancelation Signed-off-by: Simon Pasquier <spasquie@redhat.com>	5 years ago
YaoZengzeng	658b33808c	The workqueue of service should be `service` other than `ingress` Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>	6 years ago
Simon Pasquier	dafd1632a2	discovery/kubernetes: add present labels for labels/annotations (#5443 ) Signed-off-by: Simon Pasquier <spasquie@redhat.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>	6 years ago
Simon Pasquier	f678e27eb6	: use latest release of staticcheck (#5057 ) : use latest release of staticcheck It also fixes a couple of things in the code flagged by the additional checks. Signed-off-by: Simon Pasquier <spasquie@redhat.com> Use official release of staticcheck Also run 'go list' before staticcheck to avoid failures when downloading packages. Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tariq Ibrahim	de6f3b6af7	expose kubernetes service cluster ip (#4940 ) Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com> Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
jojohappy	21e50a3f9d	Upgrade k8s client to kubernetes-1.11.0 Signed-off-by: jojohappy <sarahdj0917@gmail.com>	6 years ago
Julius Volz	219e477272	Fix some (valid) lint errors (#4287 ) Signed-off-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Yecheng Fu	2be543e65a	Simplify some code and comments. Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	7 years ago
Yecheng Fu	46683dd67d	Simplify code. - Unified `send` function. - Pass InformerSynced functions to `cache.WaitForCacheSync`. - Use `Role\w+` constants instead of literal string. Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	7 years ago
Yecheng Fu	8ceb8f2ae8	Refactor Kubernetes Discovery Part 2: Refactoring - Do initial listing and syncing to scrape manager, then register event handlers may lost events happening in listing and syncing (if it lasted a long time). We should register event handlers at the very begining, before processing just wait until informers synced (sync in informer will list all objects and call OnUpdate event handler). - Use a queue then we don't block event callbacks and an object will be processed only once if added multiple times before it being processed. - Fix bug in `serviceUpdate` in endpoints.go, we should build endpoints when `exists && err == nil`. Add `^TestEndpointsDiscoveryWithService` tests to test this feature. Testing: - Use `k8s.io/client-go` testing framework and fake implementations which are more robust and reliable for testing. - `Test\w+DiscoveryBeforeRun` are used to test objects created before discoverer runs - `Test\w+DiscoveryAdd\w+` are used to test adding objects - `Test\w+DiscoveryDelete\w+` are used to test deleting objects - `Test\w+DiscoveryUpdate\w+` are used to test updating objects - `TestEndpointsDiscoveryWithService\w+` are used to test endpoints events triggered by services - `cache.DeletedFinalStateUnknown` related stuffs are removed, because we don't care deleted objects in store, we only need its name to send a specical `targetgroup.Group` to scrape manager Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	7 years ago
Callum Styan	97464236c7	comments with TargetProvider should read Discoverer instead (#3667 )	7 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	7 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.	7 years ago
Goutham Veeramachaneni	3f0267c548	Merge branch 'dev-2.0' into go-kit/log Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	7 years ago
Johannes 'fish' Ziemke	70f3d1e9f9	k8s: Support discovery of ingresses (#3111 ) * k8s: Support discovery of ingresses * Move additional labels below allocation This makes it more obvious why the additional elements are allocated. Also fix allocation for node where we only set a single label. * k8s: Remove port from ingress discovery * k8s: Add comment to ingress discovery example	7 years ago
Fabian Reinartz	2ff8855ae6	discovery/k8s: update client library	8 years ago
Fabian Reinartz	d19d1bcad3	discovery: move into top-level package	8 years ago

36 Commits (fee61fbcbd17b23895e7b768c889e20933c23d04)