-
@@ -208,6 +208,7 @@
methods: {
async saveService() {
let s = this.service
+ this.loading = true
delete s.failures
delete s.created_at
delete s.updated_at
@@ -219,6 +220,10 @@
} else {
await this.createService(s)
}
+ const services = await Api.services()
+ this.$store.commit('setServices', services)
+ this.loading = false
+ this.$router.push('/dashboard/services')
},
async createService(s) {
await Api.service_create(s)
diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js
index 27301f09..3f2d75aa 100644
--- a/frontend/src/mixin.js
+++ b/frontend/src/mixin.js
@@ -93,5 +93,19 @@ export default Vue.mixin({
return "bars"
}
},
+ convertToChartData(data = [], multiplier=1, asInt=false) {
+ let newSet = [];
+ data.forEach((f) => {
+ let amount = f.amount * multiplier;
+ if (asInt) {
+ amount = amount.toFixed(0)
+ }
+ newSet.push({
+ x: f.timeframe,
+ y: amount
+ })
+ })
+ return {data: newSet}
+ }
}
});
diff --git a/go.mod b/go.mod
index b8c0df93..f418da33 100644
--- a/go.mod
+++ b/go.mod
@@ -24,6 +24,7 @@ require (
github.com/joho/godotenv v1.3.0
github.com/lib/pq v1.2.0 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+ github.com/pkg/errors v0.8.1
github.com/rendon/testcli v0.0.0-20161027181003-6283090d169f
github.com/russross/blackfriday/v2 v2.0.1
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
diff --git a/handlers/checkin.go b/handlers/checkin.go
index 554db403..9d872032 100644
--- a/handlers/checkin.go
+++ b/handlers/checkin.go
@@ -30,7 +30,7 @@ func apiAllCheckinsHandler(w http.ResponseWriter, r *http.Request) {
checkins := core.AllCheckins()
for _, c := range checkins {
c.Hits = c.AllHits()
- c.Failures = c.LimitedFailures(64)
+ c.Failures = c.GetFailures(64)
}
returnJson(checkins, w, r)
}
@@ -43,7 +43,7 @@ func apiCheckinHandler(w http.ResponseWriter, r *http.Request) {
return
}
checkin.Hits = checkin.LimitedHits(32)
- checkin.Failures = checkin.LimitedFailures(32)
+ checkin.Failures = checkin.GetFailures(32)
returnJson(checkin, w, r)
}
diff --git a/handlers/errors.go b/handlers/errors.go
new file mode 100644
index 00000000..be4637e4
--- /dev/null
+++ b/handlers/errors.go
@@ -0,0 +1,47 @@
+package handlers
+
+import (
+ "encoding/json"
+ "github.com/pkg/errors"
+ "net/http"
+)
+
+type Error struct {
+ err error
+ code int
+}
+
+func (e Error) Error() string {
+ return e.err.Error()
+}
+
+var (
+ NewError = func(e error) Error {
+ return Error{
+ err: e,
+ code: http.StatusInternalServerError,
+ }
+ }
+ NotFound = func(err error) Error {
+ return Error{
+ err: errors.Wrap(err, "not found"),
+ code: http.StatusNotFound,
+ }
+ }
+ Unauthorized = func(e error) Error {
+ return Error{
+ err: e,
+ code: http.StatusUnauthorized,
+ }
+ }
+)
+
+func RespondError(w http.ResponseWriter, err Error) {
+ output := apiResponse{
+ Status: "error",
+ Error: err.Error(),
+ }
+ w.Header().Set("Content-Type", "application/json")
+ w.WriteHeader(err.code)
+ json.NewEncoder(w).Encode(output)
+}
diff --git a/handlers/function.go b/handlers/function.go
index 2b12dcbd..08832cd7 100644
--- a/handlers/function.go
+++ b/handlers/function.go
@@ -4,12 +4,23 @@ import (
"github.com/hunterlong/statping/core"
"html/template"
"net/http"
+ "net/url"
)
var (
basePath = "/"
)
+func parseForm(r *http.Request) url.Values {
+ r.ParseForm()
+ return r.PostForm
+}
+
+func parseGet(r *http.Request) url.Values {
+ r.ParseForm()
+ return r.Form
+}
+
var handlerFuncs = func(w http.ResponseWriter, r *http.Request) template.FuncMap {
return template.FuncMap{
"VERSION": func() string {
diff --git a/handlers/query.go b/handlers/query.go
new file mode 100644
index 00000000..5ac8282f
--- /dev/null
+++ b/handlers/query.go
@@ -0,0 +1 @@
+package handlers
diff --git a/handlers/services.go b/handlers/services.go
index 5d995d91..dcbdec43 100644
--- a/handlers/services.go
+++ b/handlers/services.go
@@ -21,6 +21,7 @@ import (
"fmt"
"github.com/gorilla/mux"
"github.com/hunterlong/statping/core"
+ "github.com/hunterlong/statping/database"
"github.com/hunterlong/statping/types"
"github.com/hunterlong/statping/utils"
"net/http"
@@ -151,56 +152,41 @@ func apiServiceRunningHandler(w http.ResponseWriter, r *http.Request) {
func apiServiceDataHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
- service := core.SelectService(utils.ToInt(vars["id"]))
- if service == nil {
+ service, err := database.Service(utils.ToInt(vars["id"]))
+ if err != nil {
sendErrorJson(errors.New("service data not found"), w, r)
return
}
- groupQuery := parseGroupQuery(r)
- obj := core.GraphHitsDataRaw(service, groupQuery, "latency")
+ groupQuery := database.ParseQueries(r, service.Hits())
+
+ obj := core.GraphData(groupQuery, &types.Hit{}, database.ByAverage("latency"))
returnJson(obj, w, r)
}
func apiServiceFailureDataHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
- service := core.SelectService(utils.ToInt(vars["id"]))
- if service == nil {
+ service, err := database.Service(utils.ToInt(vars["id"]))
+ if err != nil {
sendErrorJson(errors.New("service data not found"), w, r)
return
}
- groupQuery := parseGroupQuery(r)
+ groupQuery := database.ParseQueries(r, service.Failures())
- obj := core.GraphFailuresDataRaw(service, groupQuery)
+ obj := core.GraphData(groupQuery, &types.Failure{}, database.ByCount)
returnJson(obj, w, r)
}
-func parseGroupQuery(r *http.Request) *types.GroupQuery {
- fields := parseGet(r)
- grouping := fields.Get("group")
- if grouping == "" {
- grouping = "hour"
- }
- startField := utils.ToInt(fields.Get("start"))
- endField := utils.ToInt(fields.Get("end"))
-
- return &types.GroupQuery{
- Start: time.Unix(startField, 0).UTC(),
- End: time.Unix(endField, 0).UTC(),
- Group: grouping,
- }
-}
-
func apiServicePingDataHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
- service := core.SelectService(utils.ToInt(vars["id"]))
- if service == nil {
- sendErrorJson(errors.New("service not found"), w, r)
+ service, err := database.Service(utils.ToInt(vars["id"]))
+ if err != nil {
+ sendErrorJson(errors.New("service data not found"), w, r)
return
}
- groupQuery := parseGroupQuery(r)
+ groupQuery := database.ParseQueries(r, service.Hits())
- obj := core.GraphHitsDataRaw(service, groupQuery, "ping_time")
+ obj := core.GraphData(groupQuery, &types.Hit{}, database.ByAverage("ping_time"))
returnJson(obj, w, r)
}
@@ -301,24 +287,26 @@ func servicesDeleteFailuresHandler(w http.ResponseWriter, r *http.Request) {
func apiServiceFailuresHandler(r *http.Request) interface{} {
vars := mux.Vars(r)
- servicer := core.SelectService(utils.ToInt(vars["id"]))
- if servicer == nil {
+
+ service, err := database.Service(utils.ToInt(vars["id"]))
+ if err != nil {
return errors.New("service not found")
}
- fails := servicer.LimitedFailures(100)
+
+ var fails []types.Failure
+ service.Failures().Requests(r).Find(&fails)
return fails
}
func apiServiceHitsHandler(r *http.Request) interface{} {
vars := mux.Vars(r)
- servicer := core.SelectService(utils.ToInt(vars["id"]))
- if servicer == nil {
+ service, err := database.Service(utils.ToInt(vars["id"]))
+ if err != nil {
return errors.New("service not found")
}
- hits, err := servicer.HitsDb(r).Hits()
- if err != nil {
- return err
- }
+
+ var hits []types.Hit
+ service.Hits().Find(&hits)
return hits
}
diff --git a/handlers/settings.go b/handlers/settings.go
deleted file mode 100644
index 1a446dc4..00000000
--- a/handlers/settings.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Statping
-// Copyright (C) 2018. Hunter Long and the project contributors
-// Written by Hunter Long
and the project contributors
-//
-// https://github.com/hunterlong/statping
-//
-// The licenses for most software and other practical works are designed
-// to take away your freedom to share and change the works. By contrast,
-// the GNU General Public License is intended to guarantee your freedom to
-// share and change all versions of a program--to make sure it remains free
-// software for all its users.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-package handlers
-
-import (
- "net/http"
- "net/url"
-)
-
-func parseForm(r *http.Request) url.Values {
- r.ParseForm()
- return r.PostForm
-}
-
-func parseGet(r *http.Request) url.Values {
- r.ParseForm()
- return r.Form
-}
diff --git a/types/checkin.go b/types/checkin.go
index 71bbbe42..0c924362 100644
--- a/types/checkin.go
+++ b/types/checkin.go
@@ -21,19 +21,19 @@ import (
// Checkin struct will allow an application to send a recurring HTTP GET to confirm a service is online
type Checkin struct {
- Id int64 `gorm:"primary_key;column:id" json:"id"`
- ServiceId int64 `gorm:"index;column:service" json:"service_id"`
- Name string `gorm:"column:name" json:"name"`
- Interval int64 `gorm:"column:check_interval" json:"interval"`
- GracePeriod int64 `gorm:"column:grace_period" json:"grace"`
- ApiKey string `gorm:"column:api_key" json:"api_key"`
- CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
- UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at"`
- Running chan bool `gorm:"-" json:"-"`
- Failing bool `gorm:"-" json:"failing"`
- LastHit time.Time `gorm:"-" json:"last_hit"`
- Hits []*CheckinHit `gorm:"-" json:"hits"`
- Failures []FailureInterface `gorm:"-" json:"failures"`
+ Id int64 `gorm:"primary_key;column:id" json:"id"`
+ ServiceId int64 `gorm:"index;column:service" json:"service_id"`
+ Name string `gorm:"column:name" json:"name"`
+ Interval int64 `gorm:"column:check_interval" json:"interval"`
+ GracePeriod int64 `gorm:"column:grace_period" json:"grace"`
+ ApiKey string `gorm:"column:api_key" json:"api_key"`
+ CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
+ UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at"`
+ Running chan bool `gorm:"-" json:"-"`
+ Failing bool `gorm:"-" json:"failing"`
+ LastHit time.Time `gorm:"-" json:"last_hit"`
+ Hits []*CheckinHit `gorm:"-" json:"hits"`
+ Failures []*Failure `gorm:"-" json:"failures"`
}
type CheckinInterface interface {
diff --git a/types/failure.go b/types/failure.go
index 75aa8eb2..a0f8c0da 100644
--- a/types/failure.go
+++ b/types/failure.go
@@ -35,8 +35,6 @@ type Failure struct {
type FailureInterface interface {
Select() *Failure
- Ago() string // Ago returns a human readable timestamp
- ParseError() string // ParseError returns a human readable error for a service failure
}
// BeforeCreate for Failure will set CreatedAt to UTC
diff --git a/types/time.go b/types/time.go
index 30510b92..86c7f4e4 100644
--- a/types/time.go
+++ b/types/time.go
@@ -16,6 +16,7 @@
package types
import (
+ "fmt"
"time"
)
@@ -27,11 +28,41 @@ const (
)
var (
- NOW = func() time.Time { return time.Now().UTC() }()
- //HOUR_1_AGO = time.Now().Add(-1 * time.Hour)
- //HOUR_24_AGO = time.Now().Add(-24 * time.Hour)
- //HOUR_72_AGO = time.Now().Add(-72 * time.Hour)
- //DAY_7_AGO = NOW.AddDate(0, 0, -7)
- //MONTH_1_AGO = NOW.AddDate(0, -1, 0)
- //YEAR_1_AGO = NOW.AddDate(-1, 0, 0)
+ Second = time.Second
+ Minute = time.Minute
+ Hour = time.Hour
+ Day = Hour * 24
+ Week = Day * 7
+ Month = Week * 4
+ Year = Day * 365
)
+
+func FixedTime(t time.Time, d time.Duration) string {
+ switch d {
+ case Month:
+ month := fmt.Sprintf("%v", int(t.Month()))
+ if int(t.Month()) < 10 {
+ month = fmt.Sprintf("0%v", int(t.Month()))
+ }
+ return fmt.Sprintf("%v-%v-01T00:00:00Z", t.Year(), month)
+ case Year:
+ return fmt.Sprintf("%v-01-01T00:00:00Z", t.Year())
+ default:
+ return t.Format(durationStr(d))
+ }
+}
+
+func durationStr(d time.Duration) string {
+ switch d {
+ case Second:
+ return "2006-01-02T15:04:05Z"
+ case Minute:
+ return "2006-01-02T15:04:00Z"
+ case Hour:
+ return "2006-01-02T15:00:00Z"
+ case Day:
+ return "2006-01-02T00:00:00Z"
+ default:
+ return "2006-01-02T00:00:00Z"
+ }
+}
diff --git a/types/time_test.go b/types/time_test.go
new file mode 100644
index 00000000..2bb9e916
--- /dev/null
+++ b/types/time_test.go
@@ -0,0 +1,46 @@
+package types
+
+import (
+ "fmt"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "testing"
+ "time"
+)
+
+func TestFixedTime(t *testing.T) {
+
+ timeVal, err := time.Parse("2006-01-02T15:04:05Z", "2020-05-22T06:02:13Z")
+ require.Nil(t, err)
+
+ examples := []struct {
+ Time time.Time
+ Duration time.Duration
+ Expected string
+ }{{
+ timeVal,
+ time.Second,
+ "2020-05-22T06:02:13Z",
+ }, {
+ timeVal,
+ time.Minute,
+ "2020-05-22T06:02:00Z",
+ }, {
+ timeVal,
+ time.Hour,
+ "2020-05-22T06:00:00Z",
+ }, {
+ timeVal,
+ time.Hour * 24,
+ "2020-05-22T00:00:00Z",
+ }, {
+ timeVal,
+ time.Hour * 24 * 30,
+ "2020-05-01T00:00:00Z",
+ }}
+
+ for _, e := range examples {
+ assert.Equal(t, e.Expected, FixedTime(e.Time, e.Duration), fmt.Sprintf("reformating for: %v %v", e.Time, e.Duration))
+ }
+
+}
diff --git a/types/types.go b/types/types.go
index 86f3caf4..5792b7c0 100644
--- a/types/types.go
+++ b/types/types.go
@@ -19,13 +19,6 @@ import (
"time"
)
-type GroupQuery struct {
- Id int64
- Start time.Time
- End time.Time
- Group string
-}
-
// Hit struct is a 'successful' ping or web response entry for a service.
type Hit struct {
Id int64 `gorm:"primary_key;column:id" json:"id"`
@@ -49,7 +42,7 @@ type DbConfig struct {
DbHost string `yaml:"host" json:"-"`
DbUser string `yaml:"user" json:"-"`
DbPass string `yaml:"password" json:"-"`
- DbData string `yaml:"Db" json:"-"`
+ DbData string `yaml:"database" json:"-"`
DbPort int64 `yaml:"port" json:"-"`
ApiKey string `yaml:"api_key" json:"-"`
ApiSecret string `yaml:"api_secret" json:"-"`