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 'master' of https://github.com/OneUptime/oneuptime

Browse Source
This commit is contained in:
Nawaz Dhandala
2026-03-19 09:34:42 +00:00
parent e8e4ee3ff0 8b0926413e
commit 2aab01bde6
5 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
App/FeatureSet/StatusPage/src/Components/Monitor/MonitorOverview.tsx
View File

@@ -123,9 +123,9 @@ const MonitorOverview: FunctionComponent<ComponentProps> = (
</div>
</div>
{/* Uptime graph: Hidden on mobile, visible on larger screens */}
{/* Uptime graph: Scrollable on mobile, full width on larger screens */}
{props.showHistoryChart && (
<div className="w-full overflow-hidden hidden sm:block">
<div className="w-full overflow-x-auto">
<MonitorUptimeGraph
error={undefined}
barColorRules={props.statusPageHistoryChartBarColorRules}
@@ -140,9 +140,9 @@ const MonitorOverview: FunctionComponent<ComponentProps> = (
</div>
)}
{/* Time labels: Hidden on mobile, visible on larger screens */}
{/* Time labels: Visible on all screen sizes */}
{props.showHistoryChart && (
<div className="text-xs sm:text-sm text-gray-400 mt-1 justify-between hidden sm:flex">
<div className="text-xs sm:text-sm text-gray-400 mt-1 justify-between flex">
<div>90 days ago</div>
<div>Today</div>
</div>

24
HelmChart/Public/oneuptime/templates/_helpers.tpl
View File

@@ -52,7 +52,14 @@ Usage:
value: {{ $.Values.openTelemetryExporter.headers }}
{{- end }}
- name: SLACK_APP_CLIENT_ID
{{- if $.Values.slackApp.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ $.Values.slackApp.existingSecret.name }}
key: {{ $.Values.slackApp.existingSecret.clientIdKey }}
{{- else }}
value: {{ $.Values.slackApp.clientId | quote }}
{{- end }}
- name: GITHUB_APP_ID
value: {{ $.Values.gitHubApp.id | quote }}
- name: GITHUB_APP_NAME
@@ -169,10 +176,24 @@ Usage:
value: {{ default "https://oneuptime.com/api/notification/push-relay/send" $.Values.pushNotification.relayUrl | quote }}
- name: SLACK_APP_CLIENT_SECRET
{{- if $.Values.slackApp.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ $.Values.slackApp.existingSecret.name }}
key: {{ $.Values.slackApp.existingSecret.clientSecretKey }}
{{- else }}
value: {{ $.Values.slackApp.clientSecret }}
{{- end }}
- name: SLACK_APP_SIGNING_SECRET
value: {{ $.Values.slackApp.signingSecret }}
{{- if $.Values.slackApp.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ $.Values.slackApp.existingSecret.name }}
key: {{ $.Values.slackApp.existingSecret.signingSecretKey }}
{{- else }}
value: {{ $.Values.slackApp.signingSecret | quote }}
{{- end }}
- name: MICROSOFT_TEAMS_APP_CLIENT_SECRET
value: {{ $.Values.microsoftTeamsApp.clientSecret }}
@@ -189,7 +210,6 @@ Usage:
- name: CAPTCHA_SECRET_KEY
value: {{ default "" $.Values.captcha.secretKey | quote }}
- name: OPEN_SOURCE_DEPLOYMENT_WEBHOOK_URL
value: {{ default "" $.Values.openSourceDeployment.webhookUrl | quote }}

37
HelmChart/Public/oneuptime/values.schema.json
View File

@@ -1526,21 +1526,26 @@
},
"additionalProperties": false
},
"slackApp": {
"type": "object",
"properties": {
"clientId": {
"type": ["string", "null"]
},
"clientSecret": {
"type": ["string", "null"]
},
"signingSecret": {
"type": ["string", "null"]
}
},
"additionalProperties": false
},
"slackApp": {
"type": "object",
"properties": {
"clientId": { "type": ["string", "null"] },
"clientSecret": { "type": ["string", "null"] },
"signingSecret": { "type": ["string", "null"] },
"existingSecret": {
"type": "object",
"properties": {
"name": { "type": "string" },
"clientIdKey": { "type": "string" },
"clientSecretKey": { "type": "string" },
"signingSecretKey": { "type": "string" }
},
"required": ["name", "clientIdKey", "clientSecretKey", "signingSecretKey"],
"additionalProperties": false
}
},
"additionalProperties": false
},
"microsoftTeamsApp": {
"type": "object",
"properties": {
@@ -1684,4 +1689,4 @@
}
},
"additionalProperties": false
}
}

6
HelmChart/Public/oneuptime/values.yaml
View File

@@ -678,6 +678,12 @@ slackApp:
clientId:
clientSecret:
signingSecret:
# If you're using an existing secret for the configuration, please use this and update accordingly instead of the parameters above.
# existingSecret:
# name: "app-secret"
# clientIdKey: clientId
# clientSecretKey: clientSecret
# signingSecretKey: signingSecret
microsoftTeamsApp:
clientId:

51
Probe/package-lock.json generated
View File

@@ -2259,21 +2259,9 @@
"dev": true
},
"node_modules/fast-xml-builder": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
"integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT"
},
"node_modules/fast-xml-parser": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
"integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
"integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
"funding": [
{
"type": "github",
@@ -2282,7 +2270,23 @@
],
"license": "MIT",
"dependencies": {
"fast-xml-builder": "^1.0.0",
"path-expression-matcher": "^1.1.3"
}
},
"node_modules/fast-xml-parser": {
"version": "5.5.6",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz",
"integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"dependencies": {
"fast-xml-builder": "^1.1.4",
"path-expression-matcher": "^1.1.3",
"strnum": "^2.1.2"
},
"bin": {
@@ -4366,6 +4370,21 @@
"node": ">=8"
}
},
"node_modules/path-expression-matcher": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz",
"integrity": "sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",