add webview nr agent props and cleanup onprem_admin removal (#177)

* Add webview NR agent properties. Cleanup onprem-admin removal

* Added newrelic webviewAgentId config property

Co-authored-by: James Price <[email protected]>

Author: jimmyjayp

api_server/README.md

@@ -61,7 +61,7 @@ sandbox. This is how installations are performed for our CI/CD pipelines.
    have not loaded a dev_tools mongo sandbox). A default api sandbox name of
    `api` is assumed in some tools so we'll use it here (though you can change
    it).
-   
+
    For private repo workflows:
    ```
    dt-sb-install --name api --type cs_server_nr --info-file sb.info.nr.api --yes [--no-deps]
@@ -80,8 +80,8 @@ sandbox. This is how installations are performed for our CI/CD pipelines.
 	dt-sb-create-playground -t $CS_API_TOP/sandbox/playgrounds/default.template
 	```
 1. Install the [inbound email](../inbound_email/README.md), [outbound
-   email](../outbound_email/README.md), [broadcaster](../broadcaster/README.md)
-   & [onprem admin](../onprem_admin/README.md) sandboxes.
+   email](../outbound_email/README.md) & [broadcaster](../broadcaster/README.md)
+   sandboxes.
 1. Load all of your sandboxes into one shell and create a `cs` playground for
    your codestream-cloud configuration.
 	```

bin/csbe-pre-deployment

@@ -4,4 +4,4 @@
 
 cd $CSBE_TOP
 git status -sb
-for i in api_server broadcaster inbound_email outbound_email onprem_admin; do (cd $i && echo "$i:  package version: `get-json-property -j package.json -p version`  ChangeLog: `dt-sb-changelog-tool --latest-version --with-date`"); done
+for i in api_server broadcaster inbound_email outbound_email; do (cd $i && echo "$i:  package version: `get-json-property -j package.json -p version`  ChangeLog: `dt-sb-changelog-tool --latest-version --with-date`"); done

dev-env.sh

@@ -12,7 +12,7 @@
 
 # update paths
 export PATH=$CSSVC_BACKEND_ROOT/api_server/bin:$CSSVC_BACKEND_ROOT/broadcaster/bin:$CSSVC_BACKEND_ROOT/outbound_email/bin:$CSSVC_BACKEND_ROOT/inbound_email/bin:$PATH
-export NODE_PATH=$CSSVC_BACKEND_ROOT/api_server/node_modules:$CSSVC_BACKEND_ROOT/broadcaster/node_modules:$CSSVC_BACKEND_ROOT/outbound_email/server/node_modules:$CSSVC_BACKEND_ROOT/inbound_email/node_modules:$CSSVC_BACKEND_ROOT/onprem_admin/node_modules:$NODE_PATH
+export NODE_PATH=$CSSVC_BACKEND_ROOT/api_server/node_modules:$CSSVC_BACKEND_ROOT/broadcaster/node_modules:$CSSVC_BACKEND_ROOT/outbound_email/server/node_modules:$CSSVC_BACKEND_ROOT/inbound_email/node_modules:$NODE_PATH
 
 [ ! -d "$CSSVC_BACKEND_ROOT/log" ] && { echo "creating $CSSVC_BACKEND_ROOT/log/ for run-time logs" && mkdir $CSSVC_BACKEND_ROOT/log || return 1; }
 

docs/README.md

@@ -44,8 +44,3 @@ context.
   The inbound email service verifies the messages and injects into CodeStream by
   way of making API calls. Supplemental inbound email docs can be found
   [here](../inbound_email/docs/README.md).
-
-* [On-Prem Admin](../onprem_admin/README.md) - An admin server and browser
-  Single Page App for editing the configuration, monitoring the services and
-  performing other maintenance functions for On-Prem installations. Supplemental
-  onprem admin docs can be found [here](../onprem_admin/docs/README.md).

package.json

@@ -7,14 +7,12 @@
 		"install:broadcaster": "echo BROADCASTER && cd broadcaster && npm i --no-save",
 		"install:mailin": "echo INBOUND_EMAIL && cd inbound_email && npm i --no-save",
 		"install:mailout": "echo OUTBOUND_EMAIL && cd outbound_email && npm i --no-save",
-		"install:opadm": "echo ONPREM_ADMIN && cd onprem_admin && npm i --no-save",
 		"runtime-dirs": "[ ! -d log ] && mkdir log || true",
-		"install:all": "npm run runtime-dirs && npm run install:api && npm run install:broadcaster && npm run install:mailin && npm run install:mailout && npm run install:opadm",
+		"install:all": "npm run runtime-dirs && npm run install:api && npm run install:broadcaster && npm run install:mailin && npm run install:mailout",
 		"start:api": "cd api_server && npm run start",
 		"start:broadcaster": "cd broadcaster && npm run start",
 		"start:mailin": "cd inbound_email && npm run start",
 		"start:mailout": "cd outbound_email && npm run start",
-		"start:opadm": "cd onprem_admin && npm run build && npm run start",
 
 		"run:docker:csrabbitmq": "docker run -d -p 5672:5672 -p 15672:15672 --name csrabbitmq teamcodestream/rabbitmq-onprem:0.0.0",
 		"start:docker:csrabbitmq": "docker start csrabbitmq",

sandbox/defaults.sh

@@ -97,11 +97,11 @@ export CS_OUTBOUND_EMAIL_TOP=$CSBE_TOP/outbound_email
 # CS_OUTBOUND_EMAIL_DEPS=....
 . $CS_OUTBOUND_EMAIL_TOP/sandbox/defaults.sh
 
-echo "Loading onprem-admin environment..."
-export OPADM_NAME=$CSBE_NAME
-export OPADM_SANDBOX=$CSBE_SANDBOX
-export OPADM_TOP=$CSBE_TOP/onprem_admin
-# OPADM_DEPS=....
-. $OPADM_TOP/sandbox/defaults.sh
+# echo "Loading onprem-admin environment..."
+# export OPADM_NAME=$CSBE_NAME
+# export OPADM_SANDBOX=$CSBE_SANDBOX
+# export OPADM_TOP=$CSBE_TOP/onprem_admin
+# # OPADM_DEPS=....
+# . $OPADM_TOP/sandbox/defaults.sh
 
 sbcfg_setup_for_newrelic_instrumentation $CSSVC_BACKEND_ROOT $CSBE_TOP $CSBE_SHORT_NAME

sandbox/sb.info.nr.opadm

@@ -183,9 +183,12 @@
 		},
 		"newrelic": {
 			"<appProvider>": {
+				"accountNumber": "NR1 Account Number for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_ACCOUNT_NUMBER]",
 				"browserIngestKey": "NR1 ingest browser key [CSSVC_NEWRELIC_BROWSER_KEY]",
 				"licenseIngestKey": "NR1 ingest license key [CSSVC_NEWRELIC_LICENSE_KEY]",
-				"telemetryEndpoint": "Host endpoint passed to APM tracing library [CSSVC_NEWRELIC_TELEMETRY_ENDPOINT]"
+				"telemetryEndpoint": "Host endpoint passed to APM tracing library [CSSVC_NEWRELIC_TELEMETRY_ENDPOINT]",
+				"webviewAgentId": "NR1 Agent ID for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_AGENT_ID]",
+				"webviewAppId": "NR1 App ID for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_APP_ID]"
 			}
 		},
 		"okta": {

sandbox/sb.info.opadm

@@ -571,6 +571,10 @@
 		},
 		"newrelic": {
 			"<appProvider>": {
+				"accountNumber": {
+					"desc": "NR1 Account Number for webview telemetry",
+					"env": "CSSVC_NEWRELIC_WEBVIEW_ACCOUNT_NUMBER"
+				},
 				"browserIngestKey": {
 					"desc": "NR1 ingest browser key",
 					"env": "CSSVC_NEWRELIC_BROWSER_KEY"
@@ -583,6 +587,14 @@
 					"default": "staging-collector.newrelic.com",
 					"desc": "Host endpoint passed to APM tracing library",
 					"env": "CSSVC_NEWRELIC_TELEMETRY_ENDPOINT"
+				},
+				"webviewAgentId": {
+					"desc": "NR1 Agent ID for webview telemetry",
+					"env": "CSSVC_NEWRELIC_WEBVIEW_AGENT_ID"
+				},
+				"webviewAppId": {
+					"desc": "NR1 App ID for webview telemetry",
+					"env": "CSSVC_NEWRELIC_WEBVIEW_APP_ID"
 				}
 			}
 		},

sandbox/sb.info.private.opadm

@@ -1 +1 @@
-26
+27