diff --git a/frontend/src/components/Dashboard/ServiceInfo.vue b/frontend/src/components/Dashboard/ServiceInfo.vue
index 52d16256..f7ac4629 100644
--- a/frontend/src/components/Dashboard/ServiceInfo.vue
+++ b/frontend/src/components/Dashboard/ServiceInfo.vue
@@ -7,17 +7,11 @@
-
@@ -41,28 +35,31 @@
},
data() {
return {
- first: [],
- second: [],
- third: [],
- fourth: []
+ set1: [],
+ set2: []
}
},
async created() {
- this.first = await this.getFailures(7, "hour")
- this.second = await this.getFailures(30, "hour")
- this.third = await this.getHits(7, "hour")
- this.fourth = await this.getHits(30, "hour")
+ this.set1 = await this.getHits(24, "hour")
+ this.set2 = await this.getHits(24 * 7, "day")
},
methods: {
- async getHits(days, group) {
- const start = this.ago(3600 * 24)
+ async getHits(hours, group) {
+ const start = this.ago(3600 * hours)
const data = await Api.service_hits(this.service.id, start, this.now(), group)
- return [data]
+ if (!data) {
+ return [{name: "None", data: []}]
+ }
+ return [{name: "Latency", data: data.data}]
},
- async getFailures(days, group) {
- const start = this.ago(3600 * 24)
- const data = await Api.service_failures(this.service.id, start, this.now())
- return [data]
+ calc (s) {
+ let data = s[0].data
+ let total = 0
+ data.forEach((f) => {
+ total += f.y
+ });
+ total = total / data.length
+ return total.toFixed(0) + "ms Average"
}
}
}
diff --git a/frontend/src/components/Dashboard/ServiceSparkLine.vue b/frontend/src/components/Dashboard/ServiceSparkLine.vue
index 681972dc..c4de3ce3 100644
--- a/frontend/src/components/Dashboard/ServiceSparkLine.vue
+++ b/frontend/src/components/Dashboard/ServiceSparkLine.vue
@@ -17,6 +17,14 @@ export default {
type: String,
}
},
+ watch: {
+ title () {
+
+ },
+ subtitle () {
+
+ }
+ },
data() {
return {
chartOpts: {
@@ -41,7 +49,7 @@ export default {
enabled: false
},
title: {
- text: "title",
+ text: this.title,
offsetX: 0,
style: {
fontSize: '28px',
@@ -49,7 +57,7 @@ export default {
}
},
subtitle: {
- text: "subtitle",
+ text: this.subtitle,
offsetX: 0,
style: {
fontSize: '14px',
diff --git a/frontend/src/forms/Integration.vue b/frontend/src/forms/Integration.vue
index 2330bb67..a9059891 100644
--- a/frontend/src/forms/Integration.vue
+++ b/frontend/src/forms/Integration.vue
@@ -43,14 +43,12 @@
|
|
{{service.type}} |
-
|
+
|
- {{out}}
-
@@ -69,7 +69,7 @@
},
data () {
return {
- loading: false,
+ loading: false,
user: {
username: "",
admin: false,
@@ -81,7 +81,9 @@
},
watch: {
in_user() {
- this.user = this.in_user
+ const u = this.in_user
+ delete u.password
+ this.user = u
}
},
methods: {