Enabling metrics via service-monitor for vpc-cni

stable/aws-vpc-cni/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.18.2
+version: 1.18.3
 appVersion: "v1.18.2"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png

stable/aws-vpc-cni/README.md

@@ -99,6 +99,8 @@ The following table lists the configurable parameters for this chart and their d
 | `readinessProbe`        | Readiness probe settings for daemonset                  | (see `values.yaml`)                 |
 | `tolerations`           | Optional deployment tolerations                         | `[{"operator": "Exists"}]`          |
 | `updateStrategy`        | Optional update strategy                                | `type: RollingUpdate`               |
+| `serviceMonitor.enabled`   | Optional service monitor                                  | `false`               |
+| `serviceAnnotations`   | Optional labels for service                                 | `{}`                     |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` or provide a YAML file containing the values for the above parameters:
 

stable/aws-vpc-cni/templates/service.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "aws-vpc-cni.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.serviceAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+{{ include "aws-vpc-cni.labels" . | indent 4 }}
+spec:
+  ports:
+    - port: 61678
+      name: metrics
+      targetPort: metrics
+  selector:
+    k8s-app: aws-node
+{{- end }}

stable/aws-vpc-cni/templates/servicemonitor.yaml

@@ -0,0 +1,38 @@
+{{- if.Values.serviceMonitor.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "aws-vpc-cni.fullname" . }}
+  namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
+  labels:
+{{ include "aws-vpc-cni.labels" . | indent 4 }}
+  {{- with .Values.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  jobLabel: app.kubernetes.io/instance
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+{{ include "aws-vpc-cni.labels" . | indent 6 }}
+  endpoints:
+    - port: metrics
+      path: /metrics
+      scheme: http
+    {{- with .Values.serviceMonitor.interval }}
+      interval: {{ . }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.scrapeTimeout  }}
+      scrapeTimeout: {{ . }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+{{- end -}}

stable/aws-vpc-cni/values.yaml

@@ -210,3 +210,21 @@ eniConfig:
     #   id: subnet-789
     #   securityGroups:
     #   - sg-789
+
+serviceAnnotations: {}
+
+serviceMonitor:
+  # Specifies whether a service monitor should be created
+  enabled: false
+  # Namespace to create the service monitor in
+  namespace:
+  # Labels to add to the service monitor
+  additionalLabels: {}
+  # Prometheus scrape interval
+  interval: 1m
+  # Prometheus scrape timeout
+  scrapeTimeout:
+  # Relabelings to apply to samples before ingestion
+  relabelings:
+  # Metric relabelings to apply to samples before ingestion
+  metricRelabelings: