prometheus

Commit Graph

Author	SHA1	Message	Date
Julien Pivotto	2bdb2e627f	Merge pull request #10914 from wangrzneu/add-endpointslice-label Add more labels for endpointslice and endpoints role in k8s discovery	1 year ago
Julien Pivotto	076056ccdf	Merge pull request #11642 from zoonage/main Do not add pods to target group if the PodIP status is not set	1 year ago
renzheng.wang	b2c5de2e65	fix lint issue Signed-off-by: renzheng.wang <wangrzneu@gmail.com>	2 years ago
renzheng.wang	98ffad01b8	update tests and docs 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
Mickael Carl	2f35619710	discovery/kubernetes: attach node labels when the endpoints TargetRef's kind are Node Signed-off-by: Mickael Carl <mcarl@apple.com>	2 years ago
cui fliter	276ca6a883	fix some comments Signed-off-by: cui fliter <imcusg@gmail.com>	2 years ago
Matthieu MOREL	bae9a21200	Merge branch 'main' into linter/nilerr Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	2 years ago
beorn7	5b53aa1108	style: Replace `else if` cascades with `switch` Wiser coders than myself have come to the conclusion that a `switch` statement is almost always superior to a statement that includes any `else if`. The exceptions that I have found in our codebase are just these two: * The `if else` is followed by an additional statement before the next condition (separated by a `;`). * The whole thing is within a `for` loop and `break` statements are used. In this case, using `switch` would require tagging the `for` loop, which probably tips the balance. Why are `switch` statements more readable? For one, fewer curly braces. But more importantly, the conditions all have the same alignment, so the whole thing follows the natural flow of going down a list of conditions. With `else if`, in contrast, all conditions but the first are "hidden" behind `} else if `, harder to spot and (for no good reason) presented differently from the first condition. I'm sure the aforemention wise coders can list even more reasons. In any case, I like it so much that I have found myself recommending it in code reviews. I would like to make it a habit in our code base, without making it a hard requirement that we would test on the CI. But for that, there has to be a role model, so this commit eliminates all `if else` occurrences, unless it is autogenerated code or fits one of the exceptions above. Signed-off-by: beorn7 <beorn@grafana.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
Matthieu MOREL	fb3eb21230	enable gocritic, unconvert and unused linters Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>	2 years ago
Peter Nicholson	138a1362d8	Add support for EndpointSlice conditions Signed-off-by: Peter Nicholson <petergoods@hotmail.com>	2 years ago
Ben Whetstone	32e9f6a39c	Add container ID as a meta label for pod targets Signed-off-by: Ben Whetstone <ben.whetstone@sysdig.com>	2 years ago
Jens Erat	728fdc959e	Kubernetes SD: disable resync timer While originally the resync period also forced refreshing from Kubernetes API server, this has been removed for some years now because watching the API server got more stable [1]. Today, this just results in all entities being sent to the service discovery again, which is valid from a general Prometheus perspective, but results in unnecessary CPU load and also breaks service discovery metrics. In especially, this makes monitoring "do we actually observe changes from Kubernetes API server" impossible (receiving constant updates from Kubernetes service discovery is a pretty valid assumption, for example nodes get frequent status updates, ...). Signed-off-by: Jens Erat <jens.erat@mercedes-benz.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
Aaron George	d542483e8c	k8s discovery: Ensure that the pod IP is in the status before adding to target group Signed-off-by: Aaron George <aaron@ometria.com> Signed-off-by: Aaron George <aaron@ometria.com>	2 years ago
Maciej Borsz	56eba3ace2	Use protobuf encoding in client-go Signed-off-by: Maciej Borsz <maciejborsz@google.com>	2 years ago
Karl Piplies	3782cb40d5	add loadbalancerip to service labels Signed-off-by: Karl Piplies <karl.piplies@mercedes-benz.com>	2 years ago
Frederic Branczyk	414c3e549c	Merge pull request #11002 from yngwiewang/feature/k8s-service-port-number feat:(kubernetes_sd): add __meta_kubernetes_service_port_number (#10945)	2 years ago
Robert Fratto	97be65387d	discovery/kubernetes: fix broken tests Signed-off-by: Robert Fratto <robertfratto@gmail.com>	2 years ago
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
yngwiewang	1abbf5a5c5	add __meta_kubernetes_service_port_number (#10945 ) Signed-off-by: yngwiewang <yngwiewang@163.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>	3 years ago
Frederic Branczyk	039b651450	Merge pull request #8916 from Evesy/main Add class label to kubernetes ingress discovery	4 years ago

1 2 3 4

166 Commits (a3f424641a9eb468da71ac14c3a7c1ef168a45a0)