mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-23 14:54:05 +00:00
Add toggle to hide the uptime percentage on a statuspage
This commit is contained in:
parent
0e3b3a9ab8
commit
201ac9245b
7 changed files with 42 additions and 4 deletions
7
db/patch-add-hide-uptime-percentage.sql
Normal file
7
db/patch-add-hide-uptime-percentage.sql
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
|
||||||
|
BEGIN TRANSACTION;
|
||||||
|
|
||||||
|
ALTER TABLE status_page
|
||||||
|
ADD hide_uptime_percentage BOOLEAN default 0 NOT NULL;
|
||||||
|
|
||||||
|
COMMIT;
|
|
@ -106,6 +106,7 @@ class Database {
|
||||||
"patch-notification-config.sql": true,
|
"patch-notification-config.sql": true,
|
||||||
"patch-fix-kafka-producer-booleans.sql": true,
|
"patch-fix-kafka-producer-booleans.sql": true,
|
||||||
"patch-timeout.sql": true, // The last file so far converted to a knex migration file
|
"patch-timeout.sql": true, // The last file so far converted to a knex migration file
|
||||||
|
"patch-add-hide-uptime-percentage.sql": true
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -246,6 +246,7 @@ class StatusPage extends BeanModel {
|
||||||
showPoweredBy: !!this.show_powered_by,
|
showPoweredBy: !!this.show_powered_by,
|
||||||
googleAnalyticsId: this.google_analytics_tag_id,
|
googleAnalyticsId: this.google_analytics_tag_id,
|
||||||
showCertificateExpiry: !!this.show_certificate_expiry,
|
showCertificateExpiry: !!this.show_certificate_expiry,
|
||||||
|
hideUptimePercentage: !!this.hide_uptime_percentage
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -268,6 +269,7 @@ class StatusPage extends BeanModel {
|
||||||
showPoweredBy: !!this.show_powered_by,
|
showPoweredBy: !!this.show_powered_by,
|
||||||
googleAnalyticsId: this.google_analytics_tag_id,
|
googleAnalyticsId: this.google_analytics_tag_id,
|
||||||
showCertificateExpiry: !!this.show_certificate_expiry,
|
showCertificateExpiry: !!this.show_certificate_expiry,
|
||||||
|
hideUptimePercentage: !!this.hide_uptime_percentage
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -163,6 +163,7 @@ module.exports.statusPageSocketHandler = (socket) => {
|
||||||
statusPage.footer_text = config.footerText;
|
statusPage.footer_text = config.footerText;
|
||||||
statusPage.custom_css = config.customCSS;
|
statusPage.custom_css = config.customCSS;
|
||||||
statusPage.show_powered_by = config.showPoweredBy;
|
statusPage.show_powered_by = config.showPoweredBy;
|
||||||
|
statusPage.hide_uptime_percentage = config.hideUptimePercentage;
|
||||||
statusPage.show_certificate_expiry = config.showCertificateExpiry;
|
statusPage.show_certificate_expiry = config.showCertificateExpiry;
|
||||||
statusPage.modified_date = R.isoDateTime();
|
statusPage.modified_date = R.isoDateTime();
|
||||||
statusPage.google_analytics_tag_id = config.googleAnalyticsId;
|
statusPage.google_analytics_tag_id = config.googleAnalyticsId;
|
||||||
|
|
|
@ -37,8 +37,9 @@
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<font-awesome-icon v-if="editMode" icon="arrows-alt-v" class="action drag me-3" />
|
<font-awesome-icon v-if="editMode" icon="arrows-alt-v" class="action drag me-3" />
|
||||||
<font-awesome-icon v-if="editMode" icon="times" class="action remove me-3" @click="removeMonitor(group.index, monitor.index)" />
|
<font-awesome-icon v-if="editMode" icon="times" class="action remove me-3" @click="removeMonitor(group.index, monitor.index)" />
|
||||||
|
|
||||||
<Uptime :monitor="monitor.element" type="24" :pill="true" />
|
<Status v-if="hideUptimePercentage" :status="statusOfLastHeartbeat(monitor.element.id)" />
|
||||||
|
<Uptime v-if="!hideUptimePercentage" :monitor="monitor.element" type="24" :pill="true" />
|
||||||
<a
|
<a
|
||||||
v-if="showLink(monitor)"
|
v-if="showLink(monitor)"
|
||||||
:href="monitor.element.url"
|
:href="monitor.element.url"
|
||||||
|
@ -90,6 +91,8 @@ import Draggable from "vuedraggable";
|
||||||
import HeartbeatBar from "./HeartbeatBar.vue";
|
import HeartbeatBar from "./HeartbeatBar.vue";
|
||||||
import Uptime from "./Uptime.vue";
|
import Uptime from "./Uptime.vue";
|
||||||
import Tag from "./Tag.vue";
|
import Tag from "./Tag.vue";
|
||||||
|
import Status from "./Status.vue";
|
||||||
|
import PublicStatus from "./PublicStatus.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
@ -98,6 +101,8 @@ export default {
|
||||||
HeartbeatBar,
|
HeartbeatBar,
|
||||||
Uptime,
|
Uptime,
|
||||||
Tag,
|
Tag,
|
||||||
|
Status,
|
||||||
|
PublicStatus
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
/** Are we in edit mode? */
|
/** Are we in edit mode? */
|
||||||
|
@ -112,7 +117,11 @@ export default {
|
||||||
/** Should expiry be shown? */
|
/** Should expiry be shown? */
|
||||||
showCertificateExpiry: {
|
showCertificateExpiry: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
}
|
},
|
||||||
|
/** Should uptime be hidden? */
|
||||||
|
hideUptimePercentage: {
|
||||||
|
type: Boolean,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -181,6 +190,17 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the status of the last heartbeat
|
||||||
|
* @param {object} monitor Monitor to get status for
|
||||||
|
* @returns {number} Status of the last heartbeat
|
||||||
|
*/
|
||||||
|
statusOfLastHeartbeat(monitor) {
|
||||||
|
let heartbeats = this.$root.heartbeatList[this.monitorId] ?? [];
|
||||||
|
let lastHeartbeat = heartbeats[heartbeats.length - 1];
|
||||||
|
return lastHeartbeat?.status;
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns certificate expiry color based on days remaining
|
* Returns certificate expiry color based on days remaining
|
||||||
* @param {object} monitor Monitor to show expiry for
|
* @param {object} monitor Monitor to show expiry for
|
||||||
|
|
|
@ -853,6 +853,7 @@
|
||||||
"nostrRecipients": "Recipients Public Keys (npub)",
|
"nostrRecipients": "Recipients Public Keys (npub)",
|
||||||
"nostrRecipientsHelp": "npub format, one per line",
|
"nostrRecipientsHelp": "npub format, one per line",
|
||||||
"showCertificateExpiry": "Show Certificate Expiry",
|
"showCertificateExpiry": "Show Certificate Expiry",
|
||||||
|
"hideUptimePercentage": "Hide Uptime Percentage",
|
||||||
"noOrBadCertificate": "No/Bad Certificate",
|
"noOrBadCertificate": "No/Bad Certificate",
|
||||||
"gamedigGuessPort": "Gamedig: Guess Port",
|
"gamedigGuessPort": "Gamedig: Guess Port",
|
||||||
"gamedigGuessPortDescription": "The port used by Valve Server Query Protocol may be different from the client port. Try this if the monitor cannot connect to your server.",
|
"gamedigGuessPortDescription": "The port used by Valve Server Query Protocol may be different from the client port. Try this if the monitor cannot connect to your server.",
|
||||||
|
|
|
@ -60,6 +60,12 @@
|
||||||
<label class="form-check-label" for="show-certificate-expiry">{{ $t("showCertificateExpiry") }}</label>
|
<label class="form-check-label" for="show-certificate-expiry">{{ $t("showCertificateExpiry") }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Hide uptime percentage -->
|
||||||
|
<div class="my-3 form-check form-switch">
|
||||||
|
<input id="hide-uptime-percentage" v-model="config.hideUptimePercentage" class="form-check-input" type="checkbox">
|
||||||
|
<label class="form-check-label" for="hide-uptime-percentage">{{ $t("hideUptimePercentage") }}</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-if="false" class="my-3">
|
<div v-if="false" class="my-3">
|
||||||
<label for="password" class="form-label">{{ $t("Password") }} <sup>{{ $t("Coming Soon") }}</sup></label>
|
<label for="password" class="form-label">{{ $t("Password") }} <sup>{{ $t("Coming Soon") }}</sup></label>
|
||||||
<input id="password" v-model="config.password" disabled type="password" autocomplete="new-password" class="form-control">
|
<input id="password" v-model="config.password" disabled type="password" autocomplete="new-password" class="form-control">
|
||||||
|
@ -319,7 +325,7 @@
|
||||||
👀 {{ $t("statusPageNothing") }}
|
👀 {{ $t("statusPageNothing") }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<PublicGroupList :edit-mode="enableEditMode" :show-tags="config.showTags" :show-certificate-expiry="config.showCertificateExpiry" />
|
<PublicGroupList :edit-mode="enableEditMode" :show-tags="config.showTags" :show-certificate-expiry="config.showCertificateExpiry" :hide-uptime-percentage="config.hideUptimePercentage" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<footer class="mt-5 mb-4">
|
<footer class="mt-5 mb-4">
|
||||||
|
|
Loading…
Reference in a new issue