diff --git a/docs/weave-net-support.md b/docs/weave-net-support.md index 8ba122a40d4c5ca7b134207bf0a7cf992a9d3264..e7d87961cef8a71af8aa084980692f5faf2339d5 100644 --- a/docs/weave-net-support.md +++ b/docs/weave-net-support.md @@ -64,4 +64,5 @@ kubectl create -f prometheus-serviceWeaveNet.yaml kubectl create -f prometheus-serviceMonitorWeaveNet.yaml kubectl apply -f prometheus-rules.yaml kubectl apply -f grafana-dashboardDefinitions.yaml +kubectl apply -f grafana-deployment.yaml ``` diff --git a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet index 2f6f99a7aa4abb6ffc7e49447d52b79e8ebbf8df..c75587ab6fbab0ba63e67e64f09abc5f02623e18 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet @@ -5,7 +5,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; { prometheus+: { serviceWeaveNet: - service.new('weave-net', { 'k8s-app': 'weave-net' }, servicePort.newNamed('weave-net-metrics', 6782, 6782)) + + service.new('weave-net', { 'name': 'weave-net' }, servicePort.newNamed('weave-net-metrics', 6782, 6782)) + service.mixin.metadata.withNamespace('kube-system') + service.mixin.metadata.withLabels({ 'k8s-app': 'weave-net' }) + service.mixin.spec.withClusterIp('None'), @@ -23,7 +23,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; jobLabel: 'k8s-app', endpoints: [ { - port: 'weave-metrics', + port: 'weave-net-metrics', path: '/metrics', interval: '15s', },