RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-23 15:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,003 Commits 243 Branches 444 Tags 652 MiB
1f3df4b81a
Commit Graph

491 Commits

Author SHA1 Message Date
Austin Cawley-Edwards
39a8db22eb Fix kuma_sd targetgroup reporting (#9157) 
* Bundle all xDS targets into a single group

Signed-off-by: austin ce <austin.cawley@gmail.com>
 2021-08-06 01:29:51 +02:00
George Brighton
e6e7b08e6f
Integrate feedback 
Signed-off-by: George Brighton <george@gebn.co.uk>
 2021-08-03 16:46:57 +01:00
George Brighton
1f752b6910
Incorporate feedback 
Signed-off-by: George Brighton <george@gebn.co.uk>
 2021-08-03 03:32:36 +01:00
George Brighton
2d8f9c6f61
Describe EC2 availability zones at most once per SD load 
Closes #9142.

Signed-off-by: George Brighton <george@gebn.co.uk>
 2021-08-02 20:52:37 +01:00
George Brighton
a715dd84ec
Describe EC2 availability zone IDs at most once per refresh (#9142) 
Signed-off-by: George Brighton <george@gebn.co.uk>
 2021-08-02 14:00:15 +01:00
Julien Pivotto
24165adadc
Merge pull request #9112 from darshanime/add_computer_name 
Add computer name to azure sd
 2021-07-30 09:58:49 +02:00
Frederic Branczyk
a266d4d2c5
Update Go dependencies 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2021-07-29 09:11:04 +02:00
darshanime
898afa2fd9 Add nil checks 
Signed-off-by: darshanime <deathbullet@gmail.com>
 2021-07-28 19:23:17 +05:30
jinglina
ed24e51e7c
remove redundant type conversion (#9126) 
Signed-off-by: jinglina <jinglinax@163.com>
 2021-07-28 13:33:46 +05:30
Julien Pivotto
dcba645366
Merge pull request #8978 from jfreeland/feat/additional-gce-interfaces 
feat: explicit gce interface ipv4 address metadata
 2021-07-26 19:38:59 +02:00
darshanime
c8a2ffdb72 Add computer name to azure sd 
Signed-off-by: darshanime <deathbullet@gmail.com>
 2021-07-25 22:07:44 +05:30
Julien Pivotto
79d354ad2e
Merge pull request #8844 from austince/feat/discovery-xds 
Add base xDS REST SD and kuma_sd implementation
 2021-07-23 09:46:36 +02:00
George Brighton
bc0e76c8a3
Add AZ ID label to discovered EC2 targets (#8896) 
* Add AZ ID to EC2 SD

Signed-off-by: George Brighton <george@gebn.co.uk>
 2021-07-23 09:42:03 +02:00
austin ce
0544bdd6af
Add tests for xDS discovery 
Signed-off-by: austin ce <austin.cawley@gmail.com>
 2021-07-21 12:55:02 -04:00
austin ce
d0ffe2ed3e
Add base xDS discovery and kuma SD implementation 
Signed-off-by: austin ce <austin.cawley@gmail.com>
 2021-07-21 12:55:02 -04:00
Joey Freeland
5d0a12855b Update discovery/gce/gce.go 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Joey Freeland <joey@free.land>
 2021-07-06 07:57:29 -04:00
Lukas Kämmerling
263847e64a
hcloud discovery: Add new labelpresent label (#9028) 
* Add new labelpresent label

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
 2021-07-03 01:51:50 +02:00
Julius Volz
179b2155d1
Fix: Use json.Unmarshal() instead of json.Decoder (#9033) 
* Fix: Use json.Unmarshal() instead of json.Decoder

See https://ahmet.im/blog/golang-json-decoder-pitfalls/

json.Decoder is for JSON streams, not single JSON objects / bodies.

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

* Revert modifications to targetgroup parsing

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-07-02 09:38:14 +01:00
Julius Volz
441e6cd7d6
Merge release-2.28 back into main (#9035) 
* Cut v2.28.0-rc.0 (#8954)

* Cut v2.28.0-rc.0

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

* Changelog fixup

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

* Address review comments

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

* Downgrade some features to enhancements

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

* Adjust release date to today

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

* Migrate HTTP SD docs from docs repo (#8972)

See discussion in https://github.com/prometheus/docs/pull/1975

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

* Cut Prometheus v2.28.0 (#8973)

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

* HTTP SD: Allow charset in content type (#8981)

* Added content type regex

Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* fixed disappeared target groups in http_sd #9019

Signed-off-by: servak <fservak@gmail.com>

* Add a testcase for http-sd

Signed-off-by: servak <fservak@gmail.com>

* HTTP SD: Simplify logic of disappeared targetgroups (#9026)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Fix logging after the move to go-kit/log (#9021)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Cut Prometheus v2.28.1 (#9034)

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

Co-authored-by: Levi Harrison <git@leviharrison.dev>
Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Co-authored-by: servak <fservak@gmail.com>
 2021-07-01 18:02:13 +02:00
Joey Freeland
8017dd7242 chore: always append interface ipv4 with api interface name 
Signed-off-by: Joey Freeland <joey@free.land>
 2021-06-29 09:01:34 -07:00
Levi Harrison
78d5a6d083
HTTP SD: Allow charset in content type (#8981) 
* Added content type regex

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-28 08:46:53 +02:00
Ben Kochie
7cb55d5732
Merge pull request #8802 from mwasilew2/yaml-linting 
Adds yamllinting to Makefile.common
 2021-06-24 15:59:35 +02:00
Julien Pivotto
d8219f29f4
Merge pull request #8983 from roidelapluie/httpsdtests 
HTTP SD: Add tests
 2021-06-23 12:29:27 +02:00
Julien Pivotto
1deac8f570 HTTP SD: Add tests 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-06-23 09:40:50 +02:00
Joey Freeland
77e25cf2e5 feat: gce metadata for additional interfaces 
Signed-off-by: Joey Freeland <joey@free.land>
 2021-06-21 21:37:04 -07:00
Julius Volz
8d98750e8f
Simplify float formatting for HTTP SD refresh interval (#8961) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-06-18 11:49:30 +02:00
Levi Harrison
4a4882d4c7 Replace godoc.org links 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-17 07:18:51 -04:00
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
Michal Wasilewski
3f686cad8b
fixes yamllint errors 
Signed-off-by: Michal Wasilewski <mwasilewski@gmx.com>
 2021-06-12 12:47:47 +02:00
Levi Harrison
faed8df31d
Enable reading consul token from file (#8926) 
* Adopted common http client

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-12 00:06:59 +02:00
Levi Harrison
bf1ef2e0f4
Changed log package 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-11 15:23:58 -04:00
Julien Pivotto
c0c22ed042
Merge pull request #8927 from LeviHarrison/move-to-go-kit/log 
Migrate From `go-kit/kit/log` to `go-kit/log`
 2021-06-11 21:15:56 +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
Julien Pivotto
9444698ae2
http_sd (#8839) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-06-11 18:04:45 +02: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
Austin Cawley-Edwards
301815e48b
Update prometheus-common and the consul HTTP client (#8913) 
* Update to prometheus-common@v0.29.0

Signed-off-by: austin ce <austin.cawley@gmail.com>
 2021-06-11 14:24:41 +02: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
Frederic Hemberger
39a87fd9d2 consul_sd: Add namespace support for Consul Enterprise 
Signed-off-by: Frederic Hemberger <mail@frederic-hemberger.de>
 2021-06-09 16:35:02 +02:00
songjiayang
b781b5cac5
Refactor file discovery init function (#8891) 
* Refactor file discovery init function

Combine to one init function like other discovery.

Signed-off-by: songjiayang <songjiayang1@gmail.com>
 2021-06-04 14:43:24 +02:00
TJ Hoplock
dc22c65349
Add Linode Service Discovery (#8846) 
* Add Linode Service Discovery

Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
 2021-06-01 20:32:36 +02: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
kcx2366425574
17e230a6f2 fix actuel to actual 
Signed-off-by: kcx2366425574 <18279911430@163.com>
 2021-05-31 15:40:05 +08:00
Julien Pivotto
e1774b6f83 Fix the computation of prometheus_sd_discovered_targets 
prometheus_sd_discovered_targets is wrongly calculated when there are
multiple SD configurations in place. One discovery manager can have
multiple groups coming from multiple service discoveries.

When multiple service discovery configs are used, we do not compute the
metric correctly, and instead just set the metric to one of the service
discoveries.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-05-14 22:38:37 +02:00
Julien Pivotto
2a4b8e12bb
Merge pull request #8766 from Nick-Triller/consul-sd-always-send-targetgroups 
Send empty targetgroup if nothing discovered [consul_sd]
 2021-04-30 10:27:41 +02:00
Hu Shuai
9d7d818629
Fix golint issues caused by typos (#8769) 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2021-04-29 10:05:33 +02:00
Nick Triller
15d328750a
Fix typo in SD docs 
Signed-off-by: Nick Triller <nicktriller@gmail.com>
 2021-04-29 09:06:52 +02:00
Nick Triller
fddf4918c0
Send empty targetgroup if nothing discovered 
Signed-off-by: Nick Triller <nicktriller@gmail.com>
 2021-04-29 09:06:52 +02:00