prometheus

Commit Graph

Author	SHA1	Message	Date
Robert Fratto	823d24d1e9	discovery/kubernetes: add container image as metadata This commits adds a __meta_kubernetes_pod_container_image as a new metadata label. This can be used to alert on mismatched versions of targets who don't have a build_info metric, as well as injecting it into log lines for other consumers of discovery/kubernetes (e.g., Promtail). Signed-off-by: Robert Fratto <robertfratto@gmail.com>	2 years ago
Filip Petkovski	05da373dcb	kubernetes_sd: Allow attaching node labels for endpoint role The Kubernetes service discovery can only add node labels to targets from the pod role. This commit extends this functionality to the endpoints and endpointslices roles. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>	2 years ago
Filip Petkovski	7a78897d0b	Improve reliability of Kubernetes SD tests (#10761 ) The tests for Kubernetes SD rely on comparing target groups by first serializing them to JSON. However, the target group MarshalJSON function only serializes the __address__ label, which makes eliminates all other labels from the comparison. This commit implements a separate marshaling function intended for use in Kubernetes SD tests. The function serializes all target labels, making comparisons much more reliable. The commit also fixes all tests that started to fail due to the newly introduced change. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.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>	3 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>	3 years ago
nixargh	e76c6aac50	Fix #10507 : explicitly include gcp auth from k8s.io to kubernetes discovery Signed-off-by: nixargh <nixargh@protonmail.com>	3 years ago
Furkan	2939966634	Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice Fixes #9498 Signed-off-by: Furkan <furkan.turkal@trendyol.com> Signed-off-by: Erkan Zileli <erkan.zileli@trendyol.com> Co-authored-by: Batuhan Apaydin <batuhan.apaydin@trendyol.com>	3 years ago
fpetkovski	16bd0d7d5c	Index pods by node name Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>	3 years ago
fpetkovski	fa798d3042	Allow attaching node metadata Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>	3 years ago
cui fliter	c9b56d1a49	all: fix some typos (#10389 ) Signed-off-by: cuishuang <imcusg@gmail.com>	3 years ago
beorn7	35010daa90	Merge branch 'release-2.33' into beorn7/cleaning-up-cherrypicking-fallout	3 years ago
Julien Pivotto	9d63502204	k8s: improve 'own_namespace' Fail configuration unmarshalling if kubeconfig or api url are set with "own namespace" Only read namespace file if needed. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Georg Gadinger	c85efa02d9	Fix k8s target discovery when not running inside k8s When using Kubernetes service discovery on a Prometheus instance that's not running inside Kubernetes, the creation of the service discovery fails with a "no such file or directory" error as the special `/var/run/secrets/kubernetes.io/serviceaccount/namespace` file is not there. This commit moves the code that reads this file into the if-branch where no `APIServer.URL` is given (that one basically makes Prometheus assume it is running inside of a Kubernetes cluster). Signed-off-by: Georg Gadinger <nilsding@nilsding.org>	3 years ago
Georg Gadinger	4663f814d6	Fix k8s target discovery when not running inside k8s When using Kubernetes service discovery on a Prometheus instance that's not running inside Kubernetes, the creation of the service discovery fails with a "no such file or directory" error as the special `/var/run/secrets/kubernetes.io/serviceaccount/namespace` file is not there. This commit moves the code that reads this file into the if-branch where no `APIServer.URL` is given (that one basically makes Prometheus assume it is running inside of a Kubernetes cluster). Signed-off-by: Georg Gadinger <nilsding@nilsding.org>	3 years ago
fpetkovski	de87515b24	Implement target discovery in own k8s namespace This commit adds support for discovering targets from the same Kubernetes namespace as the Prometheus pod itself. Own-namespace discovery can be indicated by using "." as the namespace. Fixes #9782 Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>	3 years ago
Ed Schouten	a3e9628e0c	Kubernetes service discovery: add provider ID label (#9603 ) When using Kubernetes on cloud providers, nodes will have the spec.providerID field populated to contain the cloud provider specific name of the EC2/GCE/... instance. Let's expose this information as an additional label, so that it's easier to annotate metrics and alerts to contain the cloud provider specific name of the instance to which it pertains. Signed-off-by: Ed Schouten <eschouten@apple.com>	3 years ago
Mateusz Gozdek	ea924746b3	discovery/kubernetes: improve test logic for waiting for discoverers (#9584 ) When running tests in parallel, 10 milliseconds may not be enough for all discoverers to register, which will make test flaky. This commit changes the waiting logic to wait for number of discoverers to stop increasing during given time frame, which should be large enough for single discoverer to register in test environment. A following run passes with this commit: go test -failfast -race -count 100 -v ./discovery/kubernetes/ Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>	3 years ago
Mateusz Gozdek	b7bdf6fab2	Fix imports formatting According to `2829908806 (r58457095)`. Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>	3 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>	3 years ago
akatsadimas	ee77a6212f	discovery/kubernetes: issue overcapacity warning for endpoint rather than endpointslice Signed-off-by: akatsadimas <nkatsadim@gmail.com>	3 years ago
akatsadimas	dd2e666a8d	discovery/kubernetes: Warn user in case of endpoint over-capacity Signed-off-by: akatsadimas <nkatsadim@gmail.com>	3 years ago
Julien Pivotto	63b3e4e5ec	Enable HTTP2 again (#9398 ) We are re-enabling HTTP 2 again. There has been a few bugfixes upstream in go, and we have also enabled ReadIdleTimeout. Fix #7588 Fix #9068 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	b1bdde46c3	kubernetes ingress: adjust comment style Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Philip Gough	0af7250c52	discovery:kube: Support wildcard matching for ingress rules This change sets the scheme to https when a rule specified by Ingress matches a wildcard DNS entry in the ingress TLS hosts Signed-off-by: Philip Gough <philip.p.gough@gmail.com>	3 years ago
Takashi Kusumi	3ab8559d1c	Kubernetes SD: Fix golint issue Signed-off-by: Takashi Kusumi <tkusumi@zlab.co.jp>	3 years ago
Takashi Kusumi	40981c422b	Kubernetes SD: Introduce ingressAdaptor Signed-off-by: Takashi Kusumi <tkusumi@zlab.co.jp>	3 years ago
Takashi Kusumi	6634a570cf	Kubernetes SD: Support networking.k8s.io/v1 Ingress Signed-off-by: Takashi Kusumi <tkusumi@zlab.co.jp>	3 years ago
3Xpl0it3r	a0bac4b488	add kubeconfig support in discovery module (#8811 ) Signed-off-by: 3Xpl0it3r <shouc.wang@hotmail.com>	4 years ago
Frederic Branczyk	039b651450	Merge pull request #8916 from Evesy/main Add class label to kubernetes ingress discovery	4 years ago
Levi Harrison	b5f6f8fb36	Switched to go-kit/log Signed-off-by: Levi Harrison <git@leviharrison.dev>	4 years ago
Mike Eves	ae081886fa	Fix up tests Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>	4 years ago
Mike Eves	7941b350ba	Don't set label if ingressClassName is not set Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>	4 years ago
Mike Eves	7e1111ff14	Update label from `class` to `class_name` Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>	4 years ago
Mike Eves	7e65ad3e43	Add class label to kubernetes ingress discovery Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>	4 years ago
kongxs	632678a461	Fix spelling mistake (#8879 ) * Fix spelling mistake Signed-off-by: kjinan <2008kongxiangsheng@163.com> * Update discovery/kubernetes/endpoints.go Co-authored-by: Julien Pivotto <roidelapluie@gmail.com> Signed-off-by: kjinan <2008kongxiangsheng@163.com> Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>	4 years ago
Marco Pracucci	4da5c25ea4	Upgrade prometheus/common to v0.21.0 Signed-off-by: Marco Pracucci <marco@pracucci.com>	4 years ago
Bogdan Drutu	d1ced85d7a	Bump k8s.io/* from 0.20.5 to 0.21.0 (#8714 ) Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>	4 years ago
Julien Pivotto	93c6139bc1	Support follow_redirect This PR introduces support for follow_redirect, to enable users to disable following HTTP redirects. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
fuling	829b939891	[fix] service discovery : change var "eps" to "pod Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>	4 years ago
Frederic Branczyk	19b0ec3baf	Merge pull request #8273 from fcddk/fcddk-k8s-enpoints-label K8s SD: add endpoints labels metadata	4 years ago
fcddk	b270a1d6bf	import strutil package import strutil package Signed-off-by: root <likerj@inspur.com>	4 years ago
fcddk	617c56f55a	add endponits labels metadata add endponits labels metadata Signed-off-by: root <likerj@inspur.com>	4 years ago
Alexey Shumkin	73ddf603af	discovery/kubernetes: Fix valid label selector causing config error Label selector can be "set-based"(https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#set-based-requirement) but such a selector causes Prometheus start failure with the "unexpected error: parsing YAML file ...: invalid selector: 'foo in (bar,baz)'; can't understand 'baz)'"-like error. This is caused by the `fields.ParseSelector(string)` function that simply splits an expression as a CSV-list, so a comma confuses such a parsing method and lead to the error. Use `labels.Parse(string)` to use a valid lexer to parse a selector expression. Closes #8284. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>	4 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>	4 years ago
Julien Pivotto	4e5b1722b3	Move away from testutil, refactor imports (#8087 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 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>	4 years ago
Frederic Branczyk	06e2c2f804	Merge pull request #6838 from brancz/endpointslice discovery/kubernetes: EndpointSlice discovery	4 years ago
johncming	3c5ff27959	Update http header `User-Agent` in k8s and swarm discovery. (#7614 ) * discovery: update k8s and swarm user agent. Signed-off-by: johncming <johncming@yahoo.com>	4 years ago
Julien Pivotto	3e0ec3f8e1	Minor change Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 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>	4 years ago

1 2 3

145 Commits (823d24d1e963dfc8a3d0bd54de268939fcf51317)