Merge "[AAI] Service monitor for scraping prometheus metrics"

diff --cc kubernetes/aai/components/aai-graphadmin/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-traversal/values.yaml
Simple merge

diff --cc kubernetes/aai/templates/service.yaml
Simple merge

diff --cc kubernetes/aai/values.yaml
index b463f9c,f4061be..0ba461c
--- 1/kubernetes/aai/values.yaml
--- 2/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@@ -404,31 -392,9 +404,33 @@@ service
    externalPlainPort: 80
    internalPlainPort: 8080
    nodeport: 33
+   aaiServiceClusterIp:
+   sessionAffinity: None
  
 +metricsService:
 +  type: ClusterIP
 +  portName: prometheus
 +  externalPort: 8448
 +  internalPort: 8448
 +
 +metrics:
 +  serviceMonitor:
 +    enabled: false
 +    targetPort: 8448
 +    path: /metrics
 +    basicAuth:
 +      enabled: false
 +
 +    selector:
 +      app: '{{ include "common.name" . }}-metrics'
 +      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
 +      release: '{{ include "common.release" . }}'
 +      heritage: '{{ .Release.Service }}'
 +
 +    relabelings: []
 +
 +    metricRelabelings: []
 +
  ingress:
    enabled: false
    service: