Commit graph

488 commits

Author SHA1 Message Date
paulfantom
e84becd7ac
pkg/names: test namespaced external metrics selectors 2019-05-17 15:35:04 +02:00
Sergiusz Urbaniak
486324753e
pkg/naming/BuildExternal: respect namespace
Currently, the namespace is ignored for external labels.

This fixes it.
2019-05-17 15:02:57 +02:00
Sergiusz Urbaniak
4b695d4e06
Merge pull request #196 from s-urbaniak/external-metric-name
pkg/external-provider: set metric name for scalar values
2019-05-17 14:40:42 +02:00
paulfantom
2374cef641
pkg/naming: fix unit test 2019-05-17 14:36:02 +02:00
Sergiusz Urbaniak
99d52a4ce8
pkg/external-provider: set metric name for scalar values 2019-05-17 14:31:41 +02:00
Sergiusz Urbaniak
83036844f9
Merge pull request #192 from s-urbaniak/issue-191
pkg/naming: fix LabelValuesByName rendering
2019-05-17 11:59:02 +02:00
paulfantom
0d5c3ebd04
pkg/naming: add unit tests 2019-05-17 11:47:29 +02:00
Sergiusz Urbaniak
f0ec22a3f5
Merge pull request #193 from YaoZengzeng/faq
faq for namespace prefixed metrics access
2019-05-14 13:33:18 +02:00
YaoZengzeng
43c00d9c1c faq for namespace prefixed metrics access
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-05-10 15:54:58 +08:00
Sergiusz Urbaniak
9e072b2b57
pkg/naming: fix LabelValuesByName rendering
According to documentation LabelValuesByName is supposed to render "|" separated values.
Currently it is returned as a slice per label name. This fixes it

Fixes #191
2019-05-07 14:04:29 +02:00
Sergiusz Urbaniak
ff0a50100d
Merge pull request #190 from s-urbaniak/bump-1.14
bump to k8s 1.14
2019-04-24 12:16:31 +02:00
Sergiusz Urbaniak
72abf135d6 vendor dependencies 2019-04-24 11:06:03 +02:00
Sergiusz Urbaniak
604208ef4f pkg/custom-provider: refactor MetricValue signature 2019-04-24 11:04:42 +02:00
Sergiusz Urbaniak
f18b6fd370 *: replace glog with klog 2019-04-24 11:04:42 +02:00
Sergiusz Urbaniak
f69586b71c cmd/adapter: fix logs package
... as it moved.

https://github.com/kubernetes/kubernetes/pull/72890
2019-04-24 11:04:42 +02:00
Sergiusz Urbaniak
fe25941b91 gopkg: bump to k8s 1.14 2019-04-24 11:04:42 +02:00
Sergiusz Urbaniak
27a617bb9e
Merge pull request #189 from Multiply/remove-unnecessary-log-line
Remove unnecessary log line - Fix #188
2019-04-24 10:13:21 +02:00
Jens Ulrich Hjuler Pedersen
113f90ec5e
Remove unnecessary log line - Fix #188 2019-04-24 10:03:35 +02:00
Sergiusz Urbaniak
680e404250
Merge pull request #146 from john-delivuk/em-isolation
External Metrics contd
2019-04-03 16:02:57 +02:00
John Delivuk
fa27078586
Merge branch 'master' of github.com:DirectXMan12/k8s-prometheus-adapter into em-isolation 2019-03-28 21:10:29 -04:00
Sergiusz Urbaniak
d447eb1ec2
pkg/naming: add non-namespace resources
This is a merge commit back-porting PR #179
2019-03-28 21:04:42 -04:00
Sergiusz Urbaniak
5de0247b4a
Merge pull request #179 from xjas/namespaced-fix
Fix namespaced bug of node resource for issue #178
2019-03-28 13:05:25 +01:00
John Delivuk
e103a8eed2
Adding updated test 2019-03-26 19:05:32 -04:00
John Delivuk
ff409a0994
Refactoring external to leverage naming 2019-03-26 18:57:02 -04:00
song.chen
918954bd5e Amend for PR:[#179], relevant issue:[#178]
Fix namespaced bug of node resource && pv resource
By doing this fix, the CI can pass
2019-03-22 10:13:33 +08:00
song.chen
27c3bc1b88 Fix issue:[#178](https://github.com/DirectXMan12/k8s-prometheus-adapter/issues/178)
Fix namespaced bug of node resource, node resource should be a
non-namespaced resource as the resource namespace.

By doing this fix, node resouce can be accessed as expected, as the issue explains.

Closes issue:[#178](https://github.com/DirectXMan12/k8s-prometheus-adapter/issues/178)
2019-03-21 20:30:17 +08:00
John Delivuk
3f7f249cb8
Removing RestMapper, cleaning up notification hanlder 2019-03-08 13:29:36 -05:00
John Delivuk
0bb762b367
Adding license to externalprovider and naming. 2019-02-22 10:29:24 -05:00
John Delivuk
980bc01d67
Updating Errors, and adding license 2019-02-22 10:04:10 -05:00
John Delivuk
8ef8c8a291
Fixing dependency in custom-provider 2019-02-11 12:12:57 -05:00
John Delivuk
ed9eb31b3a
CustomProvider needed to have references updated as well 2019-02-10 19:12:29 -05:00
John Delivuk
b379be6818
Vendoring testify/require 2019-02-10 19:04:43 -05:00
John Delivuk
6030912cc0
Moving metric naming to it's own package 2019-02-10 15:59:14 -05:00
Solly Ross
c2e176bb23
Merge pull request #158 from linux-on-ibm-z/cross-compile
Edited Makefile to add cross build support for s390x.

Adding External Metrics Provider
2019-02-10 15:59:11 -05:00
Julien Senon
7480349096
Update example
Update sample deployment yaml
2019-02-08 14:00:08 +01:00
Solly Ross
ab6ada9081
Merge pull request #158 from linux-on-ibm-z/cross-compile
Edited Makefile to add cross build support for s390x.
2019-01-31 13:23:24 -08:00
root
a02ca0fbad Edited Makefile to add cross build support for s390x. As golang:1.10 has multi-arch support added for s390x. 2019-01-08 16:02:17 +05:30
Frederic Branczyk
dce283def1
Merge pull request #148 from brancz/empty-err
Fix empty pod or node list resulting in an error
2018-12-13 16:03:49 -08:00
Frederic Branczyk
7624952870
resourceprovider: Add comments on possible nil results 2018-12-13 15:50:02 -08:00
Frederic Branczyk
e9ef0bb4d0
Fix empty pod or node list resulting in an error 2018-12-11 10:21:21 -08:00
Frederic Branczyk
1e5a868378
Merge pull request #143 from s-urbaniak/token
cmd/adapter: add prometheus bearer token configuration
2018-12-05 17:13:47 +01:00
Sergiusz Urbaniak
326bf3c276 cmd/adapter: add prometheus bearer token configuration
Often prometheus is gated by some proxy requiring an auth bearer
token. Currently there is no possibility to configure one except for
providing a full-fledged kubeconfig.

This fixes it by adding a new flag pointing to an optional file
containing the auth bearer for prometheus communication.
2018-12-05 11:45:48 +01:00
Solly Ross
99104cba2a
Merge pull request #136 from nilebox/start-flag
Add a separate flag for 'start' parameter
2018-12-04 12:23:26 -08:00
Solly Ross
b3dfbe1b29
Merge pull request #128 from tmatias/typos
fix typos
2018-12-04 11:31:59 -08:00
Frederic Branczyk
d3bbe8247a
Merge pull request #141 from metalmatze/prom-ca-file
Support custom ca certificate to talk to Prometheus
2018-12-03 20:50:35 +01:00
Matthias Loibl
9fb46c3c55
Create a NewCertPool for custom CA certificate 2018-12-03 19:47:37 +01:00
Matthias Loibl
4a16ae6d9a
Log info when successfully loading certificates 2018-12-03 17:57:19 +01:00
Matthias Loibl
bef034e699
Improve error handling in adapter.go 2018-12-03 17:18:53 +01:00
Nail Islamov
88c0ad0b6a
Add validation 2018-11-28 12:20:09 +11:00
Nail Islamov
3f1b120eda
Add a flag metrics-start-duration 2018-11-28 12:13:07 +11:00