Show service specific metrics in dashboard. Fix aggregator metrics. (#1198)

Signed-off-by: sami <sami@appscode.com>

Author: samiulsami

apis/installer/v1alpha1/ace_marketplace_api_types.go

@@ -74,8 +74,10 @@ type MarketplaceApiSpec struct {
 	// If specified, the pod's scheduling constraints
 	// +optional
 	Affinity *core.Affinity `json:"affinity"`
-	Infra    AceInfra       `json:"infra"`
-	Settings AcaasSettings  `json:"settings"`
+	//+optional
+	Monitoring Monitoring    `json:"monitoring"`
+	Infra      AceInfra      `json:"infra"`
+	Settings   AcaasSettings `json:"settings"`
 	// List of sources to populate environment variables in the container.
 	// The keys defined within a source must be a C_IDENTIFIER. All invalid keys
 	// will be reported as an event when the container is starting. When a key exists in multiple

apis/installer/v1alpha1/zz_generated.deepcopy.go

@@ -19,6 +19,6 @@ spec:
       {{- include "accounts-ui.selectorLabels" . | nindent 6 }}
   endpoints:
   - path: /metrics
-    port: metrics
+    port: http
     scheme: http
 {{- end }}

charts/accounts-ui/templates/servicemonitor.yaml

@@ -21,6 +21,6 @@ spec:
       {{- include "billing.selectorLabels" . | nindent 6 }}
   endpoints:
     - path: /metrics
-      port: metrics
+      port: http
       scheme: http
 {{- end }}

charts/billing/templates/aggregator/servicemonitor.yaml

@@ -53,7 +53,7 @@ spec:
             - aggregator
           ports:
             - name: http
-              containerPort: 3000
+              containerPort: 3003
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

charts/billing/templates/aggregator/statefulset.yaml

@@ -21,6 +21,6 @@ spec:
       {{- include "billing.selectorLabels" . | nindent 6 }}
   endpoints:
   - path: /metrics
-    port: metrics
+    port: http
     scheme: http
 {{- end }}

charts/billing/templates/processor/servicemonitor.yaml

@@ -53,7 +53,7 @@ spec:
             - monitor
           ports:
             - name: http
-              containerPort: 3000
+              containerPort: 3003
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

charts/billing/templates/processor/statefulset.yaml

@@ -0,0 +1,24 @@
+{{- if eq "prometheus.io/operator" ( include "monitoring.agent" . ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "marketplace-api.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- if eq "true" ( include "monitoring.apply-servicemonitor-label" . ) }}
+    {{- include "monitoring.servicemonitor-label" . | nindent 4 }}
+  {{- else }}
+    {{- include "marketplace-api.selectorLabels" . | nindent 4 }}
+  {{- end }}
+spec:
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "marketplace-api.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - path: /metrics
+    port: http
+    scheme: http
+{{- end }}

charts/marketplace-api/README.md

@@ -644,6 +644,25 @@ properties:
     - objstore
     - storageClass
     type: object
+  monitoring:
+    properties:
+      agent:
+        enum:
+        - prometheus.io
+        - prometheus.io/operator
+        - prometheus.io/builtin
+        type: string
+      serviceMonitor:
+        properties:
+          labels:
+            additionalProperties:
+              type: string
+            type: object
+        type: object
+    required:
+    - agent
+    - serviceMonitor
+    type: object
   nameOverride:
     type: string
   nodeSelector: