From 28f101ae8fff2a29df1fda8e28f8deeec024e7e1 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 12 Jan 2022 22:30:01 -0500 Subject: [PATCH] Fix docs and config newline outputs --- docs/pages/kubernetes-access/helm/guides/aws.mdx | 2 +- docs/pages/kubernetes-access/helm/guides/gcp.mdx | 2 +- examples/chart/teleport-cluster/templates/config.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/pages/kubernetes-access/helm/guides/aws.mdx b/docs/pages/kubernetes-access/helm/guides/aws.mdx index e5e23cccd1e..1e54b396531 100644 --- a/docs/pages/kubernetes-access/helm/guides/aws.mdx +++ b/docs/pages/kubernetes-access/helm/guides/aws.mdx @@ -236,7 +236,7 @@ The `--set` CLI method is more appropriate for quick test deployments. region: us-west-2 # AWS region backendTable: teleport-helm-backend # DynamoDB table to use for the Teleport backend auditLogTable: teleport-helm-events # DynamoDB table to use for the Teleport audit log (must be different to the backend table) - auditLogMirrorToStdout: false # Whether to mirror audit log entries to stdout in JSON format (useful for external log collectors) + auditLogMirrorOnStdout: false # Whether to mirror audit log entries to stdout in JSON format (useful for external log collectors) sessionRecordingBucket: teleport-helm-sessions # S3 bucket to use for Teleport session recordings backups: true # Whether or not to turn on DynamoDB backups highAvailability: diff --git a/docs/pages/kubernetes-access/helm/guides/gcp.mdx b/docs/pages/kubernetes-access/helm/guides/gcp.mdx index 444ff81735e..74b02029d3c 100644 --- a/docs/pages/kubernetes-access/helm/guides/gcp.mdx +++ b/docs/pages/kubernetes-access/helm/guides/gcp.mdx @@ -283,7 +283,7 @@ The `--set` CLI method is more appropriate for quick test deployments. projectId: gcpproj-123456 # Google Cloud project ID backendTable: teleport-helm-backend # Firestore collection to use for the Teleport backend auditLogTable: teleport-helm-events # Firestore collection to use for the Teleport audit log (must be different to the backend collection) - auditLogMirrorToStdout: false # Whether to mirror audit log entries to stdout in JSON format (useful for external log collectors) + auditLogMirrorOnStdout: false # Whether to mirror audit log entries to stdout in JSON format (useful for external log collectors) sessionRecordingBucket: teleport-helm-sessions # Google Cloud Storage bucket to use for Teleport session recordings highAvailability: replicaCount: 2 # Number of replicas to configure diff --git a/examples/chart/teleport-cluster/templates/config.yaml b/examples/chart/teleport-cluster/templates/config.yaml index d93e7fe97ca..d86d63e4901 100644 --- a/examples/chart/teleport-cluster/templates/config.yaml +++ b/examples/chart/teleport-cluster/templates/config.yaml @@ -40,11 +40,11 @@ data: {{- if .Values.gcp.credentialSecretName }} credentials_path: /etc/teleport-secrets/gcp-credentials.json {{- end }} - {{- if .Values.gcp.auditLogMirrorOnStdout -}} + {{- if .Values.gcp.auditLogMirrorOnStdout }} audit_events_uri: ['firestore://{{ required "gcp.auditLogTable is required in chart values" .Values.gcp.auditLogTable }}?projectID={{ required "gcp.projectId is required in chart values" .Values.gcp.projectId }}{{ empty .Values.gcp.credentialSecretName | ternary "" "&credentialsPath=/etc/teleport-secrets/gcp-credentials.json"}}', 'stdout://'] - {{- else -}} + {{- else }} audit_events_uri: ['firestore://{{ required "gcp.auditLogTable is required in chart values" .Values.gcp.auditLogTable }}?projectID={{ required "gcp.projectId is required in chart values" .Values.gcp.projectId }}{{ empty .Values.gcp.credentialSecretName | ternary "" "&credentialsPath=/etc/teleport-secrets/gcp-credentials.json"}}'] - {{- end -}} + {{- end }} audit_sessions_uri: "gs://{{ required "gcp.sessionRecordingBucket is required in chart values" .Values.gcp.sessionRecordingBucket }}?projectID={{ required "gcp.projectId is required in chart values" .Values.gcp.projectId }}{{ empty .Values.gcp.credentialSecretName | ternary "" "&credentialsPath=/etc/teleport-secrets/gcp-credentials.json"}}" {{- end }} auth_service: