Commit graph

366 commits

Author SHA1 Message Date
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
Matthias Loibl
5d837a29dd
Add --prometheus-ca-file flag for specific ca 2018-11-23 17:25:22 +01:00
Tiago Matias
2e82759ca9 fix typos
revert from less ideal wording

more typos
2018-11-20 10:09:02 -02:00
Solly Ross
3bd75f5c3a
Merge pull request #127 from tmatias/typo
fix typo
2018-11-12 14:42:15 -08:00
Tiago Matias
405a55521f fix typo 2018-11-12 15:50:11 -02:00
Frederic Branczyk
5a461c3fcd
Merge pull request #124 from metalmatze/readme-updates
Update README to container resource metrics API
2018-11-07 15:59:56 +01:00
Matthias Loibl
d12e5f0684
Improve sentence mentioning metrics server in README.md 2018-11-07 15:18:08 +01:00
Matthias Loibl
7360c51c0e
Update README to container resource metrics API 2018-11-06 15:57:33 +01:00
Frederic Branczyk
919c8bcbe9
Merge pull request #120 from tmatias/patch-1
fix typo
2018-10-26 16:13:16 +02:00
Tiago Matias
94b0063c52
fix typo 2018-10-19 16:31:07 -03:00
Solly Ross
7a421bb91e
Merge pull request #106 from DirectXMan12/feature/resource-metrics
Resource Metrics API Support
2018-10-04 07:34:08 -07:00
Solly Ross
083300bf32
Merge pull request #115 from richardbrks/fix-docs
Fix docs
2018-10-03 08:38:13 -07:00
Solly Ross
5f52b29d47 Disable the custom metrics API with no rules
This disables the custom metrics API when no custom metrics rules are
given (the resource metrics API acts equivalently).  This allows a given
adapter to serve only one of the APIs, if desired.
2018-10-03 11:05:43 -04:00
Solly Ross
6c8f44623e Add tests for the resource metrics provider
This adds basic tests for the resource metrics provider, and fixes up
the default config slightly.
2018-10-03 11:05:43 -04:00
Solly Ross
49287fecc9 Extract fake Prometheus client impl
This extracts the fake prometheus client for use across different tests.
2018-10-03 11:05:43 -04:00
Solly Ross
cc08a1fb41 Switch to ginkgo/gomega for tests
This switches over to ginkgo/gomega for tests, which makes writing
certain tests easier/more fluent in the future.
2018-10-03 11:05:43 -04:00
Solly Ross
c5801455ec Introduce support for the resource metrics API
This introduces support for the resource metrics in the adapter.
The individual queries and window sizes are fully customizable via a new
config section.  This uses just the generic machinery from
metrics-server to serve the API.
2018-10-03 11:05:43 -04:00
Solly Ross
74c0c53e4f Refactor metrics query building to interface
This moves the metrics query building to a separate interface in the
naming package so that it can be used across providers.
2018-10-03 11:05:43 -04:00
Solly Ross
7dd9e94aea Extract label-resource logic to separate package
This extracts the label-to-resource conversion to a separte "naming" package for
use across different providers.

Early versions of the commit were done by antoinne85 in #79.
2018-10-02 16:57:55 -04:00
Solly Ross
d02384477a Upgrade boilerplate to latest
The latest boilerplate comes with a lot of simplifications and helpers
that let us reduce the amount of code written.
2018-10-02 16:57:55 -04:00
richardbrks
94379a1780 delete repeated phrase 2018-09-28 12:53:39 -04:00
richardbrks
8d12f4f5fd correct capitalization 2018-09-28 12:40:07 -04:00
richardbrks
b381aef37b correct file path 2018-09-28 07:54:52 -04:00