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

Merge branch 'release'

Browse Source
This commit is contained in:
Simon Larsen
2022-05-02 13:42:26 +01:00
parent 39a736775e 10c67c05aa
commit 8e2691d0f0
12 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/deployment.production.nginx.yaml vendored
View File

@@ -32,5 +32,5 @@ jobs:
# Build and deploy LighthouseRunner.
- run: sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
- run: sudo docker buildx create --use
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID --push -f ./nginx/Dockerfile .
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:latest --push -f ./nginx/Dockerfile .
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID --push -f ./nginx/Dockerfile ./nginx
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:latest --push -f ./nginx/Dockerfile ./nginx

4
.github/workflows/deployment.staging.nginx.yaml vendored
View File

@@ -34,5 +34,5 @@ jobs:
# Build and deploy nginx.
- run: sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
- run: sudo docker buildx create --use
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID-staging --push -f ./nginx/Dockerfile .
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:staging --push -f ./nginx/Dockerfile .
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID-staging --push -f ./nginx/Dockerfile ./nginx
- run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:staging --push -f ./nginx/Dockerfile ./nginx

BIN
Home/public/img/amersc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

47
Home/public/img/sodexo.svg Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Inkscape (http://www.inkscape.org/) by Marsupilami -->
<svg
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.0"
width="1024"
height="344"
viewBox="-1.27616616 -1.27616616 134.31170232 45.09120432"
id="svg6217">
<defs
id="defs6219" />
<path
d="M 62.52625,26.30725 L 61.06375,33.611 C 60.42,36.57225 58.63625,38.5485 54.9925,38.5485 C 50.81,38.5485 49.70625,35.95475 50.62375,32.30475 C 51.9225,27.12725 56.14625,25.58475 62.52625,26.30725 M 69.1125,15.86475 L 64.66625,16.1485 L 63.26,23.29975 C 61.56,23.23975 61.025,23.186 59.02625,23.186 C 52.76875,23.186 47.3075,25.816 45.865,31.986 C 44.565,37.5485 47.725,41.866 54.61625,41.866 C 61.675,41.866 64.74625,38.1835 65.85,33.00475 L 69.1125,15.86475 z"
id="path5955"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 20.875,26.61887 C 14.355,26.02512 8.74625,26.56637 8.655,28.78012 C 8.51375,32.10387 19.40125,29.20387 19.19125,35.31887 C 18.885,44.30262 3.74625,42.23637 0,41.09262 L 0.68,38.42637 C 7.13875,39.45137 13.9525,39.53637 14.1025,35.97387 C 14.2625,32.18762 3.33,35.59137 3.58625,29.46012 C 3.7775,24.89262 10.61,22.43012 21.79375,24.07262 L 20.875,26.61887 z"
id="path5959"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 38.45513,32.73013 C 37.51388,36.48013 34.54013,38.83513 30.99888,38.83513 C 27.29638,38.83513 25.63013,36.68888 26.62263,32.73013 C 27.56513,28.98013 30.57388,26.46263 34.11388,26.46263 C 37.65138,26.46263 39.39638,28.98013 38.45513,32.73013 M 34.68388,23.39263 C 28.20013,23.39263 22.98763,27.14388 21.70638,32.73013 C 20.42138,38.32013 23.91263,42.07013 30.39388,42.07013 C 36.87513,42.07013 42.08888,38.32013 43.37138,32.73013 C 44.65638,27.14388 41.16638,23.39263 34.68388,23.39263"
id="path5963"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 109.599,41.97526 L 103.96275,41.97526 C 100.54525,38.76151 94.0065,31.37776 89.19275,23.56401 L 93.329,23.56401 C 97.90025,29.87151 109.599,41.97526 109.599,41.97526"
id="path5967"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 115.5055,5.40625 L 118.098,-5.6843419e-14 L 118.838,5.49625 L 124.1255,3.64625 L 120.4305,8.38375 L 124.438,11.48875 L 119.08925,11.9025 L 118.79425,17.6175 L 115.8205,13.39375 L 111.44925,17.42375 L 113.088,11.745 L 107.933,11.04625 L 112.9505,8.1875 L 110.89175,3.29625 L 115.5055,5.40625 z"
id="path5971"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 126.4965,32.78676 C 125.54025,36.59551 122.52025,38.98801 118.924,38.98801 C 115.164,38.98801 113.469,36.80801 114.479,32.78676 C 115.43525,28.97801 118.49025,26.42051 122.08525,26.42051 C 125.68275,26.42051 127.454,28.97801 126.4965,32.78676 M 122.66525,23.29926 C 116.0815,23.29926 110.78775,27.11051 109.48275,32.78676 C 108.179,38.46426 111.72525,42.27426 118.309,42.27426 C 124.894,42.27426 130.189,38.46426 131.4915,32.78676 C 132.7965,27.11051 129.25025,23.29926 122.66525,23.29926"
id="path5975"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 84.92138,40.40587 C 95.56638,34.49337 104.81263,25.40712 111.37138,17.55212 C 106.65638,32.30962 95.30638,40.25212 84.92138,40.40587"
id="path5979"
style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
d="M 80.708,26.13137 C 82.74675,26.13137 83.85675,26.87137 83.85675,28.28512 C 83.85675,32.03762 76.5405,31.79012 73.31425,31.13262 C 74.44925,28.32387 77.01175,26.13137 80.708,26.13137 M 88.24175,28.08012 C 88.24175,25.35887 86.073,23.35887 81.15175,23.35887 C 73.1705,23.35887 67.98425,28.54012 67.98425,34.95387 C 67.98425,39.09637 71.423,42.53887 77.70425,42.53887 C 82.03175,42.53887 84.92175,40.40637 84.92175,40.40637 C 79.41425,40.99637 72.6505,40.40637 72.6505,34.51387 C 72.6505,34.28012 72.663,34.04637 72.68175,33.81262 C 80.19675,35.37262 88.24175,33.48512 88.24175,28.08012"
id="path5983"
style="fill:#2b3797;fill-opacity:1;fill-rule:nonzero;stroke:none" />
</svg>
<!-- version: 20090314, original size: 131.75937 42.538872, border: 3% -->
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

4
Home/views/api-monitoring.ejs
View File

@@ -271,7 +271,7 @@
<%- include('cta-buttons') -%>
<%- include("testimonials", {
<!-- <%- include("testimonials", {
title: "Software teams around the world love OneUptime!",
description: "Software development teams around the world have switched to OneUptime to fundamentally improve their SRE workflow to build better and more reliable software.",
quotes: [
@@ -296,7 +296,7 @@
by: "Trevos Crosse, PNI Digital"
}
]
}) %>
}) %> -->
<header style="padding-top:50px; border-top: 1px solid rgba(0,0,0,.07); border-bottom:unset">
<h2 class="header">How monitoring helps your business?</h2>

2
Home/views/cta-buttons.ejs
View File

@@ -11,7 +11,7 @@
Try Free for 14 days
</a>
</li>
<li class="invisible-in-mobile">
<li class="invisible-in-mobile" style="margin-left: 20px">
<a href="/enterprise/demo" class="common-Button"
data-analytics-action="contact_sales" data-analytics-source="header_cta">
Request Demo

12
Home/views/customer-section.ejs
View File

@@ -1,11 +1,10 @@
<section id="secondary">
<section id="customer-logos">
<a href="/customers" class="container-lg">
<span class="common-Button common-Button--default">See our customers</span>
<div class="container-lg">
<ul>
<li>
<img style="height:50px" class="cloudboost" alt="cloudboost" src="/img/CloudBoost.svg">
<img style="height:35px; margin-top: -20px;" class="sodexo" alt="sodexo" src="/img/sodexo.svg">
</li>
<li>
<img style="height:20px" class="viewsonic" alt="ViewSonic" src="/img/viewsonic.svg">
@@ -17,15 +16,14 @@
<img style="height:25px" class="securonix" alt="securonix" src="/img/securonix.png">
</li>
<li>
<img style="height:40px" class="elasticstack" alt="elasticstack"
src="/img/elastic-stack.svg">
<img style="height:35px" class="amersc" alt="amersc"
src="/img/amersc.png">
</li>
<li>
<img style="height:50px" class="freshsales" alt="rentacenter" src="/img/rentacenter.svg">
</li>
</ul>
</a>
</div>
</section>
</section>

9
Home/views/index.ejs
View File

@@ -118,11 +118,6 @@
<%- include('feature-table') -%>
<div class="sectionBorderTop">
<%- include('customer-section') -%>
</div>
<div class="sectionBorderTop">
<%- include('comparision-chart') -%>
@@ -292,7 +287,7 @@
<%- include('cta-buttons') -%>
</section>
<%- include("testimonials", { title: "Software teams around the world love OneUptime!" ,
<!-- <%- include("testimonials", { title: "Software teams around the world love OneUptime!" ,
description: "Software development teams around the world have switched to OneUptime to fundamentally improve their SRE workflow to build better and more reliable software."
, quotes: [ {
quote: "Having a public status page built accountability in our team towards our customers ‘We were responsible for our software reliability.’"
@@ -306,7 +301,7 @@
quote: "We can see exactly what the state of the software and our service is. Less confusion and we're much more efficient."
, by: "Trevos Crosse, PNI Digital" } ] }) %>
<%- include('integration') -%>
<%- include('integration') -%> -->
</main>
</div>

4
Home/views/private-status-page.ejs
View File

@@ -371,7 +371,7 @@
</div>
<%- include('cta-buttons') -%>
<%- include("testimonials", {
<!-- <%- include("testimonials", {
title: "Software teams around the world love OneUptime!",
description: "Software development teams around the world have switched to OneUptime to fundamentally improve their SRE workflow to build better and more reliable software.",
quotes: [
@@ -396,7 +396,7 @@
by: "Trevos Crosse, PNI Digital"
}
]
}) %>
}) %> -->
<%- include('integration') -%>
</section>

4
Home/views/public-status-page.ejs
View File

@@ -355,7 +355,7 @@
</div>
<%- include('cta-buttons') -%>
<%- include("testimonials", {
<!-- <%- include("testimonials", {
title: "Software teams around the world love OneUptime!",
description: "Software development teams around the world have switched to OneUptime to fundamentally improve their SRE workflow to build better and more reliable software.",
quotes: [
@@ -380,7 +380,7 @@
by: "Trevos Crosse, PNI Digital"
}
]
}) %>
}) %> -->
<%- include('integration') -%>
</section>

4
Home/views/website-monitoring.ejs
View File

@@ -273,7 +273,7 @@
<%- include('cta-buttons') -%>
<%- include("testimonials", {
<!-- <%- include("testimonials", {
title: "Software teams around the world love OneUptime!",
description: "Software development teams around the world have switched to OneUptime to fundamentally improve their SRE workflow to build better and more reliable software.",
quotes: [
@@ -298,7 +298,7 @@
by: "Trevos Crosse, PNI Digital"
}
]
}) %>
}) %> -->
<header style="padding-top:50px; border-top: 1px solid rgba(0,0,0,.07); border-bottom:unset">
<h2 class="header">How monitoring helps your business?</h2>

10
Nginx/default.conf
View File

@@ -1,6 +1,5 @@
upstream accounts {
server accounts:3003; # server name is same as the service name used in docker-compose file
# port on which the service is running...NOT the exposed port(the RHS port in docker-compose ports attr.)
server accounts:3003;
}
upstream admin {
server AdminDashboard:3100;
@@ -35,14 +34,10 @@ upstream probe1 {
upstream probe2 {
server probe2:3025;
}
server {
listen 80;
server_name localhost;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl; # Port HTTPS
listen 80;
server_name localhost;
ssl_certificate /etc/nginx/certs/nginx.crt;
@@ -51,6 +46,7 @@ server {
location / {
proxy_pass http://home/;
}
location /accounts {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;