Add browser and license ingest keys to config and sandbox env

jimmyjayp · jimmyjayp · commit 58a6e5918cae · 2021-11-10T09:56:14.000-05:00
diff --git a/sandbox/shared/sandbox_config.sh b/sandbox/shared/sandbox_config.sh
@@ -98,6 +98,10 @@ function sbcfg_initialize {
 		echo "CSSVC_CFG_FILE=$CSSVC_CFG_FILE"
 	fi
 
+	# For instrumenting backend services
+	[ -z "$CSSVC_NEWRELIC_LICENSE_KEY" ] && export CSSVC_NEWRELIC_LICENSE_KEY=$(get-json-property -j $CSSVC_CFG_FILE -p integrations.newrelic.cloud.licenseIngestKey)
+
+
 	# ----- REMOTE DEVELOPMENT SANDBOXES
 	# local development on ec2 instances (remote hosts) should reference their
 	# hostname and not 'localhost' when constructing URLs so we set
diff --git a/shared/codestream_configs/README.parameter-definitions.json b/shared/codestream_configs/README.parameter-definitions.json
@@ -171,6 +171,12 @@
 				"disabled": "disable integration"
 			}
 		},
+		"newrelic": {
+			"<appProvider>": {
+				"browserIngestKey": "NR1 ingest browser key [CSSVC_NEWRELIC_BROWSER_KEY]",
+				"licenseIngestKey": "NR1 ingest license key [CSSVC_NEWRELIC_LICENSE_KEY]"
+			}
+		},
 		"okta": {
 			"<appProvider>": {
 				"appClientId": "Okta API client Id",
diff --git a/shared/codestream_configs/parameters.json b/shared/codestream_configs/parameters.json
@@ -549,6 +549,18 @@
 				}
 			}
 		},
+		"newrelic": {
+			"<appProvider>": {
+				"browserIngestKey": {
+					"desc": "NR1 ingest browser key",
+					"env": "CSSVC_NEWRELIC_BROWSER_KEY"
+				},
+				"licenseIngestKey": {
+					"desc": "NR1 ingest license key",
+					"env": "CSSVC_NEWRELIC_LICENSE_KEY"
+				}
+			}
+		},
 		"okta": {
 			"<appProvider>": {
 				"appClientId": {
diff --git a/shared/codestream_configs/parameters.version b/shared/codestream_configs/parameters.version
@@ -1 +1 @@
-20
+21
diff --git a/shared/codestream_configs/profiles/cloud.json b/shared/codestream_configs/profiles/cloud.json
@@ -248,6 +248,16 @@
 				"stg": {}
 			}
 		},
+		"newrelic": {
+			"cloud": {
+				"defaultEnv": {
+					"_loadSecretsFile": "newrelic/nr1-staging.dev.cfg"
+				},
+				"prod": {
+					"_loadSecretsFile": "newrelic/nr1-staging.prod.cfg"
+				}
+			}
+		},
 		"okta": {
 			"localInstallation": {
 				"defaultEnv": {}
diff --git a/shared/server_utils/custom_config.js b/shared/server_utils/custom_config.js
@@ -297,7 +297,7 @@ module.exports = function customConfigFunc(nativeCfg) {
 		gitlab_enterprise: { appClientId: 'placeholder' },
 		jiraserver: { appClientId: 'placeholder' },
 		clubhouse: { appClientId: 'placeholder' },
-		newrelic: { appClientId: 'placeholder' }
+		newrelic: {}
 	};
 	// THIS WILL OVERWRITE CONFIG DATA IF >1 REPEATING BLOCK (installation) EXISTS FOR A GIVEN PROVIDER
 	// The plan is to remove the repeating blocks from the schema.
