diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-03-12 21:53:36 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-12 21:53:36 +0900 |
| commit | d15bd591095e9cd25b5e1e2a5d4fba89e4eb426d (patch) | |
| tree | 920f508ff3f23bab5046ca0f25b427a2fd3ca007 /src/client | |
| parent | 10.93.0 (diff) | |
| download | sharkey-d15bd591095e9cd25b5e1e2a5d4fba89e4eb426d.tar.gz sharkey-d15bd591095e9cd25b5e1e2a5d4fba89e4eb426d.tar.bz2 sharkey-d15bd591095e9cd25b5e1e2a5d4fba89e4eb426d.zip | |
Fix queue charts (#4482)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/admin/views/queue.vue | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue index 12110b48fa..59e29d3218 100644 --- a/src/client/app/admin/views/queue.vue +++ b/src/client/app/admin/views/queue.vue @@ -5,14 +5,21 @@ <section class="wptihjuy"> <header><fa :icon="faPaperPlane"/> Deliver</header> <ui-horizon-group inputs v-if="latestStats" class="fit-bottom"> + <ui-input :value="latestStats.deliver.activeSincePrevTick | number" type="text" readonly> + <span>Process</span> + <template #suffix>jobs/s</template> + </ui-input> + <ui-input :value="latestStats.deliver.active | number" type="text" readonly> + <span>Active</span> + <template #suffix>jobs</template> + </ui-input> <ui-input :value="latestStats.deliver.waiting | number" type="text" readonly> <span>Waiting</span> + <template #suffix>jobs</template> </ui-input> <ui-input :value="latestStats.deliver.delayed | number" type="text" readonly> <span>Delayed</span> - </ui-input> - <ui-input :value="latestStats.deliver.active | number" type="text" readonly> - <span>Active</span> + <template #suffix>jobs</template> </ui-input> </ui-horizon-group> <div ref="deliverChart" class="chart"></div> @@ -20,14 +27,21 @@ <section class="wptihjuy"> <header><fa :icon="faInbox"/> Inbox</header> <ui-horizon-group inputs v-if="latestStats" class="fit-bottom"> + <ui-input :value="latestStats.inbox.activeSincePrevTick | number" type="text" readonly> + <span>Process</span> + <template #suffix>jobs/s</template> + </ui-input> + <ui-input :value="latestStats.inbox.active | number" type="text" readonly> + <span>Active</span> + <template #suffix>jobs</template> + </ui-input> <ui-input :value="latestStats.inbox.waiting | number" type="text" readonly> <span>Waiting</span> + <template #suffix>jobs</template> </ui-input> <ui-input :value="latestStats.inbox.delayed | number" type="text" readonly> <span>Delayed</span> - </ui-input> - <ui-input :value="latestStats.inbox.active | number" type="text" readonly> - <span>Active</span> + <template #suffix>jobs</template> </ui-input> </ui-horizon-group> <div ref="inboxChart" class="chart"></div> @@ -68,9 +82,12 @@ export default Vue.extend({ watch: { stats(stats) { this.inboxChart.updateSeries([{ - name: 'Active', + name: 'Process', data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick })) }, { + name: 'Active', + data: stats.map((x, i) => ({ x: i, y: x.inbox.active })) + }, { name: 'Waiting', data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting })) }, { @@ -78,9 +95,12 @@ export default Vue.extend({ data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed })) }]); this.deliverChart.updateSeries([{ - name: 'Active', + name: 'Process', data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick })) }, { + name: 'Active', + data: stats.map((x, i) => ({ x: i, y: x.deliver.active })) + }, { name: 'Waiting', data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting })) }, { @@ -127,7 +147,7 @@ export default Vue.extend({ }, }, series: [] as any, - colors: ['#00BCD4', '#FFEB3B', '#e53935'], + colors: ['#00E396', '#00BCD4', '#FFEB3B', '#e53935'], xaxis: { type: 'numeric', labels: { |