Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit fbabf5c

Browse files
jimmyjaypjimmyjayp
authored
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]>
1 parent d28fdc8 commit fbabf5c

12 files changed

Lines changed: 29 additions & 36 deletions

File tree

‎api_server/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ sandbox. This is how installations are performed for our CI/CD pipelines.
6161
have not loaded a dev_tools mongo sandbox). A default api sandbox name of
6262
`api` is assumed in some tools so we'll use it here (though you can change
6363
it).
64-
64+
6565
For private repo workflows:
6666
```
6767
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.
8080
dt-sb-create-playground -t $CS_API_TOP/sandbox/playgrounds/default.template
8181
```
8282
1. Install the [inbound email](../inbound_email/README.md), [outbound
83-
email](../outbound_email/README.md), [broadcaster](../broadcaster/README.md)
84-
& [onprem admin](../onprem_admin/README.md) sandboxes.
83+
email](../outbound_email/README.md) & [broadcaster](../broadcaster/README.md)
84+
sandboxes.
8585
1. Load all of your sandboxes into one shell and create a `cs` playground for
8686
your codestream-cloud configuration.
8787
```

‎bin/csbe-pre-deployment‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
cd $CSBE_TOP
66
git status -sb
7-
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
7+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# update paths
1414
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
15-
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
15+
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
1616

1717
[ ! -d "$CSSVC_BACKEND_ROOT/log" ] && { echo "creating $CSSVC_BACKEND_ROOT/log/ for run-time logs" && mkdir $CSSVC_BACKEND_ROOT/log || return 1; }
1818

‎docs/README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,3 @@ context.
4444
The inbound email service verifies the messages and injects into CodeStream by
4545
way of making API calls. Supplemental inbound email docs can be found
4646
[here](../inbound_email/docs/README.md).
47-
48-
* [On-Prem Admin](../onprem_admin/README.md) - An admin server and browser
49-
Single Page App for editing the configuration, monitoring the services and
50-
performing other maintenance functions for On-Prem installations. Supplemental
51-
onprem admin docs can be found [here](../onprem_admin/docs/README.md).

‎package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
"install:broadcaster": "echo BROADCASTER && cd broadcaster && npm i --no-save",
88
"install:mailin": "echo INBOUND_EMAIL && cd inbound_email && npm i --no-save",
99
"install:mailout": "echo OUTBOUND_EMAIL && cd outbound_email && npm i --no-save",
10-
"install:opadm": "echo ONPREM_ADMIN && cd onprem_admin && npm i --no-save",
1110
"runtime-dirs": "[ ! -d log ] && mkdir log || true",
12-
"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",
11+
"install:all": "npm run runtime-dirs && npm run install:api && npm run install:broadcaster && npm run install:mailin && npm run install:mailout",
1312
"start:api": "cd api_server && npm run start",
1413
"start:broadcaster": "cd broadcaster && npm run start",
1514
"start:mailin": "cd inbound_email && npm run start",
1615
"start:mailout": "cd outbound_email && npm run start",
17-
"start:opadm": "cd onprem_admin && npm run build && npm run start",
1816

1917
"run:docker:csrabbitmq": "docker run -d -p 5672:5672 -p 15672:15672 --name csrabbitmq teamcodestream/rabbitmq-onprem:0.0.0",
2018
"start:docker:csrabbitmq": "docker start csrabbitmq",

‎sandbox/defaults.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ export CS_OUTBOUND_EMAIL_TOP=$CSBE_TOP/outbound_email
9797
# CS_OUTBOUND_EMAIL_DEPS=....
9898
. $CS_OUTBOUND_EMAIL_TOP/sandbox/defaults.sh
9999

100-
echo "Loading onprem-admin environment..."
101-
export OPADM_NAME=$CSBE_NAME
102-
export OPADM_SANDBOX=$CSBE_SANDBOX
103-
export OPADM_TOP=$CSBE_TOP/onprem_admin
104-
# OPADM_DEPS=....
105-
. $OPADM_TOP/sandbox/defaults.sh
100+
# echo "Loading onprem-admin environment..."
101+
# export OPADM_NAME=$CSBE_NAME
102+
# export OPADM_SANDBOX=$CSBE_SANDBOX
103+
# export OPADM_TOP=$CSBE_TOP/onprem_admin
104+
# # OPADM_DEPS=....
105+
# . $OPADM_TOP/sandbox/defaults.sh
106106

107107
sbcfg_setup_for_newrelic_instrumentation $CSSVC_BACKEND_ROOT $CSBE_TOP $CSBE_SHORT_NAME

‎sandbox/sb.info.nr.opadm‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎sandbox/sb.info.opadm‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎sandbox/sb.info.private.opadm‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎shared/codestream_configs/README.parameter-definitions.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,12 @@
183183
},
184184
"newrelic": {
185185
"<appProvider>": {
186+
"accountNumber": "NR1 Account Number for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_ACCOUNT_NUMBER]",
186187
"browserIngestKey": "NR1 ingest browser key [CSSVC_NEWRELIC_BROWSER_KEY]",
187188
"licenseIngestKey": "NR1 ingest license key [CSSVC_NEWRELIC_LICENSE_KEY]",
188-
"telemetryEndpoint": "Host endpoint passed to APM tracing library [CSSVC_NEWRELIC_TELEMETRY_ENDPOINT]"
189+
"telemetryEndpoint": "Host endpoint passed to APM tracing library [CSSVC_NEWRELIC_TELEMETRY_ENDPOINT]",
190+
"webviewAgentId": "NR1 Agent ID for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_AGENT_ID]",
191+
"webviewAppId": "NR1 App ID for webview telemetry [CSSVC_NEWRELIC_WEBVIEW_APP_ID]"
189192
}
190193
},
191194
"okta": {

0 commit comments

Comments
 (0)