prometheus

Commit Graph

Author	SHA1	Message	Date
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	e72c875e63	config: fix Kubernetes config with empty API server (#5256 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Simon Pasquier	c8a1a5a93c	discovery/kubernetes: fix support for password_file and bearer_token_file (#5211 ) * discovery/kubernetes: fix support for password_file Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Create and pass custom RoundTripper to Kubernetes client Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Use inline HTTPClientConfig Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tariq Ibrahim	bfcdba211f	remove the prepended watch reactor from the fake k8s client (#5140 ) Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Frederic Branczyk	e9ae0b5a1b	Merge pull request #4927 from tariq1890/update_k8s update client-go to v10.0.0 and other k8s deps to v1.13.1	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
tariqibrahim	aa94efe4b5	Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s	6 years ago
Lv Jiawei	ad22389218	Add ingress in UnmarshalYAML and init (#5035 ) Both UnmarshalYAML and init lacks the role type ingress. Signed-off-by: MIBc <lvjiawei@cmss.chinamobile.com>	6 years ago
tariqibrahim	122b47caa0	address review comment in client_metrics Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	1e4e4c46ba	Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	0d4b6e4e66	address review comments Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.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
JoeWrightss	e8be31eed9	Fixs typo: 'possibliy' to 'possibly' (#4974 ) Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>	6 years ago
tariqibrahim	1fd438ed2b	rebase and resolve merge conflicts Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
tariqibrahim	412ca33226	update kubernetes deps to v1.13.0 Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Ben Kochie	c6399296dc	Fix spelling/typos (#4921 ) * Fix spelling/typos Fix spelling/typos reported by codespell/misspell. * UK -> US spelling changes. Signed-off-by: Ben Kochie <superq@gmail.com>	6 years ago
Daniele Sluijters	f25a6baedb	remote: Set User-Agent header in requests (#4891 ) Currently Prometheus requests show up with a UA of Go-http-client/1.1 which isn't super helpful. Though the X-Prometheus-Remote-* headers exist they need to be explicitly configured when logging the request in order to be able to deduce this is a request originating from Prometheus. By setting the header we remove this ambiguity and make default server logs just a bit more useful. This also updates a few other places to consistently capitalize the 'P' in the user agent, as well as ensure we set a UA to begin with. Signed-off-by: Daniele Sluijters <daenney@users.noreply.github.com>	6 years ago
Bryan Boreham	cf37e1feb4	Add __meta_kubernetes_pod_phase label in discovery (#4824 ) This lets you add a relabel rule to drop scrapes for pods which are not running. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	6 years ago
Simon Pasquier	c4a6acfb1e	: move to go 1.11 (#4626 ) : move to go 1.11 Signed-off-by: Simon Pasquier <spasquie@redhat.com> Reduce number of places where we specify the Go version Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Martin Chodur	f2d037133e	feat: added more k8s SD metrics Signed-off-by: Martin Chodur <m.chodur@seznam.cz>	6 years ago
Camille Janicki	b035ea0ea9	Change discovery subpackages to not use testify in tests (#4612 ) * Change discovery subpackages to not use testify in tests Signed-off-by: Camille Janicki <camille.janicki@gmail.com> * Remove testify suite from vendor dir Signed-off-by: Camille Janicki <camille.janicki@gmail.com>	6 years ago
Krasi Georgiev	ba7eb733e8	tidy up the discovery logs,updating loops and selects (#4556 ) * tidy up the discovery logs,updating loops and selects few objects renamings removed a very noise debug log on the k8s discovery. It would be usefull to show some summary rather than every update as this is impossible to follow. added most comments as debug logs so each block becomes self explanatory. when the discovery receiving channel is full will retry again on the next cycle. Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com> * add noop logger for the SD manager tests. Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com> * spelling nits Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>	6 years ago
Yecheng Fu	d4eae8cc0c	Wait for all internal discoveries are done before exiting. (#4508 ) Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	6 years ago
jojohappy	e060f7755f	To keep comment of NodeLegacyHostIP for k8s node address Signed-off-by: jojohappy <sarahdj0917@gmail.com>	6 years ago
jojohappy	e81785d1a3	To keep depecrate k8s node NodeLegacyHostIP as local constant to keep compatibility for older k8s version Signed-off-by: jojohappy <sarahdj0917@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
Julius Volz	05d6d6a2e5	k8s SD: Fix "schema" -> "scheme" typo (#4371 ) Signed-off-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Dmitry Bashkatov	72327d98fb	discovery/kubernetes/ingress: remove unnecessary check Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>	6 years ago
Dmitry Bashkatov	e2baf89eac	discovery/kubernetes/ingress: fix scheme discovery (Closes #4327 ) Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>	6 years ago
Dmitry Bashkatov	9cdca50bdd	discovery/kubernetes/ingress: add more tests Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>	6 years ago
Julius Volz	5cf0113762	Add "omitempty" to some SD config YAML field tags (#4338 ) Especially for Kubernetes SD, this fixes a bug where the rendered configuration says "api_server: null", which when read back is not interpreted as an un-set API server (thus the default is not applied). Signed-off-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Simon Pasquier	6eab4bbca1	kubernetes_sd: fix namespace filtering (#4273 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	7 years ago
Damien Lespiau	e64037053d	Expose controller kind and name to labelling rules Relabelling rules can use this information to attach the name of the controller that has created a pod. In turn, this can be used to slice metrics by workload at query time, ie. "Give me all metrics that have been created by the $name Deployment" Signed-off-by: Damien Lespiau <damien@weave.works>	7 years ago
beorn7	a4e4bec3fe	Merge branch 'release-2.2'	7 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	3a253f796c	Fix grammar in comments and add missing `expectedMaxItems` to let it break fast. Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	7 years ago
Yecheng Fu	d73b0d3141	Move hasSynced interface and its implementations to *_test.go files. 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
Manos Fokas	25f929b772	Yaml UnmarshalStrict implementation. (#4033 ) * Updated yaml vendor package. * remove checkOverflow duplicate in rulefmt * remove duplicated HTTPClientConfig.Validate() * Added yaml static check.	7 years ago
Yecheng Fu	56ed29fbf7	Map target infos of endpoints to prometheus meta labels. (#3770 )	7 years ago
ferhat elmas	ffa673f7d8	General simplifications (#3887 ) Another try as in #1516	7 years ago
Simon Pasquier	2072bbc824	Send update when pod's IP address is empty When the pod gets evicted, its IP address becomes empty and it needs to be removed from the targets.	7 years ago
pasquier-s	bde64cf5a6	Fix Kubernetes endpoints SD for empty subsets (#3660 ) * Fix Kubernetes endpoints SD for empty subsets When an endpoints object has no associated pods (replica scaled to zero for instance), the endpoints SD should return a target group with no targets so that the SD manager propagates this information to the scrape manager. Fixes #3659 * Don't send nil target groups from the Kubernetes SD This is to be consistent with the endpoints SD part.	7 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	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
Tom Wilkie	099c50ce93	Avoid empty pod UID in test.	7 years ago
Tom Wilkie	9811e90d65	Fix tests.	7 years ago
Tom Wilkie	06dc1e8797	Include Pod UID in the discovery metadata.	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
Goutham Veeramachaneni	f5aed810f9	logging: Port to common/promlog 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	75aec7d970	k8s: Use versioned struct for ingress discovery	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
Conor Broderick	6766123f93	Replace regex with Secret type and remarshal config to hide secrets (#2775 )	8 years ago
Fabian Reinartz	11aa049b05	Merge branch 'release-1.6' into merge16	8 years ago
Fabian Reinartz	ddbbd2b712	Merge branch 'release-1.5' into cut162	8 years ago
Fabian Reinartz	2ff8855ae6	discovery/k8s: update client library	8 years ago
Brian Akins	27d66628a1	Allow limiting Kubernetes service discover to certain namespaces Allow namespace discovery to be more easily extended in the future by using a struct rather than just a list. Rename fields for kubernetes namespace discovery	8 years ago
Tobias Schmidt	58cd39aacd	Follow golang naming conventions in discovery packages	8 years ago
Alex Somesan	b22eb65d0f	Cleaner separation between ServiceAccount and custom authentication in K8S SD (#2348 ) * Canonical usage of cluster service-account in K8S SD * Early validation for opt-in custom auth in K8S SD * Fix typo in condition	8 years ago
Fabian Reinartz	d19d1bcad3	discovery: move into top-level package	8 years ago

1 2 3 4

166 Commits (a3f424641a9eb468da71ac14c3a7c1ef168a45a0)