Commit graph

68 commits

Author SHA1 Message Date
Carson Anderson
0536a5d481 Add label value replacers to the config and query 2021-03-05 16:53:18 -07:00
Kubernetes Prow Robot
7e11fe30ee
Merge pull request #372 from paulfantom/json
pkg/config: allow configuration to be read from json schema
2021-03-01 05:22:46 -08:00
paulfantom
cd55a67b89
*: move all imports to github.com/kubernetes-sigs/prometheus-adapter
Signed-off-by: paulfantom <pawel@krupa.net.pl>
2021-02-22 15:49:03 +01:00
paulfantom
1cc7bed020
pkg/config: allow configuration to be read from json schema 2021-02-22 10:17:27 +01:00
Sergiusz Urbaniak
f33fc94229
Merge pull request #348 from dgrisonnet/populate-selector
Populate metric selector for custom metrics
2020-12-15 15:54:52 +01:00
Sergiusz Urbaniak
147b5c8858
pkg/api/generated: regenerate 2020-12-14 12:43:59 +01:00
Damien Grisonnet
76020f6618 pkg/custom-provider: populate metric selector
When querying custom-metrics, the metric label selectors weren't
populated in the resulting values.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
2020-12-10 16:14:22 +01:00
Johannes Würbach
b09c680295
ensure openapi is up-to-date and use same kube-openapi version 2020-11-10 16:07:17 +01:00
Sergiusz Urbaniak
87c429b5c6
Merge pull request #330 from joelsmith/master
Populate both CPU and Memory resource container metrics if one is specified
2020-10-30 07:30:26 +01:00
Sergiusz Urbaniak
69569bf7ab pkg/client: refactor to klog/v2 api 2020-10-28 15:57:23 +01:00
Sergiusz Urbaniak
752ce84723 cmd/*,pkg/*,docs,go.mod: bump custom-metrics-apiserver, metrics-server 2020-10-28 15:52:12 +01:00
Sergiusz Urbaniak
a858d53495 pkg/*,cmd/*: move to k8s.io/klog/v2 2020-10-28 15:48:05 +01:00
Joel Smith
bdc8b487ba Populate both CPU and Memory resource container metrics if one is specified 2020-10-27 19:39:13 -06:00
Johannes Würbach
1d44cbbbb8
Serve openapi spec 2020-10-23 11:06:41 +02:00
Johannes Würbach
47a5ed8047
Adjustments after metrics-server update 2020-10-23 11:06:40 +02:00
Aya Igarashi
5a6322b4ce Fix NaN not to be cast to int64 2020-08-11 20:49:27 +09:00
Clayton Coleman
c6ac5cbc87
*: Update to sigs.k8s.io/metrics-server latest
Pick up changes to 1.17 to custom-metrics-apiserver and the latest
changes in metrics-server to allow us to show table results for
podmetrics and nodemetrics. Fix import and interface changes as
necessary.

The localvendor directory is an artifact of a change in sigs.k8s.io:

sigs.k8s.io/metrics-server now requires this dependency in order to
resolve, even though we do not use the scraper package.

go: sigs.k8s.io/metrics-server@v0.3.7 requires
    k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1@v0.0.0: reading k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/pkg/kubelet/apis/stats/v1alpha1/go.mod at revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0: unknown revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0
2020-04-08 11:47:25 -04:00
Sergii Koshel
d091fff18b Update metrics apiserver to support filtering by labels 2020-02-12 17:54:40 +02:00
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
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
paulfantom
0d5c3ebd04
pkg/naming: add unit tests 2019-05-17 11:47:29 +02: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
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
Jens Ulrich Hjuler Pedersen
113f90ec5e
Remove unnecessary log line - Fix #188 2019-04-24 10:03:35 +02: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
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
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
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
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
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
Nail Islamov
3f1b120eda
Add a flag metrics-start-duration 2018-11-28 12:13:07 +11:00
Tiago Matias
2e82759ca9 fix typos
revert from less ideal wording

more typos
2018-11-20 10:09:02 -02: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
Solly Ross
9d7157f7cc Reduce metric namer label-GVR logspam
It's fairly common to have a label pattern that matches lots of
irrelevant labels, so this makes the "error" about being unable to
normalize/resolve a label to a GVR a V(9) info log, instead of an error
log.
2018-08-20 16:53:51 -04:00
Tanner Bruce
1ec7809eaf use strict unmarshalling to ensure correct configuration 2018-08-09 16:30:06 -05:00