diff --git a/docs/installation/kubernetes.md b/docs/installation/kubernetes.md index 7e47718b2..956d1b034 100644 --- a/docs/installation/kubernetes.md +++ b/docs/installation/kubernetes.md @@ -27,6 +27,7 @@ config: enabled: false server_url: "" secret_token: "" + verify_server_cert: true # This Helm chart ships with built-in Prometheus ServiceMonitors and Rules. # This requires the CoreOS Prometheus Operator. diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml index 313a6c8c5..6950bd94b 100644 --- a/helm/templates/configmap.yaml +++ b/helm/templates/configmap.yaml @@ -25,3 +25,4 @@ data: enabled: {{ .Values.config.apm.enabled }} server_url: "{{ .Values.config.apm.server_url }}" secret_token: "{{ .Values.config.apm.server_token }}" + verify_server_cert: {{ .Values.config.apm.verify_server_cert }} diff --git a/helm/values.yaml b/helm/values.yaml index 4ea85fc60..41a06aade 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -19,6 +19,7 @@ config: enabled: false server_url: "" secret_token: "" + verify_server_cert: true # This Helm chart ships with built-in Prometheus ServiceMonitors and Rules. # This requires the CoreOS Prometheus Operator. diff --git a/passbook/root/settings.py b/passbook/root/settings.py index 149a6ee2c..4e6d5b306 100644 --- a/passbook/root/settings.py +++ b/passbook/root/settings.py @@ -290,7 +290,8 @@ if _APM_ENABLED: "SERVICE_NAME": "passbook", "SERVICE_VERSION": __version__, "SECRET_TOKEN": CONFIG.y("apm.secret_token", ""), - "SERVER_URL": CONFIG.y("apm.secret_token", "http://localhost:8200"), + "SERVER_URL": CONFIG.y("apm.server_url", "http://localhost:8200"), + "VERIFY_SERVER_CERT": CONFIG.y_bool("apm.verify_server_cert", True), }