Skip to content
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

Jump to bottom

config: Add Prometheus config #191

Merged
merged 1 commit into from
Oct 5, 2023
+31 −3
Merged

config: Add Prometheus config #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions helm/flowforge/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ Enables FlowForge Telemetry
- `forge.telemetry.sentry.frontend_dsn` enables sentry reporting if set
- `forge.telemetry.sentry.backend_dsn` enables sentry reporting if set
- `forge.telemetry.sentry.production_mode` rate limit reporting (default `true`)
- `forge.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the forge app for scraping by Prometheus

### Support

Expand Down
6 changes: 4 additions & 2 deletions helm/flowforge/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ data:
{{ end }}
{{ end -}}
{{- end }}
{{ if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "backend_dsn") -}}
backend:
{{ if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "backend_dsn") -}}
sentry:
dsn: {{ .Values.forge.telemetry.sentry.backend_dsn}}
{{ end -}}
{{- end }}
prometheus:
enabled: {{ .Values.forge.telemetry.backend.prometheus.enabled }}
{{- if .Values.forge.support.enabled }}
support:
enabled: true
Expand Down
13 changes: 13 additions & 0 deletions helm/flowforge/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,19 @@
"type": "boolean"
}
}
},
"backend": {
"type": "object",
"properties": {
"prometheus": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
}
}
}
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions helm/flowforge/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ forge:
role: management
telemetry:
enabled: true
backend:
prometheus:
enabled: false
broker:
enabled: false
fileStore:
Expand Down
3 changes: 3 additions & 0 deletions test/customizations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ forge:
production_mode: false
frontend_dsn: 'https://sentry.io/flowforge/flowforge-frontend'
backend_dsn: 'https://sentry.io/flowforge/flowforge-backend'
backend:
prometheus:
enabled: true
support:
enabled: true
hubspot: 12345678
Expand Down
8 changes: 7 additions & 1 deletion test/unit/configmap_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ describe('Examine Config Maps', function () {
const d = configMaps.filter(doc => doc.metadata.name === 'flowforge-config')[0]
yml = yaml.parse(d.data['flowforge.yml'])
})

it('has sentry telemetry', function () {
console.log(yml.telemetry)
yml.telemetry.frontend.sentry.should.have.property('production_mode')
yml.telemetry.frontend.sentry.production_mode.should.equal(false)

Expand All @@ -127,5 +127,11 @@ describe('Examine Config Maps', function () {
yml.telemetry.backend.sentry.should.have.property('dsn')
yml.telemetry.backend.sentry.dsn.should.equal('https://sentry.io/flowforge/flowforge-backend')
})

describe('using Prometheus', function () {
it('has prometheus enabled', function() {
yml.telemetry.backend.prometheus.enabled.should.equal(true)
})
})
})
})
Loading