Remove unused launch configurations and update port values

This commit is contained in:
Simon Larsen
2023-12-28 16:49:47 +00:00
parent d11a5e1d1e
commit 2e8ee1d51b
7 changed files with 3 additions and 160 deletions

28
.vscode/launch.json vendored
View File

@@ -41,20 +41,6 @@
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/ApiReference",
"name": "API Reference: Debug with Docker",
"port": 9178,
"remoteRoot": "/usr/src/app",
"request": "attach",
"skipFiles": [
"<node_internals>/**"
],
"type": "node",
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/TestServer",
@@ -195,20 +181,6 @@
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/home",
"name": "Home: Debug with Docker",
"port": 9235,
"remoteRoot": "/usr/src/app",
"request": "attach",
"skipFiles": [
"<node_internals>/**"
],
"type": "node",
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/script-runnner",

View File

@@ -1,36 +0,0 @@
#!/usr/bin/env bash
# Please make sure kubectl is installed and context is pointed to the cluster you want to update/rollback.
if [[ ! $(which kubectl)]]
then
echo -e "\033[91mPlease install Kubectl and point context to the cluster you want to update/rollback. https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/"
exit
fi
function update {
# $1 - target deployment
# $2 - target image
echo "Updating $1 with $2"
kubectl set image $1 $2
}
# $1 - image tag
update deployment/fi-accounts fi-accounts=oneuptime/accounts:$1
update deployment/fi-dashboard fi-dashboard=oneuptime/dashboard:$1
update deployment/fi-admin fi-admin=oneuptime/AdminDashboard:$1
update deployment/fi-ApiReference fi-ApiReference=oneuptime/ApiReference:$1
update deployment/fi-app-scan fi-app-scan=oneuptime/ApplicationScanner:$1
update deployment/fi-backend fi-backend=oneuptime/backend:$1
update deployment/fi-cont-scan fi-cont-scan=oneuptime/ContainerScanner:$1
update deployment/fi-ingestor fi-ingestor=oneuptime/data-ingestor:$1
update deployment/fi-haraka fi-haraka=oneuptime/haraka:$1
update deployment/fi-HelmChart fi-HelmChart=oneuptime/HelmChart:$1
update deployment/fi-home fi-home=oneuptime/home:$1
update deployment/fi-test fi-test=oneuptime/HttpTestServer:$1
update deployment/fi-licensing fi-licensing=oneuptime/licensing:$1
update deployment/fi-lighthouse fi-lighthouse=oneuptime/LighthouseRunner:$1
update deployment/fi-probe1 fi-probe1=oneuptime/probe:$1
update deployment/fi-probe2 fi-probe2=oneuptime/probe:$1
update deployment/fi-realtime fi-realtime=oneuptime/realtime:$1
update deployment/fi-script fi-script=oneuptime/ScriptRunner:$1
update deployment/fi-status fi-status=oneuptime/StatusPage:$1

View File

@@ -127,9 +127,7 @@ probes:
# monitorFetchLimit: 10
port:
home: 1444
dashboardApi: 3002
apiReference: 1445
workflow: 3099
alert: 3088
ingestor: 3400

View File

@@ -11,10 +11,6 @@ upstream workflow {
server ${SERVER_WORKFLOW_HOSTNAME}:${WORKFLOW_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
upstream api-reference {
server ${SERVER_API_REFERENCE_HOSTNAME}:${API_REFERENCE_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
upstream ingestor {
server ${SERVER_INGESTOR_HOSTNAME}:${INGESTOR_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
@@ -31,10 +27,6 @@ upstream status-page {
server ${SERVER_STATUS_PAGE_HOSTNAME}:${STATUS_PAGE_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
upstream home {
server ${SERVER_HOME_HOSTNAME}:${HOME_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
upstream workers {
server ${SERVER_WORKERS_HOSTNAME}:${WORKERS_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
@@ -260,7 +252,7 @@ server {
# If billing_enabled is true then proxy to home otherwise to dashboard because we dont need marketing paages for on-prem install.
if ($billing_enabled = true) {
proxy_pass http://home;
proxy_pass http://app;
}
if ($billing_enabled != true) {
@@ -430,7 +422,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://api-reference;
proxy_pass http://app/reference;
}
location /file {
@@ -458,7 +450,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://app;
proxy_pass http://app/api;
client_max_body_size 50M;
}

View File

@@ -311,25 +311,7 @@ services:
- redis
- postgres
home:
networks:
- oneuptime
environment:
<<: *common-ui-variables
PORT: ${HOME_PORT}
api-reference:
networks:
- oneuptime
restart: always
environment:
<<: *common-ui-variables
PORT: ${API_REFERENCE_PORT}
ingress:

View File

@@ -297,56 +297,6 @@ services:
network: host
context: .
dockerfile: ./Ingestor/Dockerfile
home:
volumes:
- ./Home:/usr/src/app
# Use node modules of the container and not host system.
# https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
- /usr/src/app/node_modules/
- ./Common:/usr/src/Common
- ./Model:/usr/src/Model
- ./CommonServer:/usr/src/CommonServer
- ./CommonUI:/usr/src/CommonUI
- /usr/src/Common/node_modules/
- /usr/src/CommonUI/node_modules/
- /usr/src/CommonServer/node_modules/
- /usr/src/Model/node_modules/
ports:
- '9235:9229' # Debugging port.
extends:
file: ./docker-compose.base.yml
service: home
build:
network: host
context: .
dockerfile: ./Home/Dockerfile
api-reference:
volumes:
- ./ApiReference:/usr/src/app
# Use node modules of the container and not host system.
# https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
- /usr/src/app/node_modules/
- ./Common:/usr/src/Common
- ./Model:/usr/src/Model
- ./CommonServer:/usr/src/CommonServer
- ./CommonUI:/usr/src/CommonUI
- /usr/src/Common/node_modules/
- /usr/src/CommonUI/node_modules/
- /usr/src/CommonServer/node_modules/
- /usr/src/Model/node_modules/
ports:
- '9178:9229' # Debugging port.
extends:
file: ./docker-compose.base.yml
service: api-reference
build:
network: host
context: .
dockerfile: ./ApiReference/Dockerfile
ingress:

View File

@@ -100,21 +100,6 @@ services:
extends:
file: ./docker-compose.base.yml
service: ingestor
home:
image: oneuptime/home:${APP_TAG}
extends:
file: ./docker-compose.base.yml
service: home
api-reference:
image: oneuptime/api-reference:${APP_TAG}
extends:
file: ./docker-compose.base.yml
service: api-reference
ingress:
image: oneuptime/nginx:${APP_TAG}