diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 062927ab..11a07e52 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ github: hunterlong +patreon: statping custom: ['https://www.buymeacoffee.com/hunterlong'] diff --git a/CHANGELOG.md b/CHANGELOG.md index 0147aadb..dbb47bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.90.26 (04-13-2020) +- Fixed Delete Failures button/function +- Removed timezone field from Settings (core) +- Modified CDN asset URL +- Fixed single Service view, more complex charts + # 0.90.25 - Added string response on OnTest for Notifiers - Modified UI to show user the response for a Notifier. diff --git a/Makefile b/Makefile index d83fad6b..cc09f128 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,8 @@ lite: clean reup: down clean compose-build-full up -test: clean - go test -v -p=4 -ldflags="-X main.VERSION=testing" -coverprofile=coverage.out ./... +test: clean compile + go test -v -p=1 -ldflags="-X main.VERSION=testing" -coverprofile=coverage.out ./... # build all arch's and release Statping release: test-deps diff --git a/database/grouping.go b/database/grouping.go index f81b6d5b..6c76b821 100644 --- a/database/grouping.go +++ b/database/grouping.go @@ -146,6 +146,45 @@ type isObject interface { Db() Database } +func ParseRequest(r *http.Request) (*GroupQuery, error) { + fields := parseGet(r) + grouping := fields.Get("group") + startField := utils.ToInt(fields.Get("start")) + endField := utils.ToInt(fields.Get("end")) + limit := utils.ToInt(fields.Get("limit")) + offset := utils.ToInt(fields.Get("offset")) + fill, _ := strconv.ParseBool(fields.Get("fill")) + orderBy := fields.Get("order") + if limit == 0 { + limit = 10000 + } + + if grouping == "" { + grouping = "1h" + } + groupDur, err := time.ParseDuration(grouping) + if err != nil { + log.Errorln(err) + groupDur = 1 * time.Hour + } + + query := &GroupQuery{ + Start: time.Unix(startField, 0).UTC(), + End: time.Unix(endField, 0).UTC(), + Group: groupDur, + Order: orderBy, + Limit: int(limit), + Offset: int(offset), + FillEmpty: fill, + } + + if query.Start.After(query.End) { + return nil, errors.New("start time is after ending time") + } + + return query, nil +} + func ParseQueries(r *http.Request, o isObject) (*GroupQuery, error) { fields := parseGet(r) grouping := fields.Get("group") @@ -169,6 +208,9 @@ func ParseQueries(r *http.Request, o isObject) (*GroupQuery, error) { log.Errorln(err) groupDur = 1 * time.Hour } + if endField == 0 { + endField = utils.Now().Unix() + } query := &GroupQuery{ Start: time.Unix(startField, 0).UTC(), diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml index 525d21e2..95564ce7 100644 --- a/frontend/public/base.gohtml +++ b/frontend/public/base.gohtml @@ -10,9 +10,9 @@ {{if USE_CDN}} - - - + + + {{else}} {{if USING_ASSETS}} @@ -33,11 +33,11 @@
{{if USE_CDN}} - - - - - + + + + + {{else}} <% _.each(htmlWebpackPlugin.tags.bodyTags, function(bodyTag) { %> <%= bodyTag %> <% }) %> diff --git a/frontend/src/API.js b/frontend/src/API.js index 8d31d009..5b431e0a 100644 --- a/frontend/src/API.js +++ b/frontend/src/API.js @@ -56,8 +56,8 @@ class Api { return axios.get('api/services/' + id + '/failure_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data)) } - async service_uptime(id) { - return axios.get('api/services/' + id + '/uptime_data').then(response => (response.data)) + async service_uptime(id, start, end) { + return axios.get('api/services/' + id + '/uptime_data?start=' + start + '&end=' + end).then(response => (response.data)) } async service_heatmap(id, start, end, group) { diff --git a/frontend/src/pages/Checkins.vue b/frontend/src/components/Dashboard/Checkins.vue similarity index 99% rename from frontend/src/pages/Checkins.vue rename to frontend/src/components/Dashboard/Checkins.vue index f39c043d..310b322d 100644 --- a/frontend/src/pages/Checkins.vue +++ b/frontend/src/components/Dashboard/Checkins.vue @@ -41,7 +41,7 @@ + + + diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue index 9a91c820..18a60557 100644 --- a/frontend/src/components/Service/ServiceBlock.vue +++ b/frontend/src/components/Service/ServiceBlock.vue @@ -49,12 +49,9 @@
- - -
- -
- +
@@ -133,6 +130,10 @@ export default { this.track_service = this.in_service }, methods: { + async setService() { + await this.$store.commit('setService', this.service) + this.$router.push('/service/'+this.service.id, {props: {in_service: this.service}}) + }, async showMoreStats() { this.expanded = !this.expanded; @@ -174,7 +175,6 @@ export default { if (!this.timer_func) { this.timer_func = setInterval(async () => { this.track_service = await Api.service(this.service.id) - window.console.log(this.track_service.name) }, this.track_service.check_interval * 1000) } } diff --git a/frontend/src/components/Service/ServiceInfo.vue b/frontend/src/components/Service/ServiceInfo.vue index 1c03f7fc..88e5a81f 100644 --- a/frontend/src/components/Service/ServiceInfo.vue +++ b/frontend/src/components/Service/ServiceInfo.vue @@ -67,23 +67,23 @@
-
+
Incidents
-
+
Checkins
-
+
Failures {{service.stats.failures}}
-
- {{service.online_7_days}}% Uptime +
+ {{service.online_7_days}}% Uptime
@@ -155,13 +155,6 @@ this.set2 = await this.getHits(24, "1h") this.set2_name = this.calc(this.set2) this.loaded = true - }, - async deleteFailures() { - const c = confirm('Are you sure you want to delete all failures?') - if (c) { - await Api.service_failures_delete(this.service) - this.service = await Api.service(this.service.id) - } }, Tab(name) { if (this.openTab === name) { diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js index 62822065..64c8265a 100644 --- a/frontend/src/mixin.js +++ b/frontend/src/mixin.js @@ -42,6 +42,9 @@ export default Vue.mixin({ dur(t1, t2) { return formatDistance(t1, t2) }, + format(val, type="EEEE, MMM do h:mma") { + return format(val, type) + }, niceDate(val) { return format(parseISO(val), "EEEE, MMM do h:mma") }, @@ -119,6 +122,13 @@ export default Vue.mixin({ return "bars" } }, + toBarData(data = []) { + let newSet = []; + data.forEach((f) => { + newSet.push([this.toUnix(this.parseISO(f.timeframe)), f.amount]) + }) + return newSet + }, convertToChartData(data = [], multiplier=1, asInt=false) { if (!data) { return {data: []} diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue index f0facaee..a3d71e7d 100644 --- a/frontend/src/pages/Service.vue +++ b/frontend/src/pages/Service.vue @@ -21,69 +21,42 @@
- - - - - - +
+ + From {{this.format(new Date(start_time))}} +
+
+ + To {{this.format(new Date(end_time))}} +
+
+ + Increment Timeframe +
-
- + + +
+
-
- - -
- - - - -
-
- -
- -
- -
- -
- -
-
- -
-
- -
- -
-
-

Last Response

- -
- -
- -
-
-
-
- -
-
@@ -99,6 +72,7 @@ import store from '../store' import flatPickr from 'vue-flatpickr-component'; import 'flatpickr/dist/flatpickr.css'; + import AdvancedChart from "@/components/Service/AdvancedChart"; const timeoptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' }; const axisOptions = { @@ -128,6 +102,7 @@ export default { name: 'Service', components: { + AdvancedChart, ServiceTopStats, ServiceHeatmap, ServiceFailures, @@ -137,16 +112,18 @@ export default { }, data() { return { - id: 0, tab: "failures", authenticated: false, ready: true, + group: "1h", data: null, + uptime_data: null, + loading: true, messages: [], failures: [], start_time: this.nowSubtract(84600 * 30), - end_time: new Date(), - timedata: [], + end_time: this.nowSubtract(0), + timedata: null, load_timedata: false, dailyRangeOpts: { chart: { @@ -157,8 +134,21 @@ export default { }, timeRangeOptions: { chart: { - height: 200, - type: 'rangeBar' + id: 'uptime', + height: 120, + type: 'rangeBar', + toolbar: { + show: false + }, + zoom: { + enabled: false + } + }, + selection: { + enabled: true + }, + zoom: { + enabled: true }, plotOptions: { bar: { @@ -170,16 +160,10 @@ export default { } }, dataLabels: { - enabled: true, - formatter: (val, opts) => { - var label = opts.w.globals.labels[opts.dataPointIndex] - var a = this.parseISO(val[0]) - var b = this.parseISO(val[1]) - return label - }, - style: { - colors: ['#f3f4f5', '#fff'] - } + enabled: false + }, + tooltip: { + enabled: false, }, xaxis: { type: 'datetime' @@ -195,12 +179,32 @@ export default { } }, chartOptions: { + noData: { + text: "Loading...", + align: 'center', + verticalAlign: 'middle', + offsetX: 0, + offsetY: -20, + style: { + color: "#bababa", + fontSize: '27px' + } + }, chart: { + id: 'mainchart', events: { - beforeZoom: async (chartContext, { xaxis }) => { + dataPointSelection: (event, chartContext, config) => { + window.console.log('slect') + window.console.log(event) + }, + updated: (chartContext, config) => { + window.console.log('updated') + }, + beforeZoom: (chartContext, { xaxis }) => { const start = (xaxis.min / 1000).toFixed(0) const end = (xaxis.max / 1000).toFixed(0) - await this.chartHits(start, end, "10m") + this.start_time = this.fromUnix(start) + this.end_time = this.fromUnix(end) return { xaxis: { min: this.fromUnix(start), @@ -208,6 +212,9 @@ export default { } } }, + scrolled: (chartContext, { xaxis }) => { + window.console.log(xaxis) + }, }, height: 500, width: "100%", @@ -233,20 +240,28 @@ export default { lineCap: 'butt', }, }, - xaxis: { - type: "datetime", - labels: { - show: true - }, - tooltip: { - enabled: true - } + xaxis: { + type: "datetime", + labels: { + show: true }, - yaxis: { - labels: { - show: true - }, + tooltip: { + enabled: false + } + }, + yaxis: { + labels: { + show: true }, + }, + markers: { + size: 0, + strokeWidth: 0, + hover: { + size: undefined, + sizeOffset: 0 + } + }, tooltip: { theme: false, enabled: true, @@ -259,7 +274,7 @@ export default { } else { val = (val * 0.01).toFixed(0) + " microseconds" } - return `
Average Response Time: ${val}${dt}
` + return `
Response Time: ${val}${dt}
` }, fixed: { enabled: true, @@ -268,9 +283,8 @@ export default { offsetY: 40, }, x: { - show: false, - format: 'dd MMM', - formatter: undefined, + show: true, + }, y: { formatter: undefined, @@ -320,63 +334,84 @@ export default { core () { return this.$store.getters.core }, - uptime_data() { - const data = this.timedata.series.filter(g => g.online) - const offData = this.timedata.series.filter(g => !g.online) - let arr = []; - data.forEach((d) => { - arr.push({ - name: "Online", data: { - x: 'Online', - y: [ - new Date(d.start).getTime(), - new Date(d.end).getTime() - ], - fillColor: '#0db407' - } - }) - }) - offData.forEach((d) => { - arr.push({ - name: "offline", data: { - x: 'Offline', - y: [ - new Date(d.start).getTime(), - new Date(d.end).getTime() - ], - fillColor: '#b40707' - } - }) - }) - return arr + params () { + return {start: this.toUnix(new Date(this.start_time)), end: this.toUnix(new Date(this.end_time))} }, - rangeSeries() { - return [{data: this.time_chart_data}] + id () { + return this.$route.params.id; }, + uptimeSeries () { + return this.timedata.series + }, + mainChart () { + return [{ + name: this.service.name, + ...this.convertToChartData(this.data) + }] + } }, watch: { service: function(n, o) { - this.chartHits() - this.fetchUptime() + this.onnn() }, load_timedata: function(n, o) { - this.chartHits() + this.onnn() } }, - async created() { - this.id = this.$route.params.id; - }, + async mounted() { + if (!this.$store.getters.service) { + const s = await Api.service(this.id) + this.$store.commit('setService', s) + } + }, methods: { + async updated_chart(start, end) { + this.start_time = start + this.end_time = end + this.loading = false + }, + async onnn() { + this.loading = true + await this.chartHits() + await this.fetchUptime() + this.loading = false + }, async fetchUptime() { - this.timedata = await Api.service_uptime(this.id) - this.load_timedata = true - }, - async get() { - const s = this.$store.getters.serviceByAll(this.id) - window.console.log("service: ", s) - this.getService(this.service) - this.messages = this.$store.getters.serviceMessages(this.service.id) - }, + const uptime = await Api.service_uptime(this.id, this.params.start, this.params.end) + window.console.log(uptime) + this.uptime_data = this.parse_uptime(uptime) + }, + parse_uptime(timedata) { + const data = timedata.series.filter((g) => g.online) || [] + const offData = timedata.series.filter((g) => !g.online) || [] + let arr = []; + window.console.log(data) + if (data) { + data.forEach((d) => { + arr.push({ + x: 'Online', + y: [ + new Date(d.start).getTime(), + new Date(d.end).getTime() + ], + fillColor: '#0db407' + }) + }) + } + if (offData) { + offData.forEach((d) => { + arr.push({ + x: 'Offline', + y: [ + new Date(d.start).getTime(), + new Date(d.end).getTime() + ], + fillColor: '#b40707' + }) + }) + } + return [{data: arr}] + }, messageInRange(message) { const start = this.isBetween(new Date(), message.start_on) const end = this.isBetween(message.end_on, new Date()) @@ -387,31 +422,15 @@ export default { await this.serviceFailures() }, async serviceFailures() { - let tt = this.startEndTimes() - this.failures = await Api.service_failures(this.service.id, tt.start, tt.end) + this.failures = await Api.service_failures(this.service.id, this.params.start, this.params.end) }, - async chartHits(start=0, end=99999999999, group="30m") { - let tt = {}; - if (start === 0) { - tt = this.startEndTimes() - } else { - tt = {start, end} - } - - this.data = await Api.service_hits(this.service.id, tt.start, tt.end, group, false) - if (this.data.length === 0 && group !== "1h") { + async chartHits(start=0, end=99999999999) { + this.data = await Api.service_hits(this.service.id, this.params.start, this.params.end, this.group, false) + if (this.data.length === 0 && this.group !== "1h") { + this.group = "1h" await this.chartHits("1h") } - this.series = [{ - name: this.service.name, - ...this.convertToChartData(this.data) - }] this.ready = true - }, - startEndTimes() { - const start = this.toUnix(this.service.stats.first_hit) - const end = this.toUnix(new Date()) - return {start, end} } } } diff --git a/frontend/src/routes.js b/frontend/src/routes.js index 31641d99..4cdfd799 100644 --- a/frontend/src/routes.js +++ b/frontend/src/routes.js @@ -13,9 +13,9 @@ import VueRouter from "vue-router"; import Setup from "./forms/Setup"; import Api from "./API"; -import Incidents from "@/pages/Incidents"; -import Checkins from "@/pages/Checkins"; -import Failures from "@/pages/Failures"; +import Incidents from "@/components/Dashboard/Incidents"; +import Checkins from "@/components/Dashboard/Checkins"; +import Failures from "@/components/Dashboard/Failures"; const routes = [ { diff --git a/frontend/src/store.js b/frontend/src/store.js index f7961ff4..0710f30d 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -22,6 +22,7 @@ export default new Vuex.Store({ core: {}, token: null, services: [], + service: null, groups: [], messages: [], users: [], @@ -36,6 +37,7 @@ export default new Vuex.Store({ core: state => state.core, token: state => state.token, services: state => state.services, + service: state => state.service, groups: state => state.groups, messages: state => state.messages, incidents: state => state.incidents, @@ -104,6 +106,9 @@ export default new Vuex.Store({ setToken (state, token) { state.token = token }, + setService (state, service) { + state.service = service + }, setServices (state, services) { state.services = services }, diff --git a/handlers/api.go b/handlers/api.go index 89bc7fa7..de8aac1d 100644 --- a/handlers/api.go +++ b/handlers/api.go @@ -76,9 +76,6 @@ func apiCoreHandler(w http.ResponseWriter, r *http.Request) { if c.Domain != app.Domain { app.Domain = c.Domain } - if c.Timezone != app.Timezone { - app.Timezone = c.Timezone - } app.OAuth = c.OAuth app.UseCdn = null.NewNullBool(c.UseCdn.Bool) app.AllowReports = null.NewNullBool(c.AllowReports.Bool) diff --git a/handlers/cache.go b/handlers/cache.go index 1493ee7f..a3369a10 100644 --- a/handlers/cache.go +++ b/handlers/cache.go @@ -88,8 +88,6 @@ func (s Storage) List() map[string]Item { //Get a cached content by key func (s Storage) Get(key string) []byte { - s.mu.Lock() - defer s.mu.Unlock() item := s.items[key] if item.Expired() { CacheStorage.Delete(key) diff --git a/handlers/services.go b/handlers/services.go index 3927eb21..08cbb6d4 100644 --- a/handlers/services.go +++ b/handlers/services.go @@ -9,8 +9,6 @@ import ( "github.com/statping/statping/types/services" "github.com/statping/statping/utils" "net/http" - "sort" - "time" ) type serviceOrder struct { @@ -185,131 +183,37 @@ func apiServiceTimeDataHandler(w http.ResponseWriter, r *http.Request) { return } - allFailures := service.AllFailures() - allHits := service.AllHits() - - tMap := make(map[time.Time]bool) - for _, v := range allHits.List() { - tMap[v.CreatedAt] = true - } - for _, v := range allFailures.List() { - tMap[v.CreatedAt] = false + groupHits, err := database.ParseQueries(r, service.AllHits()) + if err != nil { + sendErrorJson(err, w, r) + return } - var servs []ser - for t, v := range tMap { - s := ser{ - Time: t, - Online: v, - } - servs = append(servs, s) + groupFailures, err := database.ParseQueries(r, service.AllFailures()) + if err != nil { + sendErrorJson(err, w, r) + return } - sort.Sort(ByTime(servs)) + var allFailures []*failures.Failure + var allHits []*hits.Hit - var allTimes []series - online := servs[0].Online - thisTime := servs[0].Time - for i := 0; i < len(servs); i++ { - v := servs[i] - - if v.Online != online { - s := series{ - Start: thisTime, - End: v.Time, - Duration: v.Time.Sub(thisTime).Milliseconds(), - Online: online, - } - allTimes = append(allTimes, s) - thisTime = v.Time - online = v.Online - } + if err := groupHits.Find(&allHits); err != nil { + sendErrorJson(err, w, r) + return } - first := servs[0].Time - last := servs[len(servs)-1].Time - - if !service.Online { - s := series{ - Start: allTimes[len(allTimes)-1].End, - End: utils.Now(), - Duration: utils.Now().Sub(last).Milliseconds(), - Online: service.Online, - } - allTimes = append(allTimes, s) - } else { - l := allTimes[len(allTimes)-1] - allTimes[len(allTimes)-1] = series{ - Start: l.Start, - End: utils.Now(), - Duration: utils.Now().Sub(l.Start).Milliseconds(), - Online: true, - } + if err := groupFailures.Find(&allFailures); err != nil { + sendErrorJson(err, w, r) + return } - jj := uptimeSeries{ - Start: first, - End: last, - Uptime: addDurations(allTimes, true), - Downtime: addDurations(allTimes, false), - Series: allTimes, + uptimeData, err := service.UptimeData(allHits, allFailures) + if err != nil { + sendErrorJson(err, w, r) + return } - - returnJson(jj, w, r) -} - -type ByTime []ser - -func (a ByTime) Len() int { return len(a) } -func (a ByTime) Less(i, j int) bool { return a[i].Time.Before(a[j].Time) } -func (a ByTime) Swap(i, j int) { a[i], a[j] = a[j], a[i] } - -func addDurations(s []series, on bool) int64 { - var dur int64 - for _, v := range s { - if v.Online == on { - dur += v.Duration - } - } - return dur -} - -type ser struct { - Time time.Time - Online bool -} - -func findNextFailure(m map[time.Time]bool, after time.Time, online bool) time.Time { - for k, v := range m { - if k.After(after) && v == online { - return k - } - } - return time.Time{} -} - -//func calculateDuration(m map[time.Time]bool, on bool) time.Duration { -// var t time.Duration -// for t, v := range m { -// if v == on { -// t. -// } -// } -//} - -type uptimeSeries struct { - Start time.Time `json:"start"` - End time.Time `json:"end"` - Uptime int64 `json:"uptime"` - Downtime int64 `json:"downtime"` - Series []series `json:"series"` -} - -type series struct { - Start time.Time `json:"start"` - End time.Time `json:"end"` - Duration int64 `json:"duration"` - Online bool `json:"online"` + returnJson(uptimeData, w, r) } func apiServiceDeleteHandler(w http.ResponseWriter, r *http.Request) { diff --git a/types/core/struct.go b/types/core/struct.go index 35ede928..0a04520a 100644 --- a/types/core/struct.go +++ b/types/core/struct.go @@ -32,7 +32,6 @@ type Core struct { Setup bool `gorm:"-" json:"setup"` MigrationId int64 `gorm:"column:migration_id" json:"migration_id,omitempty"` UseCdn null.NullBool `gorm:"column:use_cdn;default:false" json:"using_cdn,omitempty"` - Timezone float32 `gorm:"column:timezone;default:-8.0" json:"timezone,omitempty"` LoggedIn bool `gorm:"-" json:"logged_in"` IsAdmin bool `gorm:"-" json:"admin"` AllowReports null.NullBool `gorm:"column:allow_reports;default:false" json:"allow_reports"` diff --git a/types/services/methods.go b/types/services/methods.go index 2677304e..bcbcc027 100644 --- a/types/services/methods.go +++ b/types/services/methods.go @@ -3,11 +3,15 @@ package services import ( "crypto/sha1" "encoding/hex" + "errors" "fmt" "github.com/statping/statping/types" + "github.com/statping/statping/types/failures" + "github.com/statping/statping/types/hits" "github.com/statping/statping/types/null" "github.com/statping/statping/utils" "net/url" + "sort" "strconv" "strings" "time" @@ -19,6 +23,145 @@ func (s *Service) Duration() time.Duration { return time.Duration(s.Interval) * time.Second } +// Start will create a channel for the service checking go routine +func (s *Service) UptimeData(hits []*hits.Hit, fails []*failures.Failure) (*UptimeSeries, error) { + if len(hits) == 0 { + return nil, errors.New("service does not have any successful hits") + } + // if theres no failures, then its been online 100%, + // return a series from created time, to current. + if len(fails) == 0 { + fistHit := hits[0] + duration := utils.Now().Sub(fistHit.CreatedAt).Milliseconds() + set := []series{ + { + Start: fistHit.CreatedAt, + End: utils.Now(), + Duration: duration, + Online: true, + }, + } + out := &UptimeSeries{ + Start: fistHit.CreatedAt, + End: utils.Now(), + Uptime: duration, + Downtime: 0, + Series: set, + } + return out, nil + } + + tMap := make(map[time.Time]bool) + + for _, v := range hits { + tMap[v.CreatedAt] = true + } + for _, v := range fails { + tMap[v.CreatedAt] = false + } + + var servs []ser + for t, v := range tMap { + s := ser{ + Time: t, + Online: v, + } + servs = append(servs, s) + } + if len(servs) == 0 { + return nil, errors.New("error generating uptime data structure") + } + sort.Sort(ByTime(servs)) + + var allTimes []series + online := servs[0].Online + thisTime := servs[0].Time + for i := 0; i < len(servs); i++ { + v := servs[i] + if v.Online != online { + s := series{ + Start: thisTime, + End: v.Time, + Duration: v.Time.Sub(thisTime).Milliseconds(), + Online: online, + } + allTimes = append(allTimes, s) + thisTime = v.Time + online = v.Online + } + } + if len(allTimes) == 0 { + return nil, errors.New("error generating uptime series structure") + } + + first := servs[0].Time + last := servs[len(servs)-1].Time + if !s.Online { + s := series{ + Start: allTimes[len(allTimes)-1].End, + End: utils.Now(), + Duration: utils.Now().Sub(last).Milliseconds(), + Online: s.Online, + } + allTimes = append(allTimes, s) + } else { + l := allTimes[len(allTimes)-1] + s := series{ + Start: l.Start, + End: utils.Now(), + Duration: utils.Now().Sub(l.Start).Milliseconds(), + Online: true, + } + allTimes = append(allTimes, s) + } + + response := &UptimeSeries{ + Start: first, + End: last, + Uptime: addDurations(allTimes, true), + Downtime: addDurations(allTimes, false), + Series: allTimes, + } + + return response, nil +} + +func addDurations(s []series, on bool) int64 { + var dur int64 + for _, v := range s { + if v.Online == on { + dur += v.Duration + } + } + return dur +} + +type ser struct { + Time time.Time + Online bool +} + +type UptimeSeries struct { + Start time.Time `json:"start"` + End time.Time `json:"end"` + Uptime int64 `json:"uptime"` + Downtime int64 `json:"downtime"` + Series []series `json:"series"` +} + +type ByTime []ser + +func (a ByTime) Len() int { return len(a) } +func (a ByTime) Less(i, j int) bool { return a[i].Time.Before(a[j].Time) } +func (a ByTime) Swap(i, j int) { a[i], a[j] = a[j], a[i] } + +type series struct { + Start time.Time `json:"start"` + End time.Time `json:"end"` + Duration int64 `json:"duration"` + Online bool `json:"online"` +} + // Start will create a channel for the service checking go routine func (s *Service) Start() { if s.IsRunning() { diff --git a/version.txt b/version.txt index 68a87147..399071fd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.25 +0.90.26