Commit graph

216 commits

Author SHA1 Message Date
Sergiusz Urbaniak
7d16598ef4
add Kubernetes templates 2020-09-18 08:18:27 +02:00
Sergiusz Urbaniak
4b5788e847
Merge pull request #286 from johanneswuerbach/macos-build
Use build args to fix building on macos
2020-04-20 09:54:54 +02:00
Johannes Würbach
d6b587d52b
Use build args to fix building on macos 2020-04-15 13:51:44 +02:00
Sergiusz Urbaniak
6e05ab938e
Merge pull request #284 from smarterclayton/hack_vendor_upstream
*: Update to sigs.k8s.io/metrics-server latest
2020-04-15 09:56:31 +02:00
Clayton Coleman
4ca64b85f0
vendor: Update vendor logic 2020-04-08 14:34:43 -04: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
Sergiusz Urbaniak
be9797dc49
Merge pull request #269 from s-urbaniak/go113
Makefile, go.mod: bump to 1.13
2020-02-13 12:12:19 +01:00
Sergiusz Urbaniak
cd12d4a020 Makefile, go.mod: bump to 1.13 2020-02-13 12:08:03 +01:00
Sergiusz Urbaniak
7225e3d6a7
Merge pull request #247 from sergii-koshel-exa/master
Ability to filter metrics according to labels provided
2020-02-13 10:52:29 +01:00
Sergii Koshel
128f9a29f5 vendored changes 2020-02-12 17:56:04 +02:00
Sergii Koshel
d091fff18b Update metrics apiserver to support filtering by labels 2020-02-12 17:54:40 +02:00
Sergiusz Urbaniak
5afd30edcf
Merge pull request #258 from rjackson90/patch-1
Small typo in config example snippet
2019-11-15 11:42:59 +01:00
Richard Jackson
ed4b59b359
Small typo in config example snippet 2019-11-13 15:29:13 -06:00
Sergiusz Urbaniak
03bc47e9fb
Merge pull request #214 from thisisamurray/patch-1
Yaml typo for seriesFilters example
2019-07-22 16:57:27 +02:00
Sergiusz Urbaniak
28a807aa9f
Merge pull request #220 from dbenoit17/dx-master
remove hard-coded amd64 arch
2019-07-19 13:41:58 +02:00
dbenoit
dce4c3f75f remove hard-coded amd64 arch 2019-07-16 10:08:31 -04:00
Sergiusz Urbaniak
7e520a889e
Merge pull request #161 from jsenon/patch-1
Update example
2019-07-15 10:50:33 +02:00
Andrew Murray
571fb936bc
Yaml typo for seriesFilters example
Missing `-` in order to make seriesFilters an array.
2019-06-23 10:23:37 -04:00
Sergiusz Urbaniak
3e6d59813b
Merge pull request #213 from paulfantom/fixes
*: use proper golang image and always set go111module in build pipeline
2019-06-20 15:00:30 +02:00
paulfantom
3365677208
*: use proper golang image and always set go111module in build pipeline 2019-06-20 14:47:40 +02:00
Sergiusz Urbaniak
f2fc8dea85
Merge pull request #212 from paulfantom/go1.12
*: move to go1.12 and go modules
2019-06-20 14:12:25 +02:00
paulfantom
552284f174
*: revendor dependencies after moving to go1.12 2019-06-20 14:01:34 +02:00
paulfantom
a47edfe5a9
*: move to go1.12 and go modules 2019-06-20 13:50:10 +02:00
Sergiusz Urbaniak
8c4001831d
Merge pull request #207 from montenegrodr/patch-1
typo
2019-06-03 09:36:46 +02:00
Robson D. Montenegro
57f60449f3
typo 2019-06-02 22:22:19 +01:00
Sergiusz Urbaniak
dc65c75140
Merge pull request #204 from kublr/master
Fixed config generation command in README
2019-05-23 08:18:26 +02:00
Sergey Kozlov
e689c0bcfb Fixed config generation command in README 2019-05-22 17:59:24 +07:00
Sergiusz Urbaniak
9df21aa545
Merge pull request #197 from s-urbaniak/external-namespace
pkg/naming/BuildExternal: respect namespace
2019-05-17 15:44:57 +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
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