From cdd48aa01cdef0cbceb63c958ae2afb88417cbab Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sat, 29 Feb 2020 01:07:22 +0000 Subject: [PATCH 1/9] more detailed make/model --- src/components/SummaryTab.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/SummaryTab.vue b/src/components/SummaryTab.vue index 979547d..02e50f7 100644 --- a/src/components/SummaryTab.vue +++ b/src/components/SummaryTab.vue @@ -102,8 +102,16 @@ export default { return ret; }, makeModel() { - const ret = this.summary.wmi_detail.make_model[0]; - return ret.filter(k => k.Version).map(k => k.Version)[0]; + const comp_sys = this.summary.wmi_detail.comp_sys[0]; + const comp_sys_prod = this.summary.wmi_detail.comp_sys_prod[0]; + let make = comp_sys_prod.filter(k => k.Vendor).map(k => k.Vendor)[0]; + let model = comp_sys.filter(k => k.SystemFamily).map(k => k.SystemFamily)[0]; + + if (!model || !make) { + return comp_sys_prod.filter(k => k.Version).map(k => k.Version)[0]; + } else { + return `${make} ${model}`; + } }, physicalDisks() { const ret = this.summary.wmi_detail.disk; From 493a0ddb035182617fc9b2c60bfe9b92eeaa6fc7 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sat, 29 Feb 2020 01:24:51 +0000 Subject: [PATCH 2/9] remove cpu_info as we are getting it now from wmi --- src/components/SummaryTab.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/SummaryTab.vue b/src/components/SummaryTab.vue index 02e50f7..70025f6 100644 --- a/src/components/SummaryTab.vue +++ b/src/components/SummaryTab.vue @@ -20,7 +20,7 @@ - {{ summary.cpu_info[0].name}} + {{ cpuModel }} @@ -146,6 +146,10 @@ export default { } }); return (ips.length === 1 ? ips[0] : ips.join(", ")) + }, + cpuModel() { + const cpu = this.summary.wmi_detail.cpu[0]; + return cpu.filter(k => k.Name).map(k => k.Name)[0]; } } }; From e250065ffa356ab1966fd7a64510b249ce57a9b9 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sat, 29 Feb 2020 08:54:24 +0000 Subject: [PATCH 3/9] update quasar and vue-router --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6601707..99ce31b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8451,9 +8451,9 @@ "dev": true }, "quasar": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.9.3.tgz", - "integrity": "sha512-wmxeaNYTGXBFDReJT1MkOR29thlDrNwrnMjDUXLeOwfmhZBqRl2gDCn1/7v6Ri3fvM1pjF7yUnJkhlcGrHFgmw==" + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.9.6.tgz", + "integrity": "sha512-AO+800MxTn4F+4ogSOtw/edP3SH2xfSp99XCOIL4usjlifOtUV/795G0tQwnfheqFLbzKcQBbHfcRVxw1VTTYQ==" }, "query-string": { "version": "4.3.4", @@ -10436,9 +10436,9 @@ } }, "vue-router": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.5.tgz", - "integrity": "sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==" + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz", + "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==" }, "vue-style-loader": { "version": "4.1.2", diff --git a/package.json b/package.json index 79b7074..3d815a7 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "@quasar/extras": "^1.5.2", "axios": "^0.19.2", "core-js": "^3.6.4", - "quasar": "^1.9.3", + "quasar": "^1.9.6", "vue": "^2.6.11", - "vue-router": "^3.1.5", + "vue-router": "^3.1.6", "vuex": "^3.1.2" }, "devDependencies": { From 37f6ac638d27678c343fbf02d9b3c2e169551f67 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sun, 1 Mar 2020 11:46:30 +0000 Subject: [PATCH 4/9] compress eventlogs to significantly reduce size of data sent back to the rmm, which was causing salt to use insane amounts of memory --- src/components/EventLog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/EventLog.vue b/src/components/EventLog.vue index 1a0a6a4..160690e 100644 --- a/src/components/EventLog.vue +++ b/src/components/EventLog.vue @@ -19,6 +19,7 @@ row-key="uid" binary-state-sort hide-bottom + virtual-scroll >