From cbbfa0cad5ca7e231f8a255e95255d75fb75612c Mon Sep 17 00:00:00 2001
From: karancode <karan.thanvi@paypay-corp.co.jp>
Date: Tue, 22 Oct 2019 20:33:03 +0900
Subject: [PATCH] move eks serviceMonitor to patch files
---
.../kube-prometheus-aws-eks-cni.libsonnet | 32 +++++++++++++++++++
.../prometheus/prometheus.libsonnet | 32 -------------------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet
index 65914040..1d782e90 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet
@@ -9,5 +9,37 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
service.mixin.metadata.withNamespace('kube-system') +
service.mixin.metadata.withLabels({ 'k8s-app': 'aws-node' }) +
service.mixin.spec.withClusterIp('None'),
+ serviceMonitorAwsEksCNI:
+ {
+ apiVersion: 'monitoring.coreos.com/v1',
+ kind: 'ServiceMonitor',
+ metadata: {
+ name: 'awsekscni',
+ namespace: p.namespace,
+ labels: {
+ 'k8s-app': 'eks-cni',
+ },
+ },
+ spec: {
+ jobLabel: 'k8s-app',
+ selector: {
+ matchLabels: {
+ 'k8s-app': 'aws-node',
+ },
+ },
+ namespaceSelector: {
+ matchNames: [
+ 'kube-system',
+ ],
+ },
+ endpoints: [
+ {
+ port: 'cni-metrics-port',
+ interval: '30s',
+ path: '/metrics',
+ },
+ ],
+ },
+ },
},
}
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index a2e311b1..42baf52a 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -440,37 +440,5 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
],
},
},
- serviceMonitorAwsEksCNI:
- {
- apiVersion: 'monitoring.coreos.com/v1',
- kind: 'ServiceMonitor',
- metadata: {
- name: 'awsekscni',
- namespace: p.namespace,
- labels: {
- 'k8s-app': 'eks-cni',
- },
- },
- spec: {
- jobLabel: 'k8s-app',
- selector: {
- matchLabels: {
- 'k8s-app': 'aws-node',
- },
- },
- namespaceSelector: {
- matchNames: [
- 'kube-system',
- ],
- },
- endpoints: [
- {
- port: 'cni-metrics-port',
- interval: '30s',
- path: '/metrics',
- },
- ],
- },
- },
},
}
--
GitLab