From 9cb417e7f3e403ea143a9b76ef90473aa7bbeed8 Mon Sep 17 00:00:00 2001 From: sadnub Date: Sun, 10 Jan 2021 14:15:05 -0500 Subject: [PATCH] add check history graph for cpu, memory, and diskspace --- package-lock.json | 82 +++++++++ package.json | 4 +- src/components/ChecksTab.vue | 19 +- src/components/graphs/CheckGraph.vue | 169 ++++++++++++++++++ .../modals/coresettings/EditCoreSettings.vue | 7 +- 5 files changed, 276 insertions(+), 5 deletions(-) create mode 100644 src/components/graphs/CheckGraph.vue diff --git a/package-lock.json b/package-lock.json index 17f5dc7..8489068 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4902,6 +4902,19 @@ "picomatch": "^2.0.4" } }, + "apexcharts": { + "version": "3.23.1", + "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.23.1.tgz", + "integrity": "sha512-7fRpquXp725BUew5OO1mJWk16/IJPCUl0l8SjhISnAhAtbTaM9PnXPSmN2BvKO4RcT457CzMM7MCG5UokiTwcA==", + "requires": { + "svg.draggable.js": "^2.2.2", + "svg.easing.js": "^2.0.0", + "svg.filter.js": "^2.0.2", + "svg.pathmorphing.js": "^0.1.3", + "svg.resize.js": "^1.4.3", + "svg.select.js": "^3.0.1" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -16987,6 +17000,70 @@ "has-flag": "^3.0.0" } }, + "svg.draggable.js": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz", + "integrity": "sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==", + "requires": { + "svg.js": "^2.0.1" + } + }, + "svg.easing.js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/svg.easing.js/-/svg.easing.js-2.0.0.tgz", + "integrity": "sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI=", + "requires": { + "svg.js": ">=2.3.x" + } + }, + "svg.filter.js": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/svg.filter.js/-/svg.filter.js-2.0.2.tgz", + "integrity": "sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM=", + "requires": { + "svg.js": "^2.2.5" + } + }, + "svg.js": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz", + "integrity": "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==" + }, + "svg.pathmorphing.js": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz", + "integrity": "sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==", + "requires": { + "svg.js": "^2.4.0" + } + }, + "svg.resize.js": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/svg.resize.js/-/svg.resize.js-1.4.3.tgz", + "integrity": "sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==", + "requires": { + "svg.js": "^2.6.5", + "svg.select.js": "^2.1.2" + }, + "dependencies": { + "svg.select.js": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz", + "integrity": "sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==", + "requires": { + "svg.js": "^2.2.5" + } + } + } + }, + "svg.select.js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-3.0.1.tgz", + "integrity": "sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==", + "requires": { + "svg.js": "^2.6.5" + } + }, "svgo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", @@ -18111,6 +18188,11 @@ "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==", "dev": true }, + "vue-apexcharts": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.6.0.tgz", + "integrity": "sha512-sT6tuVTLBwfH3TA7azecDNS/W70bmz14ZJI7aE7QIqcG9I6OywyH7x3hcOeY1v1DxttI8Svc5RuYj4Dd+A5F4g==" + }, "vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", diff --git a/package.json b/package.json index 8ea7c4b..878f03c 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,11 @@ "dependencies": { "@quasar/extras": "^1.9.12", "axios": "^0.21.1", + "apexcharts": "^3.23.1", "dotenv": "^8.2.0", "qrcode.vue": "^1.7.0", - "quasar": "^1.15.0" + "quasar": "^1.15.0", + "vue-apexcharts": "^1.6.0" }, "devDependencies": { "@quasar/app": "^2.1.14", diff --git a/src/components/ChecksTab.vue b/src/components/ChecksTab.vue index 3ce682d..0841cf8 100644 --- a/src/components/ChecksTab.vue +++ b/src/components/ChecksTab.vue @@ -196,9 +196,14 @@ >output - {{ - props.row.history_info - }} + + Show Run History + {{ props.row.more_info }} {{ props.row.last_run }} this.notifyError(e.response.data)); }); }, + showCheckGraphModal(check) { + this.$q.dialog({ + component: CheckGraph, + parent: this, + check: check, + }); + }, }, computed: { ...mapGetters(["selectedAgentPk", "checks", "tabsTableHeight"]), diff --git a/src/components/graphs/CheckGraph.vue b/src/components/graphs/CheckGraph.vue new file mode 100644 index 0000000..684ae67 --- /dev/null +++ b/src/components/graphs/CheckGraph.vue @@ -0,0 +1,169 @@ + + diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue index 8d24e8d..d50e291 100644 --- a/src/components/modals/coresettings/EditCoreSettings.vue +++ b/src/components/modals/coresettings/EditCoreSettings.vue @@ -67,6 +67,11 @@ class="col-6" /> + +
Remove Check History older than:
+
+ +
Reset Patch Policy on Agents:
@@ -309,7 +314,7 @@ export default { settings: {}, email: null, tab: "general", - splitterModel: 15, + splitterModel: 20, isPwd: true, allTimezones: [], emailTest: false,