Skip to content

feat: adds SCIM provisioning fields and tightens attribute mapping schemas in config #4332

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
akshaydeo merged 2 commits into from
Jun 12, 2026
Merged

feat: adds SCIM provisioning fields and tightens attribute mapping schemas in config #4332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9a709
feat: adds PubSub & Kafka to config json with plugin span filter
roroghost17 Jun 12, 2026
4da321e
feat: config.schema.json changes
roroghost17 Jun 12, 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
104 changes: 104 additions & 0 deletions helm-charts/bifrost/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,80 @@ false
{{- if hasKey .Values.bifrost.plugins.bigquery "version" }}{{- $_ := set $plugin "version" (.Values.bifrost.plugins.bigquery.version | int) }}{{- end }}
{{- $plugins = append $plugins $plugin }}
{{- end }}
{{- if (.Values.bifrost.plugins.kafka).enabled }}
{{- $kafkaConfig := dict }}
{{- $inputConfig := .Values.bifrost.plugins.kafka.config | default dict }}
{{- if $inputConfig.brokers }}
{{- $_ := set $kafkaConfig "brokers" $inputConfig.brokers }}
{{- end }}
{{- if $inputConfig.topic }}
{{- $_ := set $kafkaConfig "topic" $inputConfig.topic }}
{{- end }}
{{- if hasKey $inputConfig "sasl_enabled" }}
{{- $_ := set $kafkaConfig "sasl_enabled" $inputConfig.sasl_enabled }}
{{- end }}
{{- if $inputConfig.sasl }}
{{- $_ := set $kafkaConfig "sasl" $inputConfig.sasl }}
{{- end }}
{{- if hasKey $inputConfig "tls_enabled" }}
{{- $_ := set $kafkaConfig "tls_enabled" $inputConfig.tls_enabled }}
{{- end }}
{{- if $inputConfig.ca_cert }}
{{- $_ := set $kafkaConfig "ca_cert" $inputConfig.ca_cert }}
{{- end }}
{{- if $inputConfig.compression }}
{{- $_ := set $kafkaConfig "compression" $inputConfig.compression }}
{{- end }}
{{- if hasKey $inputConfig "batch_size" }}
{{- $_ := set $kafkaConfig "batch_size" $inputConfig.batch_size }}
{{- end }}
{{- if hasKey $inputConfig "flush_interval_ms" }}
{{- $_ := set $kafkaConfig "flush_interval_ms" $inputConfig.flush_interval_ms }}
{{- end }}
{{- if hasKey $inputConfig "auto_create_topic" }}
{{- $_ := set $kafkaConfig "auto_create_topic" $inputConfig.auto_create_topic }}
{{- end }}
{{- if hasKey $inputConfig "disable_content_logging" }}
{{- $_ := set $kafkaConfig "disable_content_logging" $inputConfig.disable_content_logging }}
{{- end }}
{{- if $inputConfig.request_headers }}
{{- $_ := set $kafkaConfig "request_headers" $inputConfig.request_headers }}
{{- end }}
{{- if $inputConfig.plugin_span_filter }}
{{- $_ := set $kafkaConfig "plugin_span_filter" $inputConfig.plugin_span_filter }}
{{- end }}
{{- $plugin := dict "enabled" true "name" "kafka" "config" $kafkaConfig }}
{{- if hasKey .Values.bifrost.plugins.kafka "version" }}{{- $_ := set $plugin "version" (.Values.bifrost.plugins.kafka.version | int) }}{{- end }}
{{- $plugins = append $plugins $plugin }}
{{- end }}
{{- if (.Values.bifrost.plugins.pubsub).enabled }}
{{- $pubsubConfig := dict }}
{{- $inputConfig := .Values.bifrost.plugins.pubsub.config | default dict }}
{{- if $inputConfig.project_id }}
{{- $_ := set $pubsubConfig "project_id" $inputConfig.project_id }}
{{- end }}
{{- if $inputConfig.topic_id }}
{{- $_ := set $pubsubConfig "topic_id" $inputConfig.topic_id }}
{{- end }}
{{- if $inputConfig.service_account_key }}
{{- $_ := set $pubsubConfig "service_account_key" $inputConfig.service_account_key }}
{{- end }}
{{- if hasKey $inputConfig "auto_create_topic" }}
{{- $_ := set $pubsubConfig "auto_create_topic" $inputConfig.auto_create_topic }}
{{- end }}
{{- if hasKey $inputConfig "disable_content_logging" }}
{{- $_ := set $pubsubConfig "disable_content_logging" $inputConfig.disable_content_logging }}
{{- end }}
{{- if $inputConfig.request_headers }}
{{- $_ := set $pubsubConfig "request_headers" $inputConfig.request_headers }}
{{- end }}
{{- if $inputConfig.plugin_span_filter }}
{{- $_ := set $pubsubConfig "plugin_span_filter" $inputConfig.plugin_span_filter }}
{{- end }}
{{- $plugin := dict "enabled" true "name" "pubsub" "config" $pubsubConfig }}
{{- if hasKey .Values.bifrost.plugins.pubsub "version" }}{{- $_ := set $plugin "version" (.Values.bifrost.plugins.pubsub.version | int) }}{{- end }}
{{- $plugins = append $plugins $plugin }}
{{- end }}
{{- /* Custom plugins */ -}}
{{- if .Values.bifrost.plugins.custom }}
{{- range .Values.bifrost.plugins.custom }}
Expand Down Expand Up @@ -1448,6 +1522,36 @@ Call this template at the beginning of deployment/stateful templates
{{- if and .Values.bifrost.plugins.bigquery.enabled (not (.Values.bifrost.plugins.bigquery.config | default dict).project_id) }}
{{- fail "ERROR: bifrost.plugins.bigquery.config.project_id is required when the BigQuery plugin is enabled." }}
{{- end }}
{{- if and (.Values.bifrost.plugins.kafka).enabled (hasKey .Values.bifrost.plugins.kafka "version") (lt (int .Values.bifrost.plugins.kafka.version) 1) }}
{{- fail "ERROR: bifrost.plugins.kafka.version must be >= 1. Bump to >1 to force DB-backed plugin config updates." }}
{{- end }}
{{- if and (.Values.bifrost.plugins.kafka).enabled (hasKey .Values.bifrost.plugins.kafka "version") (gt (int .Values.bifrost.plugins.kafka.version) 32767) }}
{{- fail "ERROR: bifrost.plugins.kafka.version must be <= 32767." }}
{{- end }}
{{- if (.Values.bifrost.plugins.kafka).enabled }}
{{- $kafkaInputConfig := .Values.bifrost.plugins.kafka.config | default dict }}
{{- if not $kafkaInputConfig.brokers }}
{{- fail "ERROR: bifrost.plugins.kafka.config.brokers is required when the Kafka plugin is enabled." }}
{{- end }}
{{- if not $kafkaInputConfig.topic }}
{{- fail "ERROR: bifrost.plugins.kafka.config.topic is required when the Kafka plugin is enabled." }}
{{- end }}
{{- end }}
{{- if and (.Values.bifrost.plugins.pubsub).enabled (hasKey .Values.bifrost.plugins.pubsub "version") (lt (int .Values.bifrost.plugins.pubsub.version) 1) }}
{{- fail "ERROR: bifrost.plugins.pubsub.version must be >= 1. Bump to >1 to force DB-backed plugin config updates." }}
{{- end }}
{{- if and (.Values.bifrost.plugins.pubsub).enabled (hasKey .Values.bifrost.plugins.pubsub "version") (gt (int .Values.bifrost.plugins.pubsub.version) 32767) }}
{{- fail "ERROR: bifrost.plugins.pubsub.version must be <= 32767." }}
{{- end }}
{{- if (.Values.bifrost.plugins.pubsub).enabled }}
{{- $pubsubInputConfig := .Values.bifrost.plugins.pubsub.config | default dict }}
{{- if not $pubsubInputConfig.project_id }}
{{- fail "ERROR: bifrost.plugins.pubsub.config.project_id is required when the Pub/Sub plugin is enabled." }}
{{- end }}
{{- if not $pubsubInputConfig.topic_id }}
{{- fail "ERROR: bifrost.plugins.pubsub.config.topic_id is required when the Pub/Sub plugin is enabled." }}
{{- end }}
{{- end }}

{{/* Validate semantic cache plugin when enabled */}}
{{- if .Values.bifrost.plugins.semanticCache.enabled }}
Expand Down
205 changes: 205 additions & 0 deletions helm-charts/bifrost/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,211 @@
}
}
},
"kafka": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"version": {
"type": "integer",
"minimum": 1
},
"config": {
"type": "object",
"properties": {
"brokers": {
"type": "array",
"items": { "type": "string" },
"description": "Kafka broker addresses (required when enabled)"
},
"topic": {
"type": "string",
"description": "Kafka topic to publish traces to (required when enabled)"
},
"sasl_enabled": {
"type": "boolean",
"description": "Enable SASL authentication. SASL is only activated when both sasl_enabled is true and sasl is set"
},
"sasl": {
"type": "object",
"properties": {
"mechanism": {
"type": "string",
"enum": ["PLAIN", "SCRAM-SHA-256", "SCRAM-SHA-512"]
},
"username": {
"anyOf": [
{ "type": "string" },
{
"type": "object",
"properties": {
"value": { "type": "string" },
"env_var": { "type": "string" },
"from_env": { "type": "boolean" }
},
"additionalProperties": false
}
],
"description": "SASL username. Supports env.VAR_NAME prefix for environment variable substitution"
},
"password": {
"anyOf": [
{ "type": "string" },
{
"type": "object",
"properties": {
"value": { "type": "string" },
"env_var": { "type": "string" },
"from_env": { "type": "boolean" }
},
"additionalProperties": false
}
],
"description": "SASL password. Supports env.VAR_NAME prefix for environment variable substitution"
}
},
"additionalProperties": false
},
"tls_enabled": {
"type": "boolean",
"description": "Enable TLS for broker connections"
},
"ca_cert": {
"anyOf": [
{ "type": "string" },
{
"type": "object",
"properties": {
"value": { "type": "string" },
"env_var": { "type": "string" },
"from_env": { "type": "boolean" }
},
"additionalProperties": false
}
],
"description": "PEM-encoded CA certificate used to verify the broker's TLS certificate. Omit to use the system CA pool. Supports env.VAR_NAME prefix"
},
"compression": {
"type": "string",
"enum": ["none", "gzip", "snappy", "lz4", "zstd"],
"description": "Compression codec for published messages"
},
"batch_size": {
"type": "integer",
"description": "Maximum number of messages batched per write (default: 100)"
},
"flush_interval_ms": {
"type": "integer",
"description": "Maximum time (ms) to wait before flushing a batch (default: 1000)"
},
"auto_create_topic": {
"type": "boolean",
"description": "Create the topic at startup if it does not exist"
},
"disable_content_logging": {
"type": "boolean",
"description": "Strip input/output message content from traces before publishing"
},
"request_headers": {
"type": "array",
"items": { "type": "string" },
"description": "Request-header name patterns (exact or wildcard like \"x-custom-*\") whose captured values are embedded in published traces"
},
"plugin_span_filter": {
"$ref": "#/$defs/pluginSpanFilter"
}
}
}
},
"if": {
"properties": {
"enabled": { "const": true }
},
"required": ["enabled"]
},
"then": {
"required": ["config"],
"properties": {
"config": {
"required": ["brokers", "topic"],
"properties": {
"brokers": { "minItems": 1 }
}
}
}
}
},
"pubsub": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"version": {
"type": "integer",
"minimum": 1
},
"config": {
"type": "object",
"properties": {
"project_id": {
"type": "string",
"description": "GCP project ID (required when enabled)"
},
"topic_id": {
"type": "string",
"description": "Pub/Sub topic ID — just the ID, not the full resource name (required when enabled)"
},
"service_account_key": {
"anyOf": [
{ "type": "string" },
{
"type": "object",
"properties": {
"value": { "type": "string" },
"env_var": { "type": "string" },
"from_env": { "type": "boolean" }
},
"additionalProperties": false
}
],
"description": "Service account key JSON for authentication. Omit to use Application Default Credentials (ADC). Supports env.VAR_NAME prefix"
},
"auto_create_topic": {
"type": "boolean",
"description": "Create the topic at startup if it does not exist"
},
"disable_content_logging": {
"type": "boolean",
"description": "Strip request/response content from traces before publishing"
},
"request_headers": {
"type": "array",
"items": { "type": "string" },
"description": "Request-header name patterns (exact or wildcard like \"x-custom-*\") whose captured values are included in published traces"
},
"plugin_span_filter": {
"$ref": "#/$defs/pluginSpanFilter"
}
}
}
},
"if": {
"properties": {
"enabled": { "const": true }
},
"required": ["enabled"]
},
"then": {
"required": ["config"],
"properties": {
"config": {
"required": ["project_id", "topic_id"]
}
}
}
},
"custom": {
"type": "array",
"items": {
Expand Down
37 changes: 37 additions & 0 deletions helm-charts/bifrost/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,43 @@ bifrost:
# mode: "exclude" # "include" or "exclude"
# plugins: ["logging"]

kafka:
enabled: false
version: 1
config:
brokers: [] # Kafka broker addresses (required when enabled)
topic: "" # Topic to publish traces to (required when enabled)
sasl_enabled: false
# sasl:
# mechanism: "PLAIN" # PLAIN | SCRAM-SHA-256 | SCRAM-SHA-512
# username: "env.KAFKA_USERNAME"
# password: "env.KAFKA_PASSWORD"
tls_enabled: false
# ca_cert: "env.KAFKA_CA_CERT" # PEM CA certificate to verify the broker. Omit to use the system CA pool.
compression: "none" # none | gzip | snappy | lz4 | zstd
batch_size: 100
flush_interval_ms: 1000
auto_create_topic: false
disable_content_logging: false
# request_headers: [] # Header name patterns (exact or wildcard like "x-custom-*")
# plugin_span_filter: # Optional: filter which plugin hook spans are exported
# mode: "exclude" # "include" or "exclude"
# plugins: ["logging"]

pubsub:
enabled: false
version: 1
config:
project_id: "" # GCP project ID (required when enabled)
topic_id: "" # Pub/Sub topic ID (required when enabled)
# service_account_key: "" # Service account key JSON, or "env.VAR". Omit to use ADC.
auto_create_topic: false
disable_content_logging: false
# request_headers: [] # Header name patterns (exact or wildcard like "x-custom-*")
# plugin_span_filter: # Optional: filter which plugin hook spans are exported
# mode: "exclude" # "include" or "exclude"
# plugins: ["logging"]

# Custom/dynamic plugins
custom: []
# - name: "my-custom-plugin"
Expand Down
Loading
Loading