prometheus

Commit Graph

Author	SHA1	Message	Date
Frederic Branczyk	b75ec7e6ef	Merge pull request #4458 from FUSAKLA/k8s-sd-add-metrics feat: added more k8s SD metrics	6 years ago
Timo Beckers	1c9fbd65c4	marathon-sd - change port gathering strategy, support for container networking (#4499 ) * marathon-sd - change port gathering strategy, add support for container networking - removed unnecessary error check on HTTPClientConfig.Validate() - renamed PortDefinitions and PortMappings to PortDefinition and PortMapping respectively - extended data model for extra parsed fields from Marathon json - support container networking on Marathon 1.5+ (target Task.IPAddresses.x.Address) - expanded test suite to cover all new cases - test: cancel context when reading from doneCh before returning from function - test: split test suite into Ports/PortMappings/PortDefinitions Signed-off-by: Timo Beckers <timo@incline.eu>	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
Simon Pasquier	128ff546b8	config: add test for OpenStack SD (#4594 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Tom Wilkie	e3d36f4802	Don't import testing from non-test code. (#4595 ) Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	6 years ago
Bryan Boreham	968f657eaa	Stop removing the final dot from rooted DNS names (#4586 ) Removing a final dot changes the meaning of the name and can cause extra DNS lookups as the resolver traverses its search path. Signed-off-by: Bryan Boreham <bjboreham@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
Tariq Ibrahim	f708fd5c99	Adding support for multiple azure environments (#4569 ) Signed-off-by: Tariq Ibrahim <tariq.ibrahim@microsoft.com>	6 years ago
Simon Pasquier	674c76adb8	discovery: coalesce identical SD configurations (#3912 ) * discovery: coalesce identical SD configurations Instead of creating as many SD providers as declared in the configuration, the discovery manager merges identical configurations into the same provider and keeps track of the subscribers. When the manager receives target updates from a SD provider, it will broadcast the updates to all interested subscribers. Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Krasi Georgiev	53691ae261	Simplify SD update throttling (#4523 ) * simplfied SD updates throtling Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com> * add default to catch cases when we don't have new updates. Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>	6 years ago
Fabian Reinartz	f571b69010	Merge pull request #4514 from jkohen/ec2-targets Expose EC2 instance owner as a discovery label.	6 years ago
Javier Kohen	1c89984778	Expose EC2 instance owner as a discovery label. This exposes the OwnerID field of the DescribeInstances respons as . Signed-off-by: Javier Kohen <jkohen@google.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
Fabian Reinartz	b04ab71268	Merge pull request #4488 from jkohen/patch-3 Populate __meta_gce_instance_id discovery label	6 years ago
Javier Kohen	403ac08ece	Expose __meta_gce_instance_id as an integer (instead of raw bytes). Signed-off-by: Javier Kohen <jkohen@google.com>	6 years ago
Javier Kohen	7e9549b398	Added __meta_gce_instance_id discovery label Populated from instance.ID. I will follow up with a change to the documentation. Signed-off-by: Javier Kohen <jkohen@google.com>	6 years ago
Simon Pasquier	b7054f3a78	Merge pull request #4443 from simonpasquier/fix-consul-connections-leak discovery/consul: close idle connections on stop	6 years ago
Benji Visser	46fb4078a6	handle nil pointer in ec2 discovery (#4469 ) This handles a nil pointer that was being accessed in EC2 discovery. Fixes: #4441 Signed-off-by: noqcks <benny@noqcks.io>	6 years ago
Johannes Scheuermann	f978f5bba3	Fixes #4202 , correctly parse VMs with empty tags (#4450 ) Signed-off-by: Johannes M. Scheuermann <joh.scheuer@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
Simon Pasquier	1cd29f782c	discovery/consul: close idle connections on stop Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Johannes Scheuermann	7608ee87d0	Inital support for Azure VMSS (#4202 ) * Inital support for Azure VMSS Signed-off-by: Johannes Scheuermann <johannes.scheuermann@inovex.de> * Add documentation for the newly introduced label Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>	6 years ago
José Martínez	791c13b142	discovery/ec2: Add primary_subnet_id label Signed-off-by: José Martínez <xosemp@gmail.com>	6 years ago
José Martínez	5e4a33c890	discovery/ec2: Maintain order of subnet_id label Signed-off-by: José Martínez <xosemp@gmail.com>	6 years ago
Jannick Fahlbusch ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎	0be25f92e2	EC2 Discovery: Allow to set a custom endpoint (#4333 ) Allowing to set a custom endpoint makes it easy to monitor targets on non AWS providers with EC2 compliant APIs. Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>	6 years ago
Ivan Voronchihin	59d214d277	Update autorest vedoring (#4147 ) Signed-off-by: bege13mot <bege13mot@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
Romain Baugue	b41be4ef52	Discovery consul service meta (#4280 ) * Upgrade Consul client * Add ServiceMeta to the labels in ConsulSD Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>	6 years ago
Simon Pasquier	f32acc0b7b	discovery/openstack: remove unneeded assignment Signed-off-by: Simon Pasquier <spasquie@redhat.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
Krasi Georgiev	a155b6d29d	fix the zookeper race (#4355 ) Signed-off-by: Krasi Georgiev <kgeorgie@redhat.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
Paul Gier	d24d2acd11	config: set target group source index during unmarshalling (#4245 ) * config: set target group source index during unmarshalling Fixes issue #4214 where the scrape pool is unnecessarily reloaded for a config reload where the config hasn't changed. Previously, the discovery manager changed the static config after loading which caused the in-memory config to differ from a freshly reloaded config. Signed-off-by: Paul Gier <pgier@redhat.com> * [issue #4214] Test that static targets are not modified by discovery manager Signed-off-by: Paul Gier <pgier@redhat.com>	7 years ago
Simon Pasquier	0e5e7f75cd	discovery/file: fix logging (#4178 ) Signed-off-by: Simon Pasquier <spasquie@redhat.com>	7 years ago
Callum Styan	03578d5df8	add example usage of SD adapter for converting unsupported SD type to filesd (#3720 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	7 years ago
Adam Shannon	a22e1736b9	discovery/marathon: include url in fetchApps error (#4171 ) This was previously part of a larger PR, but that was closed. https://github.com/prometheus/prometheus/issues/4048#issuecomment-389899997 This change could include auth information in the URL. That's been fixed in upstream go, but not until Go 1.11. See: https://github.com/golang/go/issues/24572 Signed-off-by: Adam Shannon <adamkshannon@gmail.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
Nathan Graves	5b27996cb3	Include GCE labels during service discovery. Updated vendor files for Google API. (#4150 ) Signed-off-by: Nathan Graves <nathan.graves@kofile.us>	7 years ago
beorn7	a4e4bec3fe	Merge branch 'release-2.2'	7 years ago
Elif T. Kuş	57dcdfb15f	Rewrote tests with testutil for several test files (#4086 ) * promql: Rewrote tests with testutil for functions_test Signed-off-by: Elif T. Kuş <elifkus@gmail.com> * pkg/relabel: Rewrote tests with testutil for relabel_test Signed-off-by: Elif T. Kuş <elifkus@gmail.com> * discovery/consul: Rewrote tests with testutil for consul_test Signed-off-by: Elif T. Kuş <elifkus@gmail.com> * scrape: Rewrote tests with testutil for manager_test Signed-off-by: Elif T. Kuş <elifkus@gmail.com>	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

1 2 3 4

197 Commits (d3a1ff1abf9e426c085b8812b467d0f2b48c0a72)