Merge pull request #448 from alok87/446-weave-net

Fixes for the weave-net monitoring setup
This commit is contained in:
Lili Cosic 2020-03-12 12:14:55 +01:00 committed by GitHub
commit b100eead2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -64,4 +64,5 @@ kubectl create -f prometheus-serviceWeaveNet.yaml
kubectl create -f prometheus-serviceMonitorWeaveNet.yaml kubectl create -f prometheus-serviceMonitorWeaveNet.yaml
kubectl apply -f prometheus-rules.yaml kubectl apply -f prometheus-rules.yaml
kubectl apply -f grafana-dashboardDefinitions.yaml kubectl apply -f grafana-dashboardDefinitions.yaml
kubectl apply -f grafana-deployment.yaml
``` ```

View File

@ -5,7 +5,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
{ {
prometheus+: { prometheus+: {
serviceWeaveNet: 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.withNamespace('kube-system') +
service.mixin.metadata.withLabels({ 'k8s-app': 'weave-net' }) + service.mixin.metadata.withLabels({ 'k8s-app': 'weave-net' }) +
service.mixin.spec.withClusterIp('None'), service.mixin.spec.withClusterIp('None'),
@ -23,7 +23,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
jobLabel: 'k8s-app', jobLabel: 'k8s-app',
endpoints: [ endpoints: [
{ {
port: 'weave-metrics', port: 'weave-net-metrics',
path: '/metrics', path: '/metrics',
interval: '15s', interval: '15s',
}, },