Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tamalsaha merged 9 commits into from
Mar 13, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0e9eee
Make b3 dashboard mode-aware
samiulsami Mar 9, 2026
a97c53d
fix servicemonitor for billing, marketplace, etc.
samiulsami Mar 9, 2026
4303780
Update ports for billing aggregator/processor
samiulsami Mar 9, 2026
3269d56
make gen manifests fmt
samiulsami Mar 9, 2026
abebad1
Revert unnecessary template change
samiulsami Mar 10, 2026
c6045c3
Fix default pod selection values for dashboards
samiulsami Mar 10, 2026
ab7c917
Fix dashboard job configuration
samiulsami Mar 11, 2026
d1a04b6
Add monitoring to marketplace api types
samiulsami Mar 11, 2026
040d275
Append '-error' to blobfs panel legends
samiulsami Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apis/installer/v1alpha1/ace_marketplace_api_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion charts/accounts-ui/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ spec:
{{- include "accounts-ui.selectorLabels" . | nindent 6 }}
endpoints:
- path: /metrics
port: metrics
port: http
scheme: http
{{- end }}
2 changes: 1 addition & 1 deletion charts/billing/templates/aggregator/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ spec:
{{- include "billing.selectorLabels" . | nindent 6 }}
endpoints:
- path: /metrics
port: metrics
port: http
scheme: http
{{- end }}
2 changes: 1 addition & 1 deletion charts/billing/templates/aggregator/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
- aggregator
ports:
- name: http
containerPort: 3000
containerPort: 3003
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/billing/templates/processor/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ spec:
{{- include "billing.selectorLabels" . | nindent 6 }}
endpoints:
- path: /metrics
port: metrics
port: http
scheme: http
{{- end }}
2 changes: 1 addition & 1 deletion charts/billing/templates/processor/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
- monitor
ports:
- name: http
containerPort: 3000
containerPort: 3003
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
88 changes: 45 additions & 43 deletions charts/marketplace-api/README.md
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions charts/marketplace-api/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
19 changes: 19 additions & 0 deletions charts/marketplace-api/values.openapiv3_schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions charts/marketplace-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ tolerations: []

affinity: {}

monitoring:
# Name of monitoring agent (eg "prometheus.io/operator")
agent: ""
serviceMonitor:
# Specify the labels for ServiceMonitor.
# Prometheus crd will select ServiceMonitor using these labels.
# Only usable when monitoring agent is `prometheus.io/operator`.
labels: {}

infra:
storageClass:
name: "standard"
Expand Down
4 changes: 3 additions & 1 deletion charts/platform-grafana-dashboards/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ The following table lists the configurable parameters of the `platform-grafana-d
| dashboard.templatize.datasource | If true, datasource will be hardcoded in the dashboard | <code>false</code> |
| dashboard.alerts | | <code>false</code> |
| dashboard.replacements | | <code>{}</code> |
| dashboard.openfga.jobName | | <code>openfga</code> |
| dashboard.nats.jobName | | <code>ace-nats</code> |
| dashboard.b3.showLicenseMetrics | If true, license metrics panels will be shown | <code>false</code> |
| dashboard.b3.jobName | Job name for Go runtime metrics (process_*, go_*) | <code>ace-platform-api</code> |
| dashboard.b3.jobName | Job name regex for Go runtime metrics (process_*, go_*) | <code>ace-platform-api&#124;ace-platform-api-headless</code> |
| grafana.name | Name of Grafana Appbinding where these dashboards are applied | <code>""</code> |
| grafana.namespace | Namespace of Grafana Appbinding where these dashboards are applied | <code>""</code> |
| grafana.version | | <code>8.0.7</code> |
Expand Down
Loading
Loading