kgess-mirror/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-01-12 06:53:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update package name and hostnames

Browse source
This commit is contained in:
Simon Larsen 2023-12-28 15:54:27 +00:00
parent c4ba05990a
commit d11a5e1d1e
No known key found for this signature in database
GPG key ID: AB45983AA9C81CDE
13 changed files with 45 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/compile.yml vendored
View file

@ -63,7 +63,7 @@ jobs:
- run: cd Common && npm install
- run: cd Model && npm install && npm run compile && npm run dep-check
compile-dashboard-api:
compile-app:
runs-on: ubuntu-latest
env:
CI_PIPELINE_ID: ${{github.run_number}}

32
.github/workflows/docker-build.yml vendored
View file

@ -41,22 +41,7 @@ jobs:
- name: build docker image
run: sudo docker build -f ./OTelCollector/Dockerfile .
docker-build-api-reference:
runs-on: ubuntu-latest
env:
CI_PIPELINE_ID: ${{github.run_number}}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Preinstall
run: npm run prerun
# build image for home
- name: build docker image
run: sudo docker build -f ./ApiReference/Dockerfile .
docker-build-dashboard-api:
docker-build-app:
runs-on: ubuntu-latest
env:
CI_PIPELINE_ID: ${{github.run_number}}
@ -118,21 +103,6 @@ jobs:
run: sudo docker build -f ./Haraka/Dockerfile .
docker-build-home:
runs-on: ubuntu-latest
env:
CI_PIPELINE_ID: ${{github.run_number}}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Preinstall
run: npm run prerun
# build image for home
- name: build docker image
run: sudo docker build -f ./Home/Dockerfile .
docker-build-probe:
runs-on: ubuntu-latest
env:

8
.github/workflows/release.yml vendored
View file

@ -812,7 +812,7 @@ jobs:
GIT_SHA=${{ github.sha }}
APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
dashboard-api-docker-image-deploy:
app-docker-image-deploy:
needs: generate-build-number
runs-on: ubuntu-latest
steps:
@ -821,8 +821,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
oneuptime/dashboard-api
ghcr.io/oneuptime/dashboard-api
oneuptime/app
ghcr.io/oneuptime/app
tags: |
type=raw,value=release,enable=true
type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
@ -844,7 +844,7 @@ jobs:
- name: Generate Dockerfile from Dockerfile.tpl
run: npm run prerun
# Build and deploy dashboard-api.
# Build and deploy app.
- name: Login to Docker Hub
uses: docker/login-action@v2.2.0

8
.github/workflows/test-release.yaml vendored
View file

@ -755,7 +755,7 @@ jobs:
GIT_SHA=${{ github.sha }}
APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
dashboard-api-docker-image-deploy:
app-docker-image-deploy:
needs: generate-build-number
runs-on: ubuntu-latest
steps:
@ -764,8 +764,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
oneuptime/dashboard-api
ghcr.io/oneuptime/dashboard-api
oneuptime/app
ghcr.io/oneuptime/app
tags: |
type=raw,value=test,enable=true
type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@ -788,7 +788,7 @@ jobs:
- name: Generate Dockerfile from Dockerfile.tpl
run: npm run prerun
# Build and deploy dashboard-api.
# Build and deploy app.
- name: Login to Docker Hub
uses: docker/login-action@v2.2.0

4
App/package-lock.json generated
View file

@ -1,11 +1,11 @@
{
"name": "dashboard-api",
"name": "app",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "dashboard-api",
"name": "app",
"version": "1.0.0",
"license": "ISC",
"dependencies": {

2
App/package.json
View file

@ -1,5 +1,5 @@
{
"name": "dashboard-api",
"name": "app",
"version": "1.0.0",
"description": "",
"main": "index.js",

2
HelmChart/Public/oneuptime/templates/_helpers.tpl
View file

@ -24,7 +24,7 @@
- name: SERVER_ACCOUNTS_HOSTNAME
value: {{ $.Release.Name }}-accounts.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_DASHBOARD_API_HOSTNAME
value: {{ $.Release.Name }}-dashboard-api.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_WORKFLOW_HOSTNAME
value: {{ $.Release.Name }}-workflow.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_INGESTOR_HOSTNAME

6
HelmChart/Public/oneuptime/templates/dashboard-api.yaml
View file

@ -1,16 +1,16 @@
# OneUptime dashboardApi Deployment
{{- $dashboardApiEnv := dict "PORT" $.Values.port.dashboardApi $.Values.port.notification "SMS_HIGH_RISK_COST_IN_CENTS" $.Values.billing.smsHighRiskValueInCents "CALL_HIGH_RISK_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callHighRiskValueInCentsPerMinute "SMS_DEFAULT_COST_IN_CENTS" $.Values.billing.smsDefaultValueInCents "CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callDefaultValueInCentsPerMinute "INTERNAL_SMTP_FROM_NAME" $.Values.internalSmtp.name "INTERNAL_SMTP_EMAIL" $.Values.internalSmtp.email "INTERNAL_SMTP_PASSWORD" "internal_smtp_password" -}}
{{- $dashboardApiDeploymentArgs :=dict "IsServer" true "ServiceName" "dashboard-api" "Port" $.Values.port.dashboardApi "Release" $.Release "Values" $.Values "Env" $dashboardApiEnv -}}
{{- $dashboardApiDeploymentArgs :=dict "IsServer" true "ServiceName" "app" "Port" $.Values.port.dashboardApi "Release" $.Release "Values" $.Values "Env" $dashboardApiEnv -}}
{{- include "oneuptime.deployment" $dashboardApiDeploymentArgs }}
---
# OneUptime dashboardApi Service
{{- $dashboardApiServiceArgs := dict "ServiceName" "dashboard-api" "Port" $.Values.port.dashboardApi "Release" $.Release "Values" $.Values -}}
{{- $dashboardApiServiceArgs := dict "ServiceName" "app" "Port" $.Values.port.dashboardApi "Release" $.Release "Values" $.Values -}}
{{- include "oneuptime.service" $dashboardApiServiceArgs }}
---
# OneUptime dashboardApi autoscaler
{{- $dashboardApiAutoScalerArgs := dict "ServiceName" "dashboard-api" "Release" $.Release "Values" $.Values -}}
{{- $dashboardApiAutoScalerArgs := dict "ServiceName" "app" "Release" $.Release "Values" $.Values -}}
{{- include "oneuptime.autoscaler" $dashboardApiAutoScalerArgs }}
---

36
Nginx/default.conf.template
View file

@ -3,7 +3,7 @@ upstream accounts {
}
upstream dashboard-api {
upstream app {
server ${SERVER_DASHBOARD_API_HOSTNAME}:${DASHBOARD_API_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
@ -82,7 +82,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/status-page/;
proxy_pass http://app/api/status-page/;
}
location /status-page-sso-api/ {
@ -96,7 +96,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page-sso/;
proxy_pass http://app/api/identity/status-page-sso/;
}
location /status-page-identity-api/ {
@ -110,7 +110,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page/;
proxy_pass http://app/api/identity/status-page/;
}
# Acme Verification.
@ -125,7 +125,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/status-page/.well-known;
proxy_pass http://app/api/status-page/.well-known;
}
}
@ -180,7 +180,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/status-page/;
proxy_pass http://app/api/status-page/;
}
location /status-page-sso-api/ {
@ -194,7 +194,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page-sso/;
proxy_pass http://app/api/identity/status-page-sso/;
}
location /status-page-identity-api/ {
@ -208,7 +208,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page/;
proxy_pass http://app/api/identity/status-page/;
}
location /status-page {
@ -280,7 +280,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/status-page/;
proxy_pass http://app/api/status-page/;
}
location /status-page-sso-api/ {
@ -294,7 +294,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page-sso/;
proxy_pass http://app/api/identity/status-page-sso/;
}
location /status-page-identity-api/ {
@ -308,7 +308,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity/status-page/;
proxy_pass http://app/api/identity/status-page/;
}
@ -348,7 +348,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/notification;
proxy_pass http://app/api/notification;
}
location /ingestor {
@ -417,7 +417,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/identity;
proxy_pass http://app/api/identity;
}
location /reference {
@ -443,7 +443,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/file;
proxy_pass http://app/api/file;
client_max_body_size 50M;
}
@ -458,7 +458,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api;
proxy_pass http://app;
client_max_body_size 50M;
}
@ -473,7 +473,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api;
proxy_pass http://app;
client_max_body_size 50M;
}
@ -488,7 +488,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api;
proxy_pass http://app;
client_max_body_size 50M;
}
@ -535,7 +535,7 @@ server {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://dashboard-api/api/short-link/redirect-to-shortlink/;
proxy_pass http://app/api/short-link/redirect-to-shortlink/;
client_max_body_size 50M;
}

2
config.example.env
View file

@ -76,7 +76,7 @@ INGESTOR_HOSTNAME=ingestor:3400
SERVER_ACCOUNTS_HOSTNAME=accounts
SERVER_REALTIME_HOSTNAME=realtime
SERVER_DASHBOARD_API_HOSTNAME=dashboard-api
SERVER_DASHBOARD_API_HOSTNAME=app
SERVER_WORKFLOW_HOSTNAME=workflow
SERVER_ALERT_HOSTNAME=alert
SERVER_INGESTOR_HOSTNAME=ingestor

8
docker-compose.base.yml
View file

@ -17,7 +17,7 @@ x-common-variables: &common-variables
SERVER_ACCOUNTS_HOSTNAME: accounts
SERVER_REALTIME_HOSTNAME: realtime
SERVER_DASHBOARD_API_HOSTNAME: dashboard-api
SERVER_DASHBOARD_API_HOSTNAME: app
SERVER_WORKFLOW_HOSTNAME: workflow
SERVER_ALERT_HOSTNAME: alert
SERVER_INGESTOR_HOSTNAME: ingestor
@ -179,7 +179,7 @@ services:
PORT: ${STATUS_PAGE_PORT}
depends_on:
- accounts
- dashboard-api
- app
@ -192,7 +192,7 @@ services:
PORT: ${TEST_SERVER_PORT}
dashboard-api:
app:
networks:
- oneuptime
restart: always
@ -335,7 +335,7 @@ services:
ingress:
depends_on:
- accounts
- dashboard-api
- app
- dashboard
- home

4
docker-compose.dev.yml
View file

@ -174,7 +174,7 @@ services:
dockerfile: ./TestServer/Dockerfile
dashboard-api:
app:
volumes:
- ./DashboardAPI:/usr/src/app
# Use node modules of the container and not host system.
@ -190,7 +190,7 @@ services:
- /usr/src/Model/node_modules/
extends:
file: ./docker-compose.base.yml
service: dashboard-api
service: app
ports:
- '9232:9229' # Debugging port.
build:

6
docker-compose.yml
View file

@ -61,11 +61,11 @@ services:
dashboard-api:
image: oneuptime/dashboard-api:${APP_TAG}
app:
image: oneuptime/app:${APP_TAG}
extends:
file: ./docker-compose.base.yml
service: dashboard-api
service: app
workflow: