Change to show last heartbeat

pull/4587/head
Bas Wieringa 8 months ago
parent f381d64fce
commit fb50d5f77c

@ -1,16 +0,0 @@
exports.up = function (knex) {
// Add new column status_page.hide_uptime_percentage
return knex.schema
.alterTable("status_page", function (table) {
table.boolean("hide_uptime_percentage").notNullable().defaultTo(false);
});
};
exports.down = function (knex) {
// Drop column status_page.hide_uptime_percentage
return knex.schema
.alterTable("status_page", function (table) {
table.dropColumn("hide_uptime_percentage");
});
};

@ -0,0 +1,16 @@
exports.up = function (knex) {
// Add new column status_page.show_last_heartbeat
return knex.schema
.alterTable("status_page", function (table) {
table.boolean("show_last_heartbeat").notNullable().defaultTo(false);
});
};
exports.down = function (knex) {
// Drop column status_page.show_last_heartbeat
return knex.schema
.alterTable("status_page", function (table) {
table.dropColumn("show_last_heartbeat");
});
};

@ -246,7 +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 showLastHeartbeat: !!this.show_last_heartbeat
}; };
} }
@ -269,7 +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 showLastHeartbeat: !!this.show_last_heartbeat
}; };
} }

@ -163,7 +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_last_heartbeat = config.showLastHeartbeat;
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;

@ -38,7 +38,7 @@
<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)" />
<Status v-if="hideUptimePercentage" :status="statusOfLastHeartbeat(monitor.element.id)" /> <Status v-if="showLastHeartbeat" :status="statusOfLastHeartbeat(monitor.element.id)" />
<Uptime v-else :monitor="monitor.element" type="24" :pill="true" /> <Uptime v-else :monitor="monitor.element" type="24" :pill="true" />
<a <a
v-if="showLink(monitor)" v-if="showLink(monitor)"
@ -116,8 +116,8 @@ export default {
showCertificateExpiry: { showCertificateExpiry: {
type: Boolean, type: Boolean,
}, },
/** Should uptime be hidden? */ /** Should only the last heartbeat be shown? */
hideUptimePercentage: { showLastHeartbeat: {
type: Boolean, type: Boolean,
}, },
}, },

@ -853,7 +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", "showLastHeartbeat": "Show Last Heartbeat Only",
"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,10 +60,10 @@
<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 --> <!-- Show last heartbeat -->
<div class="my-3 form-check form-switch"> <div class="my-3 form-check form-switch">
<input id="hide-uptime-percentage" v-model="config.hideUptimePercentage" class="form-check-input" type="checkbox"> <input id="show-last-heartbeat" v-model="config.showLastHeartbeat" class="form-check-input" type="checkbox">
<label class="form-check-label" for="hide-uptime-percentage">{{ $t("hideUptimePercentage") }}</label> <label class="form-check-label" for="show-last-heartbeat">{{ $t("showLastHeartbeat") }}</label>
</div> </div>
<div v-if="false" class="my-3"> <div v-if="false" class="my-3">
@ -325,7 +325,7 @@
👀 {{ $t("statusPageNothing") }} 👀 {{ $t("statusPageNothing") }}
</div> </div>
<PublicGroupList :edit-mode="enableEditMode" :show-tags="config.showTags" :show-certificate-expiry="config.showCertificateExpiry" :hide-uptime-percentage="config.hideUptimePercentage" /> <PublicGroupList :edit-mode="enableEditMode" :show-tags="config.showTags" :show-certificate-expiry="config.showCertificateExpiry" :show-last-heartbeat="config.showLastHeartbeat" />
</div> </div>
<footer class="mt-5 mb-4"> <footer class="mt-5 mb-4">

Loading…
Cancel
Save