diff --git a/client/ts/modules/metric-page/abstract.ts b/client/ts/modules/metric-page/abstract.ts
index adbfa1fc2107080672167e628ef455d06f051aa9..775a45f982069f0f26e4af7b66e53ab2100e2865 100644
--- a/client/ts/modules/metric-page/abstract.ts
+++ b/client/ts/modules/metric-page/abstract.ts
@@ -190,12 +190,26 @@ export abstract class MetricPage<T extends Metric<DataPoint>> {
this.minData)
;
- console.log("from: " + from);
- console.log("to: " + to);
- console.log("maxData: " + this.maxData);
- console.log("minData: " + this.minData);
- console.log("start: " + this.start);
- console.log("end: " + this.end);
+ // fix low time range
+ // if the difference in time is less than 10 minutes, we should extend the range
+ const tenMinutes = 10 * 60 * 1000
+ if (to - from < tenMinutes) {
+ if (this.maxData - to >= tenMinutes) {
+ to += tenMinutes;
+ } else if (from - this.minData >= tenMinutes) {
+ from -= tenMinutes;
+ } else {
+ from = this.minData;
+ to = this.maxData;
+ }
+ }
+
+ // console.log("from: " + from);
+ // console.log("to: " + to);
+ // console.log("maxData: " + this.maxData);
+ // console.log("minData: " + this.minData);
+ // console.log("start: " + this.start);
+ // console.log("end: " + this.end);
plot.setSelection({ xaxis: { from: from, to: to }, yaxis: { from: 0, to: 0 } });
} else {
diff --git a/client/ts/modules/metric-page/cpu-load.ts b/client/ts/modules/metric-page/cpu-load.ts
index 2c8f05f9f6b5cd640efad87828c730543d8f4fa9..3f381f354462e6ed2135a396e9eb11def5948f8f 100644
--- a/client/ts/modules/metric-page/cpu-load.ts
+++ b/client/ts/modules/metric-page/cpu-load.ts
@@ -146,7 +146,7 @@ export class CpuLoadMetricPage extends MetricPage<Metric<CpuLoadDataPoint>> {
<td>${dp.timestamp}</td>
<td>${dp.value}%</td>
<td>
- <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 2 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 2 * 60 * 1000).getTime()}">
+ <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 10 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 10 * 60 * 1000).getTime()}">
Zoom plot
</a>
</td>
diff --git a/client/ts/modules/metric-page/health.ts b/client/ts/modules/metric-page/health.ts
index a54f7f9b2fe20c47c8972a84632ec40308b25424..ba5a21ec6c202560f86119bf9aa8be5d22f66a78 100644
--- a/client/ts/modules/metric-page/health.ts
+++ b/client/ts/modules/metric-page/health.ts
@@ -208,7 +208,7 @@ export class HealthMetricPage extends MetricPage<Metric<HealthDataPoint>> {
Health report details | Health ${e.detail.health}% | ${timestamp}
<small>
Inspect metric labels at the moment report was generated.
- <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(timestamp.getTime() - 2 * 60 * 1000).getTime()}/${new Date(timestamp.getTime() + 2 * 60 * 1000).getTime()}">
+ <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(timestamp.getTime() - 10 * 60 * 1000).getTime()}/${new Date(timestamp.getTime() + 10 * 60 * 1000).getTime()}">
View data at that moment.
</a>
</small>
@@ -238,7 +238,7 @@ export class HealthMetricPage extends MetricPage<Metric<HealthDataPoint>> {
<td>${el.Source}</td>
<td>${el.Label}</td>
<td>
- <a href="/home/metric/${el.Type}/${el.Source}/${new Date(timestamp.getTime() - 2 * 60 * 1000).getTime()}/${new Date(timestamp.getTime() + 2 * 60 * 1000).getTime()}">
+ <a href="/home/metric/${el.Type}/${el.Source}/${new Date(timestamp.getTime() - 10 * 60 * 1000).getTime()}/${new Date(timestamp.getTime() + 10 * 60 * 1000).getTime()}">
View data
</a>
</td>
diff --git a/client/ts/modules/metric-page/ping.ts b/client/ts/modules/metric-page/ping.ts
index eda6c4f36bc442120877d61f8f5fc86aeb775079..23008af788c490a1f6183ccd78088cc695b8f659 100644
--- a/client/ts/modules/metric-page/ping.ts
+++ b/client/ts/modules/metric-page/ping.ts
@@ -191,7 +191,7 @@ export class PingMetricPage extends MetricPage<Metric<PingDataPoint>> {
<td>${dp.responseTime} ms</td>
<td>${dp.success ? "Success" : dp.message}</td>
<td>
- <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 2 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 2 * 60 * 1000).getTime()}">
+ <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 10 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 10 * 60 * 1000).getTime()}">
Zoom plot
</a>
</td>
diff --git a/client/ts/modules/metric-page/user-action.ts b/client/ts/modules/metric-page/user-action.ts
index c0319cf67898baf3786418684bb9e7b7a19a09dd..f10dc5009133ae74106ec8296503837b8353786d 100644
--- a/client/ts/modules/metric-page/user-action.ts
+++ b/client/ts/modules/metric-page/user-action.ts
@@ -196,7 +196,7 @@ export class UserActionMetricPage extends MetricPage<Metric<UserActionDataPoint>
<td>${dp.action}</td>
<td># ${dp.count}</td>
<td>
- <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 2 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 2 * 60 * 1000).getTime()}">
+ <a href="/home/metric/${MetricType[this.metric.metricType]}/${this.metric.source}/${new Date(dp.timestamp.getTime() - 10 * 60 * 1000).getTime()}/${new Date(dp.timestamp.getTime() + 10 * 60 * 1000).getTime()}">
Zoom plot
</a>
</td>
diff --git a/debian/status-ctl.sh b/debian/status-ctl.sh
index e2d337dfc1e61fdfe910287a385cd83cac31e7bd..4062c78b31f05c7f618cd0a6a0f18bc46fa42114 100755
--- a/debian/status-ctl.sh
+++ b/debian/status-ctl.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
# EXIT CODES
SUCCESS=0
GENERIC_ERROR=1