From 2803de06e8ffe260342c215fe3d55a28a66640ba Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Fri, 11 Feb 2022 22:22:01 +0000 Subject: [PATCH] remove newrelic --- .dockerignore | 2 +- .gitignore | 2 +- accounts/.dockerignore | 2 +- admin-dashboard/.dockerignore | 2 +- api-docs/.dockerignore | 2 +- backend/.dockerignore | 2 +- dashboard/.dockerignore | 2 +- data-ingestor/.dockerignore | 2 +- haraka/.dockerignore | 2 +- helm-chart/.dockerignore | 2 +- .../public/oneuptime/templates/backend.yaml | 8 --- .../public/oneuptime/templates/probe.yaml | 8 --- helm-chart/public/oneuptime/values.yaml | 8 --- home/.dockerignore | 2 +- http-test-server/.dockerignore | 2 +- init-script/.dockerignore | 2 +- kubernetes/values-saas-staging.yaml | 8 --- licensing/.dockerignore | 2 +- probe/.dockerignore | 2 +- probe/index.js | 5 -- probe/newrelic.js | 69 ------------------- realtime/.dockerignore | 2 +- status-page/.dockerignore | 2 +- 23 files changed, 17 insertions(+), 123 deletions(-) delete mode 100644 probe/newrelic.js diff --git a/.dockerignore b/.dockerignore index 39f9e9f26b..621d0c906c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/.gitignore b/.gitignore index 504c289faa..ee980f9a78 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/accounts/.dockerignore b/accounts/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/accounts/.dockerignore +++ b/accounts/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/admin-dashboard/.dockerignore b/admin-dashboard/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/admin-dashboard/.dockerignore +++ b/admin-dashboard/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/api-docs/.dockerignore b/api-docs/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/api-docs/.dockerignore +++ b/api-docs/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/backend/.dockerignore b/backend/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/dashboard/.dockerignore b/dashboard/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/dashboard/.dockerignore +++ b/dashboard/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/data-ingestor/.dockerignore b/data-ingestor/.dockerignore index 39f9e9f26b..621d0c906c 100644 --- a/data-ingestor/.dockerignore +++ b/data-ingestor/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/haraka/.dockerignore b/haraka/.dockerignore index 76da4a2ea1..afcbd3dc70 100644 --- a/haraka/.dockerignore +++ b/haraka/.dockerignore @@ -8,7 +8,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/helm-chart/.dockerignore b/helm-chart/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/helm-chart/.dockerignore +++ b/helm-chart/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/helm-chart/public/oneuptime/templates/backend.yaml b/helm-chart/public/oneuptime/templates/backend.yaml index 728025f1fc..a39844e837 100644 --- a/helm-chart/public/oneuptime/templates/backend.yaml +++ b/helm-chart/public/oneuptime/templates/backend.yaml @@ -126,14 +126,6 @@ spec: value: {{ $.Values.logstashHost | quote }} - name: LOGSTASH_PORT value: {{ $.Values.logstashPort | quote }} - {{- if .Values.newRelic.backend.licenseKey }} - - name: NEW_RELIC_LICENSE_KEY - value: {{ $.Values.newRelic.backend.licenseKey }} - {{- end }} - {{- if .Values.newRelic.backend.appName }} - - name: NEW_RELIC_APPLICATION_NAME - value: {{ $.Values.newRelic.backend.appName}} - {{- end }} - name: CLUSTER_KEY valueFrom: configMapKeyRef: diff --git a/helm-chart/public/oneuptime/templates/probe.yaml b/helm-chart/public/oneuptime/templates/probe.yaml index 0ec08a3a47..1cd4681891 100644 --- a/helm-chart/public/oneuptime/templates/probe.yaml +++ b/helm-chart/public/oneuptime/templates/probe.yaml @@ -62,14 +62,6 @@ spec: value: {{ $value.key }} - name: PROBE_API_URL value: {{ template "oneuptime.probeApiUrl" $ }} - {{- if $.Values.newRelic.probe.licenseKey }} - - name: NEW_RELIC_LICENSE_KEY - value: {{ $.Values.newRelic.probe.licenseKey }} - {{- end }} - {{- if $.Values.newRelic.probe.appName }} - - name: NEW_RELIC_APPLICATION_NAME - value: {{ $.Values.newRelic.probe.appName}} - {{- end }} - name: CLUSTER_KEY valueFrom: configMapKeyRef: diff --git a/helm-chart/public/oneuptime/values.yaml b/helm-chart/public/oneuptime/values.yaml index 958868d4ca..37581ec85c 100644 --- a/helm-chart/public/oneuptime/values.yaml +++ b/helm-chart/public/oneuptime/values.yaml @@ -249,14 +249,6 @@ autoScaler: minReplicas: 1 maxReplicas: 1 -newRelic: - backend: - licenseKey: - appName: - probe: - licenseKey: - appName: - nodeEnv: production applicationScanner: diff --git a/home/.dockerignore b/home/.dockerignore index b6389ce935..8b39bf3e37 100755 --- a/home/.dockerignore +++ b/home/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/http-test-server/.dockerignore b/http-test-server/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/http-test-server/.dockerignore +++ b/http-test-server/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/init-script/.dockerignore b/init-script/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/init-script/.dockerignore +++ b/init-script/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/kubernetes/values-saas-staging.yaml b/kubernetes/values-saas-staging.yaml index 469d3dc86d..f5bf216bac 100644 --- a/kubernetes/values-saas-staging.yaml +++ b/kubernetes/values-saas-staging.yaml @@ -95,14 +95,6 @@ autoScaler: minReplicas: 1 maxReplicas: 5 -newRelic: - backend: - licenseKey: '521f482a2025b2740371c2b10ff58a069f8aNRAL' - appName: 'OneUptime Backend Staging' - probe: - licenseKey: '521f482a2025b2740371c2b10ff58a069f8aNRAL' - appName: 'OneUptime Probe Staging' - nodeEnv: staging logstashHost: 54.153.39.163 diff --git a/licensing/.dockerignore b/licensing/.dockerignore index 39f9e9f26b..621d0c906c 100644 --- a/licensing/.dockerignore +++ b/licensing/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/probe/.dockerignore b/probe/.dockerignore index 39f9e9f26b..621d0c906c 100755 --- a/probe/.dockerignore +++ b/probe/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/probe/index.js b/probe/index.js index 58295bc09d..dd6dbb0cf2 100755 --- a/probe/index.js +++ b/probe/index.js @@ -1,8 +1,3 @@ -// if new relic license key exists. Then load the key. -if (process.env.NEW_RELIC_LICENSE_KEY) { - require('newrelic'); -} - const { NODE_ENV } = process.env; if (!NODE_ENV || NODE_ENV === 'development') { diff --git a/probe/newrelic.js b/probe/newrelic.js deleted file mode 100644 index dca4bf9058..0000000000 --- a/probe/newrelic.js +++ /dev/null @@ -1,69 +0,0 @@ -'use strict'; -/** - * New Relic agent configuration. - * - * See lib/config/default.js in the agent distribution for a more complete - * description of configuration variables and their potential values. - */ -exports.config = { - /** - * Array of application names. - */ - app_name: [process.env.NEW_RELIC_APPLICATION_NAME], - /** - * Your New Relic license key. - */ - license_key: process.env.NEW_RELIC_LICENSE_KEY, - /** - * This setting controls distributed tracing. - * Distributed tracing lets you see the path that a request takes through your - * distributed system. Enabling distributed tracing changes the behavior of some - * New Relic features, so carefully consult the transition guide before you enable - * this feature: https://docs.newrelic.com/docs/transition-guide-distributed-tracing - * Default is true. - */ - distributed_tracing: { - /** - * Enables/disables distributed tracing. - * - * @env NEW_RELIC_DISTRIBUTED_TRACING_ENABLED - */ - enabled: true, - }, - logging: { - /** - * Level at which to log. 'trace' is most useful to New Relic when diagnosing - * issues with the agent, 'info' and higher will impose the least overhead on - * production applications. - */ - level: 'info', - }, - /** - * When true, all request headers except for those listed in attributes.exclude - * will be captured for all traces, unless otherwise specified in a destination's - * attributes include/exclude lists. - */ - allow_all_headers: true, - attributes: { - /** - * Prefix of attributes to exclude from all destinations. Allows * as wildcard - * at end. - * - * NOTE: If excluding headers, they must be in camelCase form to be filtered. - * - * @env NEW_RELIC_ATTRIBUTES_EXCLUDE - */ - exclude: [ - 'request.headers.cookie', - 'request.headers.authorization', - 'request.headers.proxyAuthorization', - 'request.headers.setCookie*', - 'request.headers.x*', - 'response.headers.cookie', - 'response.headers.authorization', - 'response.headers.proxyAuthorization', - 'response.headers.setCookie*', - 'response.headers.x*', - ], - }, -}; diff --git a/realtime/.dockerignore b/realtime/.dockerignore index 39f9e9f26b..621d0c906c 100644 --- a/realtime/.dockerignore +++ b/realtime/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage diff --git a/status-page/.dockerignore b/status-page/.dockerignore index 39f9e9f26b..621d0c906c 100644 --- a/status-page/.dockerignore +++ b/status-page/.dockerignore @@ -5,7 +5,7 @@ node_modules # dependencies /node_modules -/newrelic_agent.log + .idea # testing /coverage