mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 11:34:05 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
8943 commits 249 branches 440 tags 659 MiB
Commit graph

118 commits

Author SHA1 Message Date
3Xpl0it3r a0bac4b488
add kubeconfig support in discovery module (#8811) 
Signed-off-by: 3Xpl0it3r <shouc.wang@hotmail.com>
 2021-06-17 12:41:50 +02:00
Frederic Branczyk 039b651450
Merge pull request #8916 from Evesy/main 
Add class label to kubernetes ingress discovery
 2021-06-14 13:40:08 +02:00
Levi Harrison b5f6f8fb36 Switched to go-kit/log 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-11 12:28:36 -04:00
Mike Eves ae081886fa Fix up tests 
Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>
 2021-06-11 15:49:13 +01:00
Mike Eves 7941b350ba Don't set label if ingressClassName is not set 
Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>
 2021-06-11 15:14:23 +01:00
Mike Eves 7e1111ff14 Update label from class to class_name 
Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>
 2021-06-11 13:45:41 +01:00
Mike Eves 7e65ad3e43 Add class label to kubernetes ingress discovery 
Signed-off-by: Mike Eves <michael.eves@autotrader.co.uk>
 2021-06-11 11:27:15 +01:00
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>
 2021-06-01 00:49:29 +02:00
Marco Pracucci 4da5c25ea4
Upgrade prometheus/common to v0.21.0 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-04-21 12:19:16 +02:00
Bogdan Drutu d1ced85d7a
Bump k8s.io/* from 0.20.5 to 0.21.0 (#8714) 
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
 2021-04-13 10:00:00 +02:00
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>
 2021-02-26 22:50:56 +01:00
fuling 829b939891 [fix] service discovery : change var "eps" to "pod 
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
 2021-02-10 20:17:04 +08:00
Frederic Branczyk 19b0ec3baf
Merge pull request #8273 from fcddk/fcddk-k8s-enpoints-label 
K8s SD: add endpoints labels metadata
 2021-01-04 17:25:27 +01:00
fcddk b270a1d6bf import strutil package 
import strutil package

Signed-off-by: root <likerj@inspur.com>
 2020-12-16 16:27:03 +08:00
fcddk 617c56f55a add endponits labels metadata 
add endponits labels metadata

Signed-off-by: root <likerj@inspur.com>
 2020-12-16 16:07:49 +08:00
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>
 2020-12-16 10:56:01 +03:00
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>
 2020-10-29 09:43:23 +00:00
Julien Pivotto 4e5b1722b3
Move away from testutil, refactor imports (#8087) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-10-22 11:00:08 +02:00
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>
 2020-08-20 13:48:26 +01:00
Frederic Branczyk 06e2c2f804
Merge pull request #6838 from brancz/endpointslice 
discovery/kubernetes: EndpointSlice discovery
 2020-08-12 16:42:49 +02:00
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>
 2020-07-31 00:18:38 +02:00
Julien Pivotto 3e0ec3f8e1 Minor change 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-29 22:14:23 +02:00
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>
 2020-07-27 09:38:08 +01:00
Frederic Branczyk f6c5a75661 discovery/kubernetes: Add Kubernetes EndpointSlice discovery 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-14 21:55:27 +02:00
Frederic Branczyk 7b1c0d6b66
discovery/kubernetes: Fix incorrect premature break of reading results 
Previously `max` results stopped reading from results in tests
prematurely, as it stopped when `max` number of items were received from
the channel instead of `max` number of unique target groups received.
This caused flaky tests where the same target group was received
multiple times, as Kubernetes informers may emit the same event multiple
times.

Before this patch, running this test repeatedly failed eventually. After
this patch I have run the test many thousand times without failure.

```bash
go test -run TestEndpointsDiscoveryNamespaces -count 1000 -test.v
```

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2020-06-11 16:08:28 +02:00
Tariq Ibrahim 06a6621b6c
update kubernetes to v1.18.x and update ingress apiVersion 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2020-06-01 08:26:50 -07:00
Tariq Ibrahim 0730d6eb74
remove deprecated methods from the MetricProvider interface 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2020-04-06 09:23:58 -07:00
Frederic Branczyk d06f1034db discovery/kubernetes: Fix race in test setup 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2020-02-25 10:33:41 +01:00
李国忠 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>
 2020-02-25 09:22:14 +01:00
Simon Pasquier 06c1a07d5a discovery/kubernetes: remove extraneous parameters from send() 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-02-18 17:36:57 +01:00
Aleksandra Gacek 8e53c19f9c discovery/kubernetes: expose label_selector and field_selector 
Close #6807

Co-authored-by @shuttie
Signed-off-by: Aleksandra Gacek <algacek@google.com>
 2020-02-15 14:57:56 +01:00
Grebennikov Roman b4445ff03f discovery/kubernetes: expose label_selector and field_selector 
Closes #6096

Signed-off-by: Grebennikov Roman <grv@dfdx.me>
 2020-02-15 14:57:38 +01:00
Ben Ye 1a18594176
keep kubernetes metrics in global vars (#6765) 
Signed-off-by: yeya24 <yb532204897@gmail.com>
 2020-02-06 15:52:57 +00:00
Simon Pasquier 75470f86b4 discovery/kubernetes: fix client metrics 
The Kubernetes client records workqueue duration and latency metrics as
seconds so there's no need to convert the values from microseconds to
seconds anymore.

The cache metrics (prometheus_sd_kubernetes_cache_*) are removed because
they aren't used anymore by the client though still exposed by its API.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-11-29 12:34:36 +01:00
Yao Zengzeng 1afa476b8a minor fix for making map (#6076) 
Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
 2019-10-25 20:06:00 -06:00
Simon Pasquier 8ec6f02854 discovery: don't log errors on context cancelation 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-10-09 11:51:38 +02:00
Tariq Ibrahim f0a5f88b95 [prometheus_sd/kubernetes]add new node address types for discover (#5902) 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-08-20 15:52:11 +01:00
Julius Volz b5c833ca21
Update go.mod dependencies before release (#5883) 
* Update go.mod dependencies before release

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Add issue for showing query warnings in promtool

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Revert json-iterator back to 1.1.6

It produced errors when marshaling Point values with special float
values.

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Fix expected step values in promtool tests after client_golang update

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Update generated protobuf code after proto dep updates

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-08-14 11:00:39 +02:00
tariqibrahim df99d943ba pass multiple args to Registers.MustRegister method 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-08-12 22:56:10 -07:00
dzzg 938ca06057
fix wrong spells in ingress.go 
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
 2019-07-28 02:07:23 +08:00
sh0rez 8ba23fb336
fix(style): container_is_init to container_init 
Removes 'is' keyword to comply style guide

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-29 16:16:19 +02:00
sh0rez 88b79bae64
chore(style): Comply with style guide, order list 
Signed-off-by: sh0rez <me@shorez.de>
 2019-05-29 11:22:10 +02:00
sh0rez 6618f28fd7
test(discovery/kubernetes): TestPodDiscoveryInitContainer 
Adds a test to check whether an InitContainer is included in the discovery

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-28 16:51:58 +02:00
sh0rez fbd5c6f310
test(discovery/kubernetes): add container_is_init label to tests 
Adds the new container_is_init label to the current tests to make them pass again

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-27 19:16:03 +02:00
sh0rez cfa253ae06
feat(discovery/kubernetes): container_is_init label 
Adds a label that shows whether the container is an init container or not

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-27 17:48:15 +02:00
sh0rez bea07fe866
feat(discovery/kubernetes): include InitContainers 
Includes InitContainers in the ServiceDiscovery

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-26 22:53:14 +02:00
Simon Pasquier 3441ecdea1 discovery/kubernetes: add node name and hostname to endpoints 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-16 10:49:13 +02:00
Simon Pasquier 45506841e6
*: enable all default linters (#5504) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-03 15:11:28 +02:00
Frederic Branczyk 3cffd81035
Merge pull request #5520 from YaoZengzeng/service 
The workqueue of service should be `service` other than `ingress`
 2019-04-29 14:03:21 +02:00
YaoZengzeng 658b33808c The workqueue of service should be service other than ingress 
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2019-04-29 17:21:35 +08:00