diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index ecc0cf3a..eb5a9ebb 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -25,14 +25,14 @@
@@ -41,7 +41,7 @@
@@ -63,14 +63,14 @@
@@ -85,19 +85,55 @@
import relativeDatefilterCalculator from "../api/relative-date-filter-calculator.js";
import Palette from "../api/palette";
const FORM_KEY = "ops-metrics";
+const DEFAULT_POINT = {
+ Radius: 5,
+ HoverRadius: 12,
+ HitRadius: 4
+};
+
export default {
data() {
return {
storage: { isnew: true },
memcpu: { isnew: true },
db: { isnew: true },
- timeLineChartOptions: {
+ timeLineDDChartOptions: {
responsive: true,
maintainAspectRatio: false,
scales: {
xAxes: [
{
type: "time",
+ time: {
+ unit: "day"
+ },
+ gridLines: {
+ drawOnChartArea: false
+ }
+ }
+ ],
+ yAxes: [
+ {
+ gridLines: {
+ drawOnChartArea: false
+ },
+ ticks: {
+ beginAtZero: true
+ }
+ }
+ ]
+ }
+ },
+ timeLineMMChartOptions: {
+ responsive: true,
+ maintainAspectRatio: false,
+ scales: {
+ xAxes: [
+ {
+ type: "time",
+ // time: {
+ // unit: "minute"
+ // },
gridLines: {
drawOnChartArea: false
}
@@ -138,9 +174,9 @@ export default {
label: "CPU %",
borderColor: Palette.color.soft_sand,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.memcpu.cpu
}
]
@@ -153,9 +189,9 @@ export default {
label: this.$ay.t("MetricDBSize"),
borderColor: Palette.color.blue,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.db.totalSize
}
]
@@ -187,17 +223,17 @@ export default {
label: this.$ay.t("MetricAllocatedMemory"),
borderColor: Palette.color.soft_brown_darker,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.memcpu.allocated
},
{
label: this.$ay.t("MetricWorkingSet"),
borderColor: Palette.color.soft_green,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
fill: false,
data: this.memcpu.workingSet
},
@@ -205,9 +241,9 @@ export default {
label: this.$ay.t("MetricPrivateBytes"),
borderColor: Palette.color.soft_deep_blue,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.memcpu.privateBytes
}
]
@@ -220,27 +256,27 @@ export default {
label: this.$ay.t("MetricAttachmentsMB"),
borderColor: Palette.color.purple,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.storage.attachmentFileSize
},
{
label: this.$ay.t("MetricBackupMB"),
borderColor: Palette.color.orange,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.storage.utilityFileSize
},
{
label: this.$ay.t("MetricAvailableDiskSpace"),
borderColor: Palette.color.green,
fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.storage.attachmentFilesAvailableSpace
}
]
@@ -252,10 +288,10 @@ export default {
{
label: this.$ay.t("MetricAttachmentsCount"),
borderColor: Palette.color.blue,
- fill: false,
- radius: 0,
- hoverRadius: 10,
- hitRadius: 4,
+ fill: true,
+ pointRadius: DEFAULT_POINT.Radius,
+ pointHoverRadius: DEFAULT_POINT.HoverRadius,
+ pointHitRadius: DEFAULT_POINT.HitRadius,
data: this.storage.attachmentFileCount
}
]