12 commits

Author	SHA1	Message	Date
Frederic Branczyk	edcf458e9c	*: Fix CRD generation	2018-07-02 16:54:56 +02:00
Tamal Saha	39306eb830	Update client libraries to Kubernetes 1.11	2018-07-01 09:23:00 -07:00
Nicholas Whitehead	3963aaa114	Adds proxy_url to v1.Endpoint. Fixes #1385	2018-05-30 05:20:21 -04:00
Max Leonard Inden	433406488f	Revert "Merge pull request #1100 from metalmatze/staticconfigs" ... This reverts commit 3533e1c22f, reversing changes made to 0ae7f5ddf9. With the _additional-scrape-config_ feature via Kubernetes secrets, the _static-configs_ feature in Service Monitors is redundant. This patch reverts the latter one.	2018-04-25 16:02:53 +02:00
Max Leonard Inden	ab13af9628	Revert "Merge pull request #1194 from metalmatze/statictargets-fix" ... This reverts commit 7c84fdb17d, reversing changes made to fa10f2751c. With the _additional-scrape-config_ feature via Kubernetes secrets, the _static-configs_ feature in Service Monitors is redundant. This patch reverts the latter one.	2018-04-25 16:02:40 +02:00
Matthias Loibl	d8bcab8d70	Add experimental to comment for StaticTargets	2018-04-09 12:27:42 +02:00
Matthias Loibl	83f233ae32	Simplify ServiceMonitor to simply use StaticTargets	2018-04-05 20:25:39 +02:00
Matthias Loibl	1780729b5a	Add StaticConfigs to ServiceMonitors	2018-04-05 19:31:10 +02:00
Frederic Branczyk	cc7ecdd8c7	prometheus: Make relabeling fields optional	2018-04-03 11:26:18 +02:00
Frederic Branczyk	06c8308952	prometheus: Add ability to whitelist Kubernetes labels	2018-03-23 16:13:28 +01:00
Alexander Dobriakov	67ed5b20b5	documentation: clarify _RelabelConfig_ usage ... The _RelabelConfig_ is confusing and connotes, that it is about `<relabel_config>`-section of the configuration, but in reality it is about `<metric_relabel_configs>`-section. Comment in `types.go` was changed and `make generate` run to update generated documentation.	2018-03-02 15:13:16 +01:00
Antoine Legrand	9d7d753a55	Factorize the NewCustomCRD function	2018-01-30 15:30:00 +01:00